From d59b064398e101181b2192dfbc6425024dc49049 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 25 Apr 2013 15:18:12 -0700 Subject: [PATCH] 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 --- src/com/android/launcher2/Launcher.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index fc42f3f799..0aab2acafe 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; }