diff options
| author | Chris Gross <chrisgross@google.com> | 2021-03-10 23:00:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-10 23:00:14 +0000 |
| commit | 1cb919df825afb10aaa5e796a7f4360be2d0ffd8 (patch) | |
| tree | 30edf79f5c62d947eb8086a5274ab28f847bce1a /packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java | |
| parent | 984b7be598827be9938ce00b8f550ad4836bf67a (diff) | |
| parent | 4edca1117cdcad002c57f24db04b833088f2439b (diff) | |
Merge changes from topic "SP1A.210222.001" into s-keystone-qcom-dev
* changes:
Adapt to rename of DisplayConfig to DisplayMode.
Moves assignDisplayIdLocked to the Layout class.
Removes import of deprecated com.android.ims.ImsException.
Remove duplicate definitions of stringToAdnStringField().
Stops enforcing uses_libs matching AndroidManifest.xml for SystemUI.
Revert "CamcorderProfiles: Add 8KUHD camcorder profile"
Merge SP1A.210222.001
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java index 4a1b57d64c89..5d6aeaa938ed 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukViewController.java @@ -85,13 +85,15 @@ public class KeyguardSimPukViewController KeyguardSecurityCallback keyguardSecurityCallback, KeyguardMessageAreaController.Factory messageAreaControllerFactory, LatencyTracker latencyTracker, LiftToActivateListener liftToActivateListener, - TelephonyManager telephonyManager, FalsingCollector falsingCollector) { + TelephonyManager telephonyManager, + FalsingCollector falsingCollector, boolean isNewLayoutEnabled) { super(view, keyguardUpdateMonitor, securityMode, lockPatternUtils, keyguardSecurityCallback, messageAreaControllerFactory, latencyTracker, liftToActivateListener, falsingCollector); mKeyguardUpdateMonitor = keyguardUpdateMonitor; mTelephonyManager = telephonyManager; mSimImageView = mView.findViewById(R.id.keyguard_sim); + view.setIsNewLayoutEnabled(isNewLayoutEnabled); } @Override |