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

Merge "Use the current user rather than USER_SYSTEM as default user for AccountManagerServiceShellCommand" into qt-qpr1-dev

Browse Source 
am: 1a89a00e8c

Change-Id: Ie69c81742f37fce541adbc82461a1cfbc85bd1ff
This commit is contained in:
Nicholas Sauer
2019-08-09 16:34:02 -07:00
committed by android-build-merger
parent 0ba5ab167f 1a89a00e8c
commit 99a2534b07
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/accounts/AccountManagerServiceShellCommand.java
View File

@@ -17,6 +17,7 @@
package com.android.server.accounts; package com.android.server.accounts;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.ActivityManager;
import android.os.ShellCommand; import android.os.ShellCommand;
import android.os.UserHandle; import android.os.UserHandle;
@@ -83,7 +84,7 @@ final class AccountManagerServiceShellCommand extends ShellCommand {
return null; return null;
} }
} }
return UserHandle.USER_SYSTEM; return ActivityManager.getCurrentUser();
} }
@Override @Override
@@ -92,9 +93,11 @@ final class AccountManagerServiceShellCommand extends ShellCommand {
pw.println("Account manager service commands:"); pw.println("Account manager service commands:");
pw.println(" help"); pw.println(" help");
pw.println(" Print this help text."); pw.println(" Print this help text.");
pw.println(" set-bind-instant-service-allowed [--user <USER_ID>] true|false "); pw.println(" set-bind-instant-service-allowed "
+ "[--user <USER_ID> (current user if not specified)] true|false ");
pw.println(" Set whether binding to services provided by instant apps is allowed."); pw.println(" Set whether binding to services provided by instant apps is allowed.");
pw.println(" get-bind-instant-service-allowed [--user <USER_ID>]"); pw.println(" get-bind-instant-service-allowed "
+ "[--user <USER_ID> (current user if not specified)]");
pw.println(" Get whether binding to services provided by instant apps is allowed."); pw.println(" Get whether binding to services provided by instant apps is allowed.");
} }
} }