Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 076eb948 authored Mar 05, 2020 by Zimuzo Ezeozue Committed by Android (Google) Code Review Mar 05, 2020

Merge "Dump the FUSE daemons stacks during ANRs" into rvc-dev

parents 5a1a4f22 9ce0a7c2

services/core/java/com/android/server/StorageManagerService.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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(

services/core/java/com/android/server/Watchdog.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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");
	}		}

	/**		/**