From d453eb1b50f9b31db887be73b650f16b9e3c1435 Mon Sep 17 00:00:00 2001 From: Joanne Chung Date: Thu, 6 Jul 2023 11:21:36 +0000 Subject: [PATCH] Use new PackageMonitor#register() without externalStorage parameter The externalStorage is not be used now, we are migrate to use new method. Bug: 29385425 Test: build and boot home Test: atest PackageMonitorTest Change-Id: I77c000912e5604b2770a51ab42cb28a7f1246fef --- .../com/android/internal/content/PackageMonitor.java | 2 +- .../com/android/internal/content/PackageMonitorTest.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/java/com/android/internal/content/PackageMonitor.java b/core/java/com/android/internal/content/PackageMonitor.java index d78689e9955b7..b7a2c719a0acb 100644 --- a/core/java/com/android/internal/content/PackageMonitor.java +++ b/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)); } diff --git a/core/tests/coretests/src/com/android/internal/content/PackageMonitorTest.java b/core/tests/coretests/src/com/android/internal/content/PackageMonitorTest.java index 5290478dfbd3c..7ccbf1d256743 100644 --- a/core/tests/coretests/src/com/android/internal/content/PackageMonitorTest.java +++ b/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);