diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index c346f7163d3d..c1caeac94479 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -602,11 +602,8 @@ final class Settings { // original default value is true), or we are being // asked to install for all users, or this is the // user we are installing for. - // In this context all users (USER_ALL) implies an adb install, - // so we additionally check whether that is allowed for this user. final boolean installed = installUser == null - || (installUser.getIdentifier() == UserHandle.USER_ALL - && (!isUnknownSourcesDisallowed(user.id))) + || installUser.getIdentifier() == UserHandle.USER_ALL || installUser.getIdentifier() == user.id; p.setUserState(user.id, COMPONENT_ENABLED_STATE_DEFAULT, installed, @@ -673,10 +670,7 @@ final class Settings { List<UserInfo> users = getAllUsers(); if (users != null) { for (UserInfo user : users) { - // Installing for USER_ALL implies an adb install, so we - // additionally check whether that is allowed for this user. - if ((installUser.getIdentifier() == UserHandle.USER_ALL - && (!isUnknownSourcesDisallowed(user.id))) + if (installUser.getIdentifier() == UserHandle.USER_ALL || installUser.getIdentifier() == user.id) { boolean installed = p.getInstalled(user.id); if (!installed) { @@ -691,12 +685,6 @@ final class Settings { return p; } - boolean isUnknownSourcesDisallowed(int userId) { - UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE); - return um.getUserRestrictions(new UserHandle(userId)).getBoolean( - UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, false); - } - void insertPackageSettingLPw(PackageSetting p, PackageParser.Package pkg) { p.pkg = pkg; // pkg.mSetEnabled = p.getEnabled(userId); |