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

Merge "Clear identity when killing media provider." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-07-17 23:29:51 +00:00
committed by Android (Google) Code Review
parent d3f327be2d b3cf953345
commit c9eb398a1b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/MountService.java
View File

@@ -740,15 +740,20 @@ class MountService extends IMountService.Stub
*/
@Deprecated
private void killMediaProvider() {
final ProviderInfo provider = mPms.resolveContentProvider(MediaStore.AUTHORITY, 0,
UserHandle.USER_OWNER);
if (provider != null) {
final IActivityManager am = ActivityManagerNative.getDefault();
try {
am.killApplicationWithAppId(provider.applicationInfo.packageName,
UserHandle.getAppId(provider.applicationInfo.uid), "vold reset");
} catch (RemoteException e) {
final long token = Binder.clearCallingIdentity();
try {
final ProviderInfo provider = mPms.resolveContentProvider(MediaStore.AUTHORITY, 0,
UserHandle.USER_OWNER);
if (provider != null) {
final IActivityManager am = ActivityManagerNative.getDefault();
try {
am.killApplicationWithAppId(provider.applicationInfo.packageName,
UserHandle.getAppId(provider.applicationInfo.uid), "vold reset");
} catch (RemoteException e) {
}
}
} finally {
Binder.restoreCallingIdentity(token);
}
}