diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 4bfd077760e4..4bec61acc38f 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -2892,17 +2892,20 @@ final class InstallPackageHelper { mPm.notifyPackageChanged(packageName, request.getAppId()); } - // Apply restricted settings on potentially dangerous packages. Needs to happen - // after appOpsManager is notified of the new package - if (request.getPackageSource() == PackageInstaller.PACKAGE_SOURCE_LOCAL_FILE - || request.getPackageSource() - == PackageInstaller.PACKAGE_SOURCE_DOWNLOADED_FILE) { - final int appId = request.getAppId(); - mPm.mHandler.post(() -> { - for (int userId : firstUserIds) { - enableRestrictedSettings(packageName, appId, userId); - } - }); + if (!android.permission.flags.Flags.enhancedConfirmationModeApisEnabled() + || !android.security.Flags.extendEcmToAllSettings()) { + // Apply restricted settings on potentially dangerous packages. Needs to happen + // after appOpsManager is notified of the new package + if (request.getPackageSource() == PackageInstaller.PACKAGE_SOURCE_LOCAL_FILE + || request.getPackageSource() + == PackageInstaller.PACKAGE_SOURCE_DOWNLOADED_FILE) { + final int appId = request.getAppId(); + mPm.mHandler.post(() -> { + for (int userId : firstUserIds) { + enableRestrictedSettings(packageName, appId, userId); + } + }); + } } // Log current value of "unknown sources" setting |