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

* commit '6382a950cdd651070bcdedd5f89e6fc78e2b0450':
  Handle 'root' pseudo-package in the appops command
This commit is contained in:
Adam Lesinski
2015-10-12 19:40:06 +00:00
committed by Android Git Automerger

View File

@@ -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;