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

am a30c2028: Merge "Temporarily switch off returning only enabled profiles to support dogfooding"

Browse Source 
* commit 'a30c20287ce2f6dd15bc402b66e5d5721ad65699':
  Temporarily switch off returning only enabled profiles to support dogfooding
This commit is contained in:
Alexandra Gherghina
2014-04-25 17:18:22 +00:00
committed by Android Git Automerger
parent 1b27c34fb6 d8e6a5f18a
commit ded34b77ee
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/UserManager.java
View File

@@ -492,7 +492,8 @@ public class UserManager {
ArrayList<UserHandle> profiles = new ArrayList<UserHandle>();
List<UserInfo> users = new ArrayList<UserInfo>();
try {
users = mService.getProfiles(UserHandle.myUserId(), true /* enabledOnly */);
// TODO: Switch enabledOnly to true once client apps are updated
users = mService.getProfiles(UserHandle.myUserId(), false /* enabledOnly */);
} catch (RemoteException re) {
Log.w(TAG, "Could not get user list", re);
return null;