Merge "Remove onHandleUserStop from PackageMonitor" into main

4 files changed, 3 insertions, 36 deletions

diff --git a/core/java/com/android/internal/content/PackageMonitor.java b/core/java/com/android/internal/content/PackageMonitor.java
index 663067ce7ae6..0b69030d384f 100644
--- a/core/java/com/android/internal/content/PackageMonitor.java
+++ b/core/java/com/android/internal/content/PackageMonitor.java
@@ -48,7 +48,6 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
     static final String TAG = "PackageMonitor";
 
     final IntentFilter mPackageFilt;
-    final IntentFilter mNonDataFilt;
 
     Context mRegisteredContext;
     Handler mRegisteredHandler;
@@ -78,13 +77,6 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
         if (isCore) {
             mPackageFilt.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
         }
-
-        mNonDataFilt = new IntentFilter();
-        // UserController sends the broadcast
-        mNonDataFilt.addAction(Intent.ACTION_USER_STOPPED);
-        if (isCore) {
-            mNonDataFilt.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-        }
     }
 
     @UnsupportedAppUsage
@@ -111,10 +103,8 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
         mRegisteredHandler = Objects.requireNonNull(handler);
         if (user != null) {
             context.registerReceiverAsUser(this, user, mPackageFilt, null, mRegisteredHandler);
-            context.registerReceiverAsUser(this, user, mNonDataFilt, null, mRegisteredHandler);
         } else {
             context.registerReceiver(this, mPackageFilt, null, mRegisteredHandler);
-            context.registerReceiver(this, mNonDataFilt, null, mRegisteredHandler);
         }
         if (mPackageMonitorCallback == null) {
             PackageManager pm = mRegisteredContext.getPackageManager();
@@ -216,9 +206,6 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
         return false;
     }
 
-    public void onHandleUserStop(Intent intent, int userHandle) {
-    }
-
     public void onUidRemoved(int uid) {
     }
     
@@ -463,10 +450,6 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
                     intent.getIntExtra(Intent.EXTRA_UID, 0), true);
         } else if (Intent.ACTION_UID_REMOVED.equals(action)) {
             onUidRemoved(intent.getIntExtra(Intent.EXTRA_UID, 0));
-        } else if (Intent.ACTION_USER_STOPPED.equals(action)) {
-            if (intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
-                onHandleUserStop(intent, intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0));
-            }
         } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
             String[] pkgList = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
             mAppearingPackages = pkgList;
diff --git a/core/tests/packagemonitortests/src/com/android/internal/content/PackageMonitorTest.java b/core/tests/packagemonitortests/src/com/android/internal/content/PackageMonitorTest.java
index c7eddabefc11..a3399070ebcd 100644
--- a/core/tests/packagemonitortests/src/com/android/internal/content/PackageMonitorTest.java
+++ b/core/tests/packagemonitortests/src/com/android/internal/content/PackageMonitorTest.java
@@ -17,6 +17,7 @@
 package com.android.internal.content;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -67,7 +68,7 @@ public class PackageMonitorTest {
 
         spyPackageMonitor.register(mMockContext, UserHandle.ALL, mMockHandler);
         assertThat(spyPackageMonitor.getRegisteredHandler()).isEqualTo(mMockHandler);
-        verify(mMockContext, times(2)).registerReceiverAsUser(any(), eq(UserHandle.ALL), any(),
+        verify(mMockContext, times(1)).registerReceiverAsUser(any(), eq(UserHandle.ALL), any(),
                 eq(null), eq(mMockHandler));
 
         assertThrows(IllegalStateException.class,
@@ -138,19 +139,6 @@ public class PackageMonitorTest {
     }
 
     @Test
-    public void testPackageMonitorDoHandlePackageEventUserStop() throws Exception {
-        PackageMonitor spyPackageMonitor = spy(new TestPackageMonitor());
-
-        Intent intent = new Intent(Intent.ACTION_USER_STOPPED);
-        intent.putExtra(Intent.EXTRA_USER_HANDLE, FAKE_USER_ID);
-        spyPackageMonitor.doHandlePackageEvent(intent);
-
-        verify(spyPackageMonitor, times(1)).onBeginPackageChanges();
-        verify(spyPackageMonitor, times(1)).onHandleUserStop(eq(intent), eq(FAKE_USER_ID));
-        verify(spyPackageMonitor, times(1)).onFinishPackageChanges();
-    }
-
-    @Test
     public void testPackageMonitorDoHandlePackageEventExternalApplicationAvailable()
             throws Exception {
         PackageMonitor spyPackageMonitor = spy(new TestPackageMonitor());
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/PackageUpdateMonitorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/PackageUpdateMonitorTest.kt
index 9260f63c1195..617e3101f403 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/controller/PackageUpdateMonitorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/controls/controller/PackageUpdateMonitorTest.kt
@@ -60,7 +60,7 @@ class PackageUpdateMonitorTest : SysuiTestCase() {
 
         underTest.startMonitoring()
         // There are two receivers registered
-        verify(context, times(2))
+        verify(context, times(1))
             .registerReceiverAsUser(any(), eq(USER), any(), eq(null), eq(bgHandler))
         verify(packageManager).registerPackageMonitorCallback(any(), eq(USER.getIdentifier()))
         // context will be used to get PackageManager, the test should clear invocations
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 98cc1dab1601..138e575a6872 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -2403,10 +2403,6 @@ public class VoiceInteractionManagerService extends SystemService {
             }
 
             @Override
-            public void onHandleUserStop(Intent intent, int userHandle) {
-            }
-
-            @Override
             public void onPackageModified(@NonNull String pkgName) {
                 // If the package modified is not in the current user, then don't bother making
                 // any changes as we are going to do any initialization needed when we switch users.