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

Merge "Make sure we get valid package name or fail." into mnc-dev

Browse Source
This commit is contained in:
Svetoslav
2015-07-15 23:03:45 +00:00
committed by Android (Google) Code Review
parent 06476508c4 7395cbf070
commit 08dda27be4
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/os/storage/StorageManager.java
View File

@@ -860,8 +860,23 @@ public class StorageManager {
final IMountService mountService = IMountService.Stub.asInterface( final IMountService mountService = IMountService.Stub.asInterface(
ServiceManager.getService("mount")); ServiceManager.getService("mount"));
try { try {
final String packageName = ActivityThread.currentOpPackageName(); String packageName = ActivityThread.currentOpPackageName();
if (packageName == null) {
// Package name can be null if the activity thread is running but the app
// hasn't bound yet. In this case we fall back to the first package in the
// current UID. This works for runtime permissions as permission state is
// per UID and permission realted app ops are updated for all UID packages.
String[] packageNames = ActivityThread.getPackageManager().getPackagesForUid(
android.os.Process.myUid());
if (packageNames == null || packageNames.length <= 0) {
return new StorageVolume[0];
}
packageName = packageNames[0];
}
final int uid = ActivityThread.getPackageManager().getPackageUid(packageName, userId); final int uid = ActivityThread.getPackageManager().getPackageUid(packageName, userId);
if (uid <= 0) {
return new StorageVolume[0];
}
return mountService.getVolumeList(uid, packageName); return mountService.getVolumeList(uid, packageName);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();