Merge "Use new PackageMonitor#register() without externalStorage parameter" into main

core/java/com/android/internal/content/PackageMonitor.java

@@ -95,7 +95,7 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver {
     @UnsupportedAppUsage
     public void register(Context context, Looper thread, UserHandle user,
             boolean externalStorage) {
-        register(context, user, externalStorage,
+        register(context, user,
                 (thread == null) ? BackgroundThread.getHandler() : new Handler(thread));
     }
 

core/tests/coretests/src/com/android/internal/content/PackageMonitorTest.java

@@ -63,23 +63,20 @@ public class PackageMonitorTest {
     public void testPackageMonitorMultipleRegisterThrowsException() throws Exception {
         PackageMonitor spyPackageMonitor = spy(new TestPackageMonitor());
 
-        spyPackageMonitor.register(mMockContext, UserHandle.ALL, false /* externalStorage */,
-                mMockHandler);
+        spyPackageMonitor.register(mMockContext, UserHandle.ALL, mMockHandler);
         assertThat(spyPackageMonitor.getRegisteredHandler()).isEqualTo(mMockHandler);
         verify(mMockContext, times(2)).registerReceiverAsUser(any(), eq(UserHandle.ALL), any(),
                 eq(null), eq(mMockHandler));
 
         assertThrows(IllegalStateException.class,
-                () -> spyPackageMonitor.register(mMockContext, UserHandle.ALL,
-                        false /* externalStorage */, mMockHandler));
+                () -> spyPackageMonitor.register(mMockContext, UserHandle.ALL, mMockHandler));
     }
 
     @Test
     public void testPackageMonitorRegisterMultipleUnRegisterThrowsException() throws Exception {
         PackageMonitor spyPackageMonitor = spy(new TestPackageMonitor());
 
-        spyPackageMonitor.register(mMockContext, UserHandle.ALL, false /* externalStorage */,
-                mMockHandler);
+        spyPackageMonitor.register(mMockContext, UserHandle.ALL, mMockHandler);
         spyPackageMonitor.unregister();
 
         assertThrows(IllegalStateException.class, spyPackageMonitor::unregister);