summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-04-25 15:18:12 -0700
committerAmith Yamasani <yamasani@google.com>2013-04-25 15:18:12 -0700
commitd59b064398e101181b2192dfbc6425024dc49049 (patch)
treec74244961bc2585a6424eaf2e1c1323502e69432 /src
parent0f3a20d96aa0bbf84ec2fe3777d8600baa9e025f (diff)
downloadandroid_packages_apps_Trebuchet-d59b064398e101181b2192dfbc6425024dc49049.tar.gz
android_packages_apps_Trebuchet-d59b064398e101181b2192dfbc6425024dc49049.tar.bz2
android_packages_apps_Trebuchet-d59b064398e101181b2192dfbc6425024dc49049.zip
Use user restrictions instead of isLinkedUser
Use a different API to query if the user is likely to have fewer apps installed. Bug: 8720520 Change-Id: Ic4cbca47679627b33e08fd83653f8d20de294675
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java10
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;
}