diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-25 21:23:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 21:23:17 -0700 |
| commit | fd12e7ab97a47274326ca75bce9fee7dcd27a233 (patch) | |
| tree | 6f751affb1da403f0cb5d4e770387fe8aca4c547 /src/com/android/launcher2 | |
| parent | ffaebb0ea5b8605ebb641d3ee75c3311d9a8800b (diff) | |
| parent | 6df4c12b475aca7087f79c3fa5c3d56a2b18f8b7 (diff) | |
| download | android_packages_apps_Trebuchet-fd12e7ab97a47274326ca75bce9fee7dcd27a233.tar.gz android_packages_apps_Trebuchet-fd12e7ab97a47274326ca75bce9fee7dcd27a233.tar.bz2 android_packages_apps_Trebuchet-fd12e7ab97a47274326ca75bce9fee7dcd27a233.zip | |
am 6df4c12b: am d59b0643: Use user restrictions instead of isLinkedUser
* commit '6df4c12b475aca7087f79c3fa5c3d56a2b18f8b7':
Use user restrictions instead of isLinkedUser
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index fc42f3f79..0aab2acaf 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -3796,9 +3796,13 @@ public final class Launcher extends Activity // seeded when they start up for the first time. Clings won't work well with that boolean supportsLimitedUsers = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2; - if (supportsLimitedUsers) { - final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE); - if (um.isLinkedUser()) return false; + Account[] accounts = AccountManager.get(this).getAccounts(); + if (supportsLimitedUsers && accounts.length == 0) { + UserManager um = (UserManager) getSystemService(Context.USER_SERVICE); + Bundle restrictions = um.getUserRestrictions(); + if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) { + return false; + } } return true; } |