diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-10-13 01:24:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-13 01:24:29 +0000 |
| commit | 45f704a4d0eb8d05e4f89f08385cc76f99be4048 (patch) | |
| tree | acc1369cfa23f24b43eb309a6fe3ac75b365f082 /cmds/appops | |
| parent | 4ffea4e4da10c14203a690d67cadf5b39489f84c (diff) | |
| parent | 89eaa06a10ed399ae9919de2795f76c2af932adc (diff) | |
am 89eaa06a: am 6382a950: am 2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '89eaa06a10ed399ae9919de2795f76c2af932adc':
Handle 'root' pseudo-package in the appops command
Diffstat (limited to 'cmds/appops')
| -rw-r--r-- | cmds/appops/src/com/android/commands/appops/AppOpsCommand.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java index d1f7a0098e21..c9b9e5862a48 100644 --- a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java +++ b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java @@ -168,7 +168,12 @@ public class AppOpsCommand extends BaseCommand { final IPackageManager pm = ActivityThread.getPackageManager(); final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface( 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) { System.err.println("Error: No UID for " + packageName + " in user " + userId); return; @@ -211,7 +216,12 @@ public class AppOpsCommand extends BaseCommand { final IPackageManager pm = ActivityThread.getPackageManager(); final IAppOpsService appOpsService = IAppOpsService.Stub.asInterface( 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) { System.err.println("Error: No UID for " + packageName + " in user " + userId); return; |