Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dump the FUSE daemons stacks during ANRs" into rvc-dev am: 076eb948c0

Browse Source 
Change-Id: I730e1743a653a6bc41a7764c60f26758ccb80c7f
This commit is contained in:
Automerger Merge Worker
2020-03-05 08:32:39 +00:00
parent 0935559d37 076eb948c0
commit 6f82a75b5a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -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(

3
services/core/java/com/android/server/Watchdog.java
View File

@@ -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");
}
/**