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

Merge "Clean up USER_OWNER references in am/pm commands."

Browse Source
This commit is contained in:
Xiaohui Chen
2015-08-05 16:48:24 +00:00
committed by Android (Google) Code Review
parent 2b45f8a6ce 2ccf49e7f4
commit 3526534a06
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/am/src/com/android/commands/am/Am.java
View File

@@ -2220,7 +2220,7 @@ public class Am extends BaseCommand {
}
private void runSetInactive() throws Exception {
int userId = UserHandle.USER_OWNER;
int userId = UserHandle.USER_CURRENT;
String opt;
while ((opt=nextOption()) != null) {
@@ -2240,7 +2240,7 @@ public class Am extends BaseCommand {
}
private void runGetInactive() throws Exception {
int userId = UserHandle.USER_OWNER;
int userId = UserHandle.USER_CURRENT;
String opt;
while ((opt=nextOption()) != null) {

14
cmds/pm/src/com/android/commands/pm/Pm.java
View File

@@ -335,7 +335,7 @@ public final class Pm {
boolean listDisabled = false, listEnabled = false;
boolean listSystem = false, listThirdParty = false;
boolean listInstaller = false;
int userId = UserHandle.USER_OWNER;
int userId = UserHandle.USER_SYSTEM;
try {
String opt;
while ((opt=nextOption()) != null) {
@@ -846,7 +846,7 @@ public final class Pm {
// pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}
private int runSetAppLink() {
int userId = UserHandle.USER_OWNER;
int userId = UserHandle.USER_SYSTEM;
String opt;
while ((opt = nextOption()) != null) {
@@ -929,7 +929,7 @@ public final class Pm {
// pm get-app-link [--user USER_ID] PACKAGE
private int runGetAppLink() {
int userId = UserHandle.USER_OWNER;
int userId = UserHandle.USER_SYSTEM;
String opt;
while ((opt = nextOption()) != null) {
@@ -1090,7 +1090,7 @@ public final class Pm {
}
if (userId == UserHandle.USER_ALL) {
userId = UserHandle.USER_OWNER;
userId = UserHandle.USER_SYSTEM;
installFlags |= PackageManager.INSTALL_ALL_USERS;
}
@@ -1216,7 +1216,7 @@ public final class Pm {
}
if (userId == UserHandle.USER_ALL) {
userId = UserHandle.USER_OWNER;
userId = UserHandle.USER_SYSTEM;
params.installFlags |= PackageManager.INSTALL_ALL_USERS;
}
@@ -1547,7 +1547,7 @@ public final class Pm {
}
if (userId == UserHandle.USER_ALL) {
userId = UserHandle.USER_OWNER;
userId = UserHandle.USER_SYSTEM;
flags |= PackageManager.DELETE_ALL_USERS;
} else {
PackageInfo info;
@@ -1758,7 +1758,7 @@ public final class Pm {
}
private int runGrantRevokePermission(boolean grant) {
int userId = UserHandle.USER_OWNER;
int userId = UserHandle.USER_SYSTEM;
String opt = null;
while ((opt = nextOption()) != null) {