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

am 2327239d: Merge "Handle \'root\' pseudo-package in the appops command"

Browse Source 
* commit '2327239d65525d8ba2bdbedd6e59809fef447a12':
  Handle 'root' pseudo-package in the appops command
This commit is contained in:
Adam Lesinski
2015-10-12 19:34:28 +00:00
committed by Android Git Automerger
parent 6029dfa81a 2327239d65
commit 6382a950cd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
View File

@@ -168,7 +168,12 @@ public class AppOpsCommand extends BaseCommand {
final IPackageManager pm = ActivityThread.getPackageManager(); final IPackageManager pm = ActivityThread.getPackageManager();
final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface( final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface(
ServiceManager.getService(Context.APP_OPS_SERVICE)); ServiceManager.getService(Context.APP_OPS_SERVICE));
final int uid = pm.getPackageUid(packageName, userId); final int uid;
if ("root".equals(packageName)) {
uid = 0;
} else {
uid = pm.getPackageUid(packageName, userId);
}
if (uid < 0) { if (uid < 0) {
System.err.println("Error: No UID for " + packageName + " in user " + userId); System.err.println("Error: No UID for " + packageName + " in user " + userId);
return; return;
@@ -211,7 +216,12 @@ public class AppOpsCommand extends BaseCommand {
final IPackageManager pm = ActivityThread.getPackageManager(); final IPackageManager pm = ActivityThread.getPackageManager();
final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface( final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface(
ServiceManager.getService(Context.APP_OPS_SERVICE)); ServiceManager.getService(Context.APP_OPS_SERVICE));
final int uid = pm.getPackageUid(packageName, userId); final int uid;
if ("root".equals(packageName)) {
uid = 0;
} else {
uid = pm.getPackageUid(packageName, userId);
}
if (uid < 0) { if (uid < 0) {
System.err.println("Error: No UID for " + packageName + " in user " + userId); System.err.println("Error: No UID for " + packageName + " in user " + userId);
return; return;