diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-05-01 15:42:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-01 15:42:07 +0000 |
| commit | 973a1d27417d22add96d716bfce702a48543931b (patch) | |
| tree | f2db5763c5baee165a8d96f3ba9d22e185e9f0e9 | |
| parent | ae84e20b2a0cb77223d40f55c71011d3ae8c71c7 (diff) | |
| parent | f2e7b3f56ae0ea9f49b5c50413b9be71d5249d6d (diff) | |
| download | frameworks_base-973a1d27417d22add96d716bfce702a48543931b.zip frameworks_base-973a1d27417d22add96d716bfce702a48543931b.tar.gz frameworks_base-973a1d27417d22add96d716bfce702a48543931b.tar.bz2 | |
Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding""
| -rw-r--r-- | core/java/android/os/UserManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index b6a872a..1b2b798 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -504,8 +504,7 @@ public class UserManager { ArrayList<UserHandle> profiles = new ArrayList<UserHandle>(); List<UserInfo> users = new ArrayList<UserInfo>(); try { - // TODO: Switch enabledOnly to true once client apps are updated - users = mService.getProfiles(UserHandle.myUserId(), false /* enabledOnly */); + users = mService.getProfiles(UserHandle.myUserId(), true /* enabledOnly */); } catch (RemoteException re) { Log.w(TAG, "Could not get user list", re); return null; |