diff options
16 files changed, 61 insertions, 81 deletions
diff --git a/core/java/android/service/voice/IVoiceInteractionSession.aidl b/core/java/android/service/voice/IVoiceInteractionSession.aidl index 59f1e8eed89c..55e2c170dec6 100644 --- a/core/java/android/service/voice/IVoiceInteractionSession.aidl +++ b/core/java/android/service/voice/IVoiceInteractionSession.aidl @@ -40,5 +40,5 @@ oneway interface IVoiceInteractionSession { void closeSystemDialogs(); void onLockscreenShown(); void destroy(); - void updateVisibleActivityInfo(in VisibleActivityInfo visibleActivityInfo, int type); + void notifyVisibleActivityInfoChanged(in VisibleActivityInfo visibleActivityInfo, int type); } diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java index b783f6b8fd51..df727e9b7d3d 100644 --- a/core/java/android/service/voice/VoiceInteractionSession.java +++ b/core/java/android/service/voice/VoiceInteractionSession.java @@ -358,9 +358,10 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall } @Override - public void updateVisibleActivityInfo(VisibleActivityInfo visibleActivityInfo, int type) { + public void notifyVisibleActivityInfoChanged(VisibleActivityInfo visibleActivityInfo, + int type) { mHandlerCaller.sendMessage( - mHandlerCaller.obtainMessageIO(MSG_UPDATE_VISIBLE_ACTIVITY_INFO, type, + mHandlerCaller.obtainMessageIO(MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED, type, visibleActivityInfo)); } }; @@ -854,7 +855,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall static final int MSG_SHOW = 106; static final int MSG_HIDE = 107; static final int MSG_ON_LOCKSCREEN_SHOWN = 108; - static final int MSG_UPDATE_VISIBLE_ACTIVITY_INFO = 109; + static final int MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED = 109; static final int MSG_REGISTER_VISIBLE_ACTIVITY_CALLBACK = 110; static final int MSG_UNREGISTER_VISIBLE_ACTIVITY_CALLBACK = 111; @@ -942,12 +943,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall if (DEBUG) Log.d(TAG, "onLockscreenShown"); onLockscreenShown(); break; - case MSG_UPDATE_VISIBLE_ACTIVITY_INFO: + case MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED: if (DEBUG) { - Log.d(TAG, "doUpdateVisibleActivityInfo: visibleActivityInfo=" + msg.obj - + " type=" + msg.arg1); + Log.d(TAG, + "doNotifyVisibleActivityInfoChanged: visibleActivityInfo=" + msg.obj + + " type=" + msg.arg1); } - doUpdateVisibleActivityInfo((VisibleActivityInfo) msg.obj, msg.arg1); + doNotifyVisibleActivityInfoChanged((VisibleActivityInfo) msg.obj, msg.arg1); break; case MSG_REGISTER_VISIBLE_ACTIVITY_CALLBACK: if (DEBUG) { @@ -1157,7 +1159,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall } } - private void doUpdateVisibleActivityInfo(VisibleActivityInfo visibleActivityInfo, int type) { + private void doNotifyVisibleActivityInfoChanged(VisibleActivityInfo visibleActivityInfo, + int type) { if (mVisibleActivityCallbacks.isEmpty()) { return; @@ -1165,11 +1168,11 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall switch (type) { case VisibleActivityInfo.TYPE_ACTIVITY_ADDED: - informVisibleActivityChanged(visibleActivityInfo, type); + notifyVisibleActivityChanged(visibleActivityInfo, type); mVisibleActivityInfos.add(visibleActivityInfo); break; case VisibleActivityInfo.TYPE_ACTIVITY_REMOVED: - informVisibleActivityChanged(visibleActivityInfo, type); + notifyVisibleActivityChanged(visibleActivityInfo, type); mVisibleActivityInfos.remove(visibleActivityInfo); break; } @@ -1214,7 +1217,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall } } - private void informVisibleActivityChanged(VisibleActivityInfo visibleActivityInfo, int type) { + private void notifyVisibleActivityChanged(VisibleActivityInfo visibleActivityInfo, int type) { for (Map.Entry<VisibleActivityCallback, Executor> e : mVisibleActivityCallbacks.entrySet()) { final Executor executor = e.getValue(); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 81305f90e2b8..0b395a8760cf 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -223,7 +223,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard @Override public void onSwipeUp() { if (!mUpdateMonitor.isFaceDetectionRunning()) { - boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(true, + boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth( FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER); mKeyguardSecurityCallback.userActivity(); if (didFaceAuthRun) { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 0351b411f222..bad75e8dd862 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1631,7 +1631,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab @Override public void onUdfpsPointerDown(int sensorId) { mLogger.logUdfpsPointerDown(sensorId); - requestFaceAuth(true, FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); + requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); } /** @@ -2372,14 +2372,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab /** * Requests face authentication if we're on a state where it's allowed. * This will re-trigger auth in case it fails. - * @param userInitiatedRequest true if the user explicitly requested face auth * @param reason One of the reasons {@link FaceAuthApiRequestReason} on why this API is being * invoked. * @return current face auth detection state, true if it is running. */ - public boolean requestFaceAuth(boolean userInitiatedRequest, - @FaceAuthApiRequestReason String reason) { - mLogger.logFaceAuthRequested(userInitiatedRequest, reason); + public boolean requestFaceAuth(@FaceAuthApiRequestReason String reason) { + mLogger.logFaceAuthRequested(reason); updateFaceListeningState(BIOMETRIC_ACTION_START, apiRequestReasonToUiEvent(reason)); return isFaceDetectionRunning(); } diff --git a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt index 31fc3204a7f1..3308f5550bfc 100644 --- a/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt +++ b/packages/SystemUI/src/com/android/keyguard/logging/KeyguardUpdateMonitorLogger.kt @@ -111,11 +111,10 @@ class KeyguardUpdateMonitorLogger @Inject constructor( }, { "Face help received, msgId: $int1 msg: $str1" }) } - fun logFaceAuthRequested(userInitiatedRequest: Boolean, reason: String?) { + fun logFaceAuthRequested(reason: String?) { logBuffer.log(TAG, DEBUG, { - bool1 = userInitiatedRequest str1 = reason - }, { "requestFaceAuth() userInitiated=$bool1 reason=$str1" }) + }, { "requestFaceAuth() reason=$str1" }) } fun logFaceAuthSuccess(userId: Int) { diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index b49d4523a765..96fe65f8fd40 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -859,9 +859,7 @@ public class UdfpsController implements DozeReceiver { playStartHaptic(); if (!mKeyguardUpdateMonitor.isFaceDetectionRunning()) { - mKeyguardUpdateMonitor.requestFaceAuth( - /* userInitiatedRequest */ false, - FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); + mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); } } mOnFingerDown = true; diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 0c3a0cf53db3..a247c31bc28d 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -193,7 +193,7 @@ object Flags { // 802 - wallpaper rendering // TODO(b/254512923): Tracking Bug - @JvmField val USE_CANVAS_RENDERER = ReleasedFlag(802) + @JvmField val USE_CANVAS_RENDERER = UnreleasedFlag(802, teamfood = true) // 803 - screen contents translation // TODO(b/254513187): Tracking Bug diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 026ef0e80686..40b58b927f0a 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -2669,8 +2669,8 @@ public final class NotificationPanelViewController { // When expanding QS, let's authenticate the user if possible, // this will speed up notification actions. - if (height == 0) { - mCentralSurfaces.requestFaceAuth(false, FaceAuthApiRequestReason.QS_EXPANDED); + if (height == 0 && !mKeyguardStateController.canDismissLockScreen()) { + mUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.QS_EXPANDED); } } @@ -3928,7 +3928,7 @@ public final class NotificationPanelViewController { mShadeLog.v("onMiddleClicked on Keyguard, mDozingOnDown: false"); // Try triggering face auth, this "might" run. Check // KeyguardUpdateMonitor#shouldListenForFace to see when face auth won't run. - boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth(true, + boolean didFaceAuthRun = mUpdateMonitor.requestFaceAuth( FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED); if (didFaceAuthRun) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java index 169c90780926..75b444fbd297 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java @@ -41,7 +41,6 @@ import androidx.lifecycle.LifecycleOwner; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.keyguard.AuthKeyguardMessageArea; -import com.android.keyguard.FaceAuthApiRequestReason; import com.android.systemui.Dumpable; import com.android.systemui.animation.ActivityLaunchAnimator; import com.android.systemui.animation.RemoteTransitionAdapter; @@ -230,13 +229,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn boolean isShadeDisabled(); - /** - * Request face auth to initiated - * @param userInitiatedRequest Whether this was a user initiated request - * @param reason Reason why face auth was triggered. - */ - void requestFaceAuth(boolean userInitiatedRequest, @FaceAuthApiRequestReason String reason); - @Override void startActivity(Intent intent, boolean onlyProvisioned, boolean dismissShade, int flags); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 9da502767a45..409cad0aecc5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -123,7 +123,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.RegisterStatusBarResult; import com.android.keyguard.AuthKeyguardMessageArea; -import com.android.keyguard.FaceAuthApiRequestReason; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.ViewMediatorCallback; @@ -1632,18 +1631,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { return (mDisabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) != 0; } - /** - * Asks {@link KeyguardUpdateMonitor} to run face auth. - */ - @Override - public void requestFaceAuth(boolean userInitiatedRequest, - @FaceAuthApiRequestReason String reason) { - if (!mKeyguardStateController.canDismissLockScreen()) { - mKeyguardUpdateMonitor.requestFaceAuth( - userInitiatedRequest, reason); - } - } - private void updateReportRejectedTouchVisibility() { if (mReportRejectedTouch == null) { return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt index 5e26cf062b58..4550cb2987ea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardLiftController.kt @@ -73,7 +73,6 @@ class KeyguardLiftController @Inject constructor( isListening = false updateListeningState() keyguardUpdateMonitor.requestFaceAuth( - true, FaceAuthApiRequestReason.PICK_UP_GESTURE_TRIGGERED ) keyguardUpdateMonitor.requestActiveUnlock( diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java index b885d546c517..f9bec65ab677 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java @@ -486,7 +486,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { registeredSwipeListener.onSwipeUp(); - verify(mKeyguardUpdateMonitor).requestFaceAuth(true, + verify(mKeyguardUpdateMonitor).requestFaceAuth( FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER); } @@ -499,16 +499,15 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { registeredSwipeListener.onSwipeUp(); verify(mKeyguardUpdateMonitor, never()) - .requestFaceAuth(true, - FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER); + .requestFaceAuth(FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER); } @Test public void onSwipeUp_whenFaceDetectionIsTriggered_hidesBouncerMessage() { KeyguardSecurityContainer.SwipeListener registeredSwipeListener = getRegisteredSwipeListener(); - when(mKeyguardUpdateMonitor.requestFaceAuth(true, - FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER)).thenReturn(true); + when(mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER)) + .thenReturn(true); setupGetSecurityView(); registeredSwipeListener.onSwipeUp(); @@ -520,8 +519,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { public void onSwipeUp_whenFaceDetectionIsNotTriggered_retainsBouncerMessage() { KeyguardSecurityContainer.SwipeListener registeredSwipeListener = getRegisteredSwipeListener(); - when(mKeyguardUpdateMonitor.requestFaceAuth(true, - FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER)).thenReturn(false); + when(mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.SWIPE_UP_ON_BOUNCER)) + .thenReturn(false); setupGetSecurityView(); registeredSwipeListener.onSwipeUp(); diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 1238eafd0aea..5104f84f3bc6 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -676,7 +676,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { bouncerFullyVisibleAndNotGoingToSleep(); mTestableLooper.processAllMessages(); - boolean didFaceAuthRun = mKeyguardUpdateMonitor.requestFaceAuth(true, + boolean didFaceAuthRun = mKeyguardUpdateMonitor.requestFaceAuth( NOTIFICATION_PANEL_CLICKED); assertThat(didFaceAuthRun).isTrue(); @@ -688,7 +688,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { biometricsDisabledForCurrentUser(); mTestableLooper.processAllMessages(); - boolean didFaceAuthRun = mKeyguardUpdateMonitor.requestFaceAuth(true, + boolean didFaceAuthRun = mKeyguardUpdateMonitor.requestFaceAuth( NOTIFICATION_PANEL_CLICKED); assertThat(didFaceAuthRun).isFalse(); @@ -707,8 +707,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { // Stop scanning when bouncer becomes visible setKeyguardBouncerVisibility(true); clearInvocations(mFaceManager); - mKeyguardUpdateMonitor.requestFaceAuth(true, - FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); + mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); } @@ -1695,7 +1694,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } private void triggerSuccessfulFaceAuth() { - mKeyguardUpdateMonitor.requestFaceAuth(true, FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); + mKeyguardUpdateMonitor.requestFaceAuth(FaceAuthApiRequestReason.UDFPS_POINTER_DOWN); verify(mFaceManager).authenticate(any(), any(), mAuthenticationCallbackCaptor.capture(), diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java index 300843f3da95..ac4dd49208c2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java @@ -1594,7 +1594,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mTouchHandler.onTouch(mock(View.class), mDownMotionEvent); mEmptySpaceClickListenerCaptor.getValue().onEmptySpaceClicked(0, 0); - verify(mUpdateMonitor).requestFaceAuth(true, + verify(mUpdateMonitor).requestFaceAuth( FaceAuthApiRequestReason.NOTIFICATION_PANEL_CLICKED); } @@ -1604,7 +1604,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mNotificationPanelViewController.mStatusBarStateListener; statusBarStateListener.onStateChanged(KEYGUARD); mNotificationPanelViewController.setDozing(false, false); - when(mUpdateMonitor.requestFaceAuth(true, NOTIFICATION_PANEL_CLICKED)).thenReturn(false); + when(mUpdateMonitor.requestFaceAuth(NOTIFICATION_PANEL_CLICKED)).thenReturn(false); // This sets the dozing state that is read when onMiddleClicked is eventually invoked. mTouchHandler.onTouch(mock(View.class), mDownMotionEvent); @@ -1619,7 +1619,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mNotificationPanelViewController.mStatusBarStateListener; statusBarStateListener.onStateChanged(KEYGUARD); mNotificationPanelViewController.setDozing(false, false); - when(mUpdateMonitor.requestFaceAuth(true, NOTIFICATION_PANEL_CLICKED)).thenReturn(true); + when(mUpdateMonitor.requestFaceAuth(NOTIFICATION_PANEL_CLICKED)).thenReturn(true); // This sets the dozing state that is read when onMiddleClicked is eventually invoked. mTouchHandler.onTouch(mock(View.class), mDownMotionEvent); @@ -1639,7 +1639,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mTouchHandler.onTouch(mock(View.class), mDownMotionEvent); mEmptySpaceClickListenerCaptor.getValue().onEmptySpaceClicked(0, 0); - verify(mUpdateMonitor, never()).requestFaceAuth(anyBoolean(), anyString()); + verify(mUpdateMonitor, never()).requestFaceAuth(anyString()); } @Test @@ -1650,7 +1650,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { mEmptySpaceClickListenerCaptor.getValue().onEmptySpaceClicked(0, 0); - verify(mUpdateMonitor, never()).requestFaceAuth(anyBoolean(), anyString()); + verify(mUpdateMonitor, never()).requestFaceAuth(anyString()); } diff --git a/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java index dd0c162d8467..f494f7277fc2 100644 --- a/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java @@ -51,6 +51,7 @@ import com.android.server.UiServiceTestCase; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -87,6 +88,7 @@ public class SliceManagerServiceTest extends UiServiceTestCase { LocalServices.removeServiceForTest(UsageStatsManagerInternal.class); } + @Ignore("b/253871109") @Test public void testAddPinCreatesPinned() throws RemoteException { grantSlicePermission(); @@ -97,6 +99,7 @@ public class SliceManagerServiceTest extends UiServiceTestCase { verify(mService, times(1)).createPinnedSlice(eq(maybeAddUserId(TEST_URI, 0)), anyString()); } + @Ignore("b/253871109") @Test public void testRemovePinDestroysPinned() throws RemoteException { grantSlicePermission(); @@ -109,6 +112,7 @@ public class SliceManagerServiceTest extends UiServiceTestCase { verify(mCreatedSliceState, never()).destroy(); } + @Ignore("b/253871109") @Test public void testCheckAutoGrantPermissions() throws RemoteException { String[] testPerms = new String[] { @@ -129,12 +133,14 @@ public class SliceManagerServiceTest extends UiServiceTestCase { verify(mContextSpy).checkPermission(eq("perm2"), eq(Process.myPid()), eq(Process.myUid())); } + @Ignore("b/253871109") @Test(expected = IllegalStateException.class) public void testNoPinThrow() throws Exception { grantSlicePermission(); mService.getPinnedSpecs(TEST_URI, "pkg"); } + @Ignore("b/253871109") @Test public void testGetPinnedSpecs() throws Exception { grantSlicePermission(); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java index a061618b1ca7..ae9be8c09e60 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java @@ -613,10 +613,10 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, mScheduledExecutorService.execute(() -> { if (DEBUG) { - Slog.d(TAG, "call updateVisibleActivitiesLocked from enable listening"); + Slog.d(TAG, "call handleVisibleActivitiesLocked from enable listening"); } synchronized (mLock) { - updateVisibleActivitiesLocked(); + handleVisibleActivitiesLocked(); } }); } @@ -641,10 +641,10 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, } mScheduledExecutorService.execute(() -> { if (DEBUG) { - Slog.d(TAG, "call updateVisibleActivitiesLocked from activity event"); + Slog.d(TAG, "call handleVisibleActivitiesLocked from activity event"); } synchronized (mLock) { - updateVisibleActivitiesLocked(); + handleVisibleActivitiesLocked(); } }); } @@ -679,9 +679,9 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, return visibleActivityInfos; } - private void updateVisibleActivitiesLocked() { + private void handleVisibleActivitiesLocked() { if (DEBUG) { - Slog.d(TAG, "updateVisibleActivitiesLocked"); + Slog.d(TAG, "handleVisibleActivitiesLocked"); } if (mSession == null) { return; @@ -692,13 +692,13 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, final List<VisibleActivityInfo> newVisibleActivityInfos = getVisibleActivityInfosLocked(); if (newVisibleActivityInfos == null || newVisibleActivityInfos.isEmpty()) { - updateVisibleActivitiesChangedLocked(mVisibleActivityInfos, + notifyVisibleActivitiesChangedLocked(mVisibleActivityInfos, VisibleActivityInfo.TYPE_ACTIVITY_REMOVED); mVisibleActivityInfos.clear(); return; } if (mVisibleActivityInfos.isEmpty()) { - updateVisibleActivitiesChangedLocked(newVisibleActivityInfos, + notifyVisibleActivitiesChangedLocked(newVisibleActivityInfos, VisibleActivityInfo.TYPE_ACTIVITY_ADDED); mVisibleActivityInfos.addAll(newVisibleActivityInfos); return; @@ -719,11 +719,11 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, } if (!addedActivities.isEmpty()) { - updateVisibleActivitiesChangedLocked(addedActivities, + notifyVisibleActivitiesChangedLocked(addedActivities, VisibleActivityInfo.TYPE_ACTIVITY_ADDED); } if (!removedActivities.isEmpty()) { - updateVisibleActivitiesChangedLocked(removedActivities, + notifyVisibleActivitiesChangedLocked(removedActivities, VisibleActivityInfo.TYPE_ACTIVITY_REMOVED); } @@ -731,7 +731,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, mVisibleActivityInfos.addAll(newVisibleActivityInfos); } - private void updateVisibleActivitiesChangedLocked( + private void notifyVisibleActivitiesChangedLocked( List<VisibleActivityInfo> visibleActivityInfos, int type) { if (visibleActivityInfos == null || visibleActivityInfos.isEmpty()) { return; @@ -741,15 +741,15 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, } try { for (int i = 0; i < visibleActivityInfos.size(); i++) { - mSession.updateVisibleActivityInfo(visibleActivityInfos.get(i), type); + mSession.notifyVisibleActivityInfoChanged(visibleActivityInfos.get(i), type); } } catch (RemoteException e) { if (DEBUG) { - Slog.w(TAG, "updateVisibleActivitiesChangedLocked RemoteException : " + e); + Slog.w(TAG, "notifyVisibleActivitiesChangedLocked RemoteException : " + e); } } if (DEBUG) { - Slog.d(TAG, "updateVisibleActivitiesChangedLocked type=" + type + ", count=" + Slog.d(TAG, "notifyVisibleActivitiesChangedLocked type=" + type + ", count=" + visibleActivityInfos.size()); } } |