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

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2020-03-05 08:23:39 +00:00
committed by Android (Google) Code Review
parent 5a1a4f2241 9ce0a7c2f0
commit 076eb948c0
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 Manifest.permission.WRITE_EXTERNAL_STORAGE
}; };
@Nullable public static String sMediaStoreAuthorityProcessName;
private final AtomicFile mSettingsFile; private final AtomicFile mSettingsFile;
/** /**
@@ -1840,6 +1842,7 @@ class StorageManagerService extends IStorageManager.Stub
UserHandle.getUserId(UserHandle.USER_SYSTEM)); UserHandle.getUserId(UserHandle.USER_SYSTEM));
if (provider != null) { if (provider != null) {
mMediaStoreAuthorityAppId = UserHandle.getAppId(provider.applicationInfo.uid); mMediaStoreAuthorityAppId = UserHandle.getAppId(provider.applicationInfo.uid);
sMediaStoreAuthorityProcessName = provider.applicationInfo.processName;
} }
provider = mPmInternal.resolveContentProvider( 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) { private static boolean isInterestingJavaProcess(String processName) {
return processName.equals("com.android.phone"); return processName.equals(StorageManagerService.sMediaStoreAuthorityProcessName)
|| processName.equals("com.android.phone");
} }
/** /**