diff options
-rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 3 | ||||
-rw-r--r-- | services/core/java/com/android/server/Watchdog.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 57c6e5b876b1..b7d050a25484 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -335,6 +335,8 @@ class StorageManagerService extends IStorageManager.Stub Manifest.permission.WRITE_EXTERNAL_STORAGE }; + @Nullable public static String sMediaStoreAuthorityProcessName; + private final AtomicFile mSettingsFile; /** @@ -1840,6 +1842,7 @@ class StorageManagerService extends IStorageManager.Stub UserHandle.getUserId(UserHandle.USER_SYSTEM)); if (provider != null) { mMediaStoreAuthorityAppId = UserHandle.getAppId(provider.applicationInfo.uid); + sMediaStoreAuthorityProcessName = provider.applicationInfo.processName; } provider = mPmInternal.resolveContentProvider( diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index 6b0c5780215e..93b16f762fd9 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -362,7 +362,8 @@ public class Watchdog extends Thread { } private static boolean isInterestingJavaProcess(String processName) { - return processName.equals("com.android.phone"); + return processName.equals(StorageManagerService.sMediaStoreAuthorityProcessName) + || processName.equals("com.android.phone"); } /** |