am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev (80a3fbf4) · Commits · e / os / android_frameworks_base

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -740,6 +740,8 @@ class MountService extends IMountService.Stub
		*/
		@Deprecated
		private void killMediaProvider() {
		final long token = Binder.clearCallingIdentity();
		try {
		final ProviderInfo provider = mPms.resolveContentProvider(MediaStore.AUTHORITY, 0,
		UserHandle.USER_OWNER);
		if (provider != null) {
		@@ -750,6 +752,9 @@ class MountService extends IMountService.Stub
		} catch (RemoteException e) {
		}
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		private void resetIfReadyAndConnectedLocked() {