Merge cherrypicks of ['googleplex-android-review.googlesource.com/24005115',... (48a86e27) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -5175,7 +5175,7 @@
		</string-array>

		<!-- The integer index of the selected option in config_udfps_touch_detection_options -->
		<integer name="config_selected_udfps_touch_detection">3</integer>
		<integer name="config_selected_udfps_touch_detection">0</integer>

		<!-- An array of arrays of side fingerprint sensor properties relative to each display.
		Note: this value is temporary and is expected to be queried directly

packages/SystemUI/src/com/android/keyguard/KeyguardClockFrame.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,10 @@ class KeyguardClockFrame(
		) : FrameLayout(context, attrs) {
		private var drawAlpha: Int = 255

		init {
		setLayerType(View.LAYER_TYPE_SOFTWARE, null)
		}

		protected override fun onSetAlpha(alpha: Int): Boolean {
		drawAlpha = alpha
		return true

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.keyguard.KeyguardSecurityModel;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.keyguard.KeyguardViewController;
		import com.android.keyguard.TrustGrantFlags;
		import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor;
		import com.android.systemui.dagger.SysUISingleton;
		@@ -305,6 +306,16 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		@Nullable private TaskbarDelegate mTaskbarDelegate;
		private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
		new KeyguardUpdateMonitorCallback() {
		@Override
		public void onTrustGrantedForCurrentUser(
		boolean dismissKeyguard,
		boolean newlyUnlocked,
		@NonNull TrustGrantFlags flags,
		@Nullable String message
		) {
		updateAlternateBouncerShowing(mAlternateBouncerInteractor.maybeHide());
		}

		@Override
		public void onEmergencyCallAction() {
		// Since we won't get a setOccluded call we have to reset the view manually such that
		@@ -430,7 +441,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		mDockManager.addListener(mDockEventListener);
		mIsDocked = mDockManager.isDocked();
		}
		mKeyguardStateController.addCallback(mKeyguardStateControllerCallback);
		}

		/** Register a callback, to be invoked by the Predictive Back system. */
		@@ -1564,14 +1574,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		\|\| mode == KeyguardSecurityModel.SecurityMode.SimPuk;
		}

		private KeyguardStateController.Callback mKeyguardStateControllerCallback =
		new KeyguardStateController.Callback() {
		@Override
		public void onUnlockedChanged() {
		updateAlternateBouncerShowing(mAlternateBouncerInteractor.maybeHide());
		}
		};

		/**
		* Delegate used to send show and hide events to an alternate authentication method instead of
		* the regular pin/pattern/password bouncer.

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.service.trust.TrustAgentService;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper;
		import android.view.MotionEvent;
		@@ -57,6 +58,8 @@ import com.android.keyguard.KeyguardMessageArea;
		import com.android.keyguard.KeyguardMessageAreaController;
		import com.android.keyguard.KeyguardSecurityModel;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.keyguard.TrustGrantFlags;
		import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.biometrics.domain.interactor.UdfpsOverlayInteractor;
		@@ -84,7 +87,6 @@ import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.unfold.SysUIUnfoldComponent;

		import com.google.common.truth.Truth;
		@@ -153,7 +155,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		@Captor
		private ArgumentCaptor<OnBackInvokedCallback> mBackCallbackCaptor;
		@Captor
		private ArgumentCaptor<KeyguardStateController.Callback> mKeyguardStateControllerCallback;
		private ArgumentCaptor<KeyguardUpdateMonitorCallback> mKeyguardUpdateMonitorCallback;


		@Before
		@@ -925,18 +927,24 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		}

		@Test
		public void onDeviceUnlocked_hideAlternateBouncerAndClearMessageArea() {
		public void onTrustChanged_hideAlternateBouncerAndClearMessageArea() {
		// GIVEN keyguard update monitor callback is registered
		verify(mKeyguardUpdateMonitor).registerCallback(mKeyguardUpdateMonitorCallback.capture());

		reset(mKeyguardUpdateMonitor);
		reset(mKeyguardMessageAreaController);

		// GIVEN keyguard state controller callback is registered
		verify(mKeyguardStateController).addCallback(mKeyguardStateControllerCallback.capture());

		// GIVEN alternate bouncer state = not visible
		when(mAlternateBouncerInteractor.isVisibleState()).thenReturn(false);

		// WHEN the device is unlocked
		mKeyguardStateControllerCallback.getValue().onUnlockedChanged();
		// WHEN the device is trusted by active unlock
		mKeyguardUpdateMonitorCallback.getValue().onTrustGrantedForCurrentUser(
		true,
		true,
		new TrustGrantFlags(TrustAgentService.FLAG_GRANT_TRUST_DISMISS_KEYGUARD
		\| TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE),
		null
		);

		// THEN the false visibility state is propagated to the keyguardUpdateMonitor
		verify(mKeyguardUpdateMonitor).setAlternateBouncerShowing(eq(false));

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -2186,7 +2186,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		* Processes the activities to be stopped or destroyed. This should be called when the resumed
		* activities are idle or drawn.
		*/
		private void processStoppingAndFinishingActivities(ActivityRecord launchedActivity,
		void processStoppingAndFinishingActivities(ActivityRecord launchedActivity,
		boolean processPausingActivities, String reason) {
		// Stop any activities that are scheduled to do so but have been waiting for the transition
		// animation to finish.
		@@ -2194,7 +2194,10 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		ArrayList<ActivityRecord> readyToStopActivities = null;
		for (int i = 0; i < mStoppingActivities.size(); i++) {
		final ActivityRecord s = mStoppingActivities.get(i);
		final boolean animating = s.isInTransition();
		// Activity in a force hidden task should not be counted as animating, i.e., we want to
		// send onStop before any configuration change when removing pip transition is ongoing.
		final boolean animating = s.isInTransition()
		&& s.getTask() != null && !s.getTask().isForceHidden();
		displaySwapping \|= s.isDisplaySleepingAndSwapping();
		ProtoLog.v(WM_DEBUG_STATES, "Stopping %s: nowVisible=%b animating=%b "
		+ "finishing=%s", s, s.nowVisible, animating, s.finishing);