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

Merge "Default settings user to current."

Browse Source
This commit is contained in:
Nicholas Sauer
2018-12-08 17:30:25 +00:00
committed by Android (Google) Code Review
parent e5bd844eaf 1698e02b6c
commit dfeea60477
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
View File

@@ -105,7 +105,7 @@ final public class SettingsService extends Binder {
RESET,
}
int mUser = -1; // unspecified
int mUser = UserHandle.USER_NULL;
CommandVerb mVerb = CommandVerb.UNSPECIFIED;
String mTable = null;
String mKey = null;
@@ -132,15 +132,15 @@ final public class SettingsService extends Binder {
String arg = cmd;
do {
if ("--user".equals(arg)) {
if (mUser != -1) {
// --user specified more than once; invalid
if (mUser != UserHandle.USER_NULL) {
perr.println("Invalid user: --user specified more than once");
break;
}
arg = getNextArgRequired();
if ("current".equals(arg) || "cur".equals(arg)) {
mUser = UserHandle.USER_CURRENT;
} else {
mUser = Integer.parseInt(arg);
mUser = UserHandle.parseUserArg(getNextArgRequired());
if (mUser == UserHandle.USER_ALL) {
perr.println("Invalid user: all");
return -1;
}
} else if (mVerb == CommandVerb.UNSPECIFIED) {
if ("get".equalsIgnoreCase(arg)) {
@@ -254,16 +254,13 @@ final public class SettingsService extends Binder {
return -1;
}
if (mUser == UserHandle.USER_CURRENT) {
if (mUser == UserHandle.USER_NULL || mUser == UserHandle.USER_CURRENT) {
try {
mUser = ActivityManager.getService().getCurrentUser().id;
} catch (RemoteException e) {
throw new RuntimeException("Failed in IPC", e);
}
}
if (mUser < 0) {
mUser = UserHandle.USER_SYSTEM;
}
UserManager userManager = UserManager.get(mProvider.getContext());
if (userManager.getUserInfo(mUser) == null) {
perr.println("Invalid user: " + mUser);