Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59f8eb5b authored by Sumedh Sen's avatar Sumedh Sen Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile... 

[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133df

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22509574



Change-Id: I0b10856f8b6be2458f656aad966983c8b6b52eda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4b42b86 28e133df

services/core/java/com/android/server/pm/InstallPackageHelper.java

+18 −2
Original line number Diff line number Diff line
@@ -2093,9 +2093,25 @@ final class InstallPackageHelper { 
                    // The caller explicitly specified INSTALL_ALL_USERS flag.

                    // Thus, updating the settings to install the app for all users.

                    for (int currentUserId : allUsers) {

                        // If the app is already installed for the currentUser,

                        // keep it as installed as we might be updating the app at this place.

                        // If not currently installed, check if the currentUser is restricted by

                        // DISALLOW_INSTALL_APPS or DISALLOW_DEBUGGING_FEATURES device policy.

                        // Install / update the app if the user isn't restricted. Skip otherwise.

                        final boolean installedForCurrentUser = ArrayUtils.contains(

                                installedForUsers, currentUserId);

                        final boolean restrictedByPolicy =

                                mPm.isUserRestricted(currentUserId,

                                        UserManager.DISALLOW_INSTALL_APPS)

                                || mPm.isUserRestricted(currentUserId,

                                        UserManager.DISALLOW_DEBUGGING_FEATURES);

                        if (installedForCurrentUser || !restrictedByPolicy) {

                            ps.setInstalled(true, currentUserId);

                        ps.setEnabled(COMPONENT_ENABLED_STATE_DEFAULT, userId,

                            ps.setEnabled(COMPONENT_ENABLED_STATE_DEFAULT, currentUserId,

                                installerPackageName);

                        } else {

                            ps.setInstalled(false, currentUserId);

                        }

                    }

                }