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

Merge "Fix recent checkPermission() bug."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-23 20:27:27 +00:00
committed by Android (Google) Code Review
parent eeb4e1d219 d69b083bc3
commit 1f42d9a6ec
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ContextImpl.java
View File

@@ -1591,12 +1591,15 @@ class ContextImpl extends Context {
}
final IActivityManager am = ActivityManager.getService();
if (am == null && UserHandle.getAppId(Binder.getCallingUid()) == Process.SYSTEM_UID) {
if (am == null) {
// Well this is super awkward; we somehow don't have an active
// ActivityManager instance. If this is the system UID, then we
// totally have whatever permission this is.
Slog.w(TAG, "Missing ActivityManager; assuming system UID holds " + permission);
return PackageManager.PERMISSION_GRANTED;
// ActivityManager instance. If we're testing a root or system
// UID, then they totally have whatever permission this is.
final int appId = UserHandle.getAppId(uid);
if (appId == Process.ROOT_UID || appId == Process.SYSTEM_UID) {
Slog.w(TAG, "Missing ActivityManager; assuming " + uid + " holds " + permission);
return PackageManager.PERMISSION_GRANTED;
}
}
try {