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

Commit f9cac99f authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Allow pre-commit confirmation toggle-able via resource config" into udc-dev am: ce992f4f 

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



Change-Id: Ica0732528561ab10c3dea45798f5314d0d0daa11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c177d33 ce992f4f

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -6379,4 +6379,6 @@ 
    <!-- Whether we should persist the brightness value in nits for the default display even if

         the underlying display device changes. -->

    <bool name="config_persistBrightnessNitsForDefaultDisplay">false</bool>

    <!-- Whether to request the approval before commit sessions. -->

    <bool name="config_isPreApprovalRequestAvailable">true</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2238,6 +2238,7 @@ 
  <java-symbol type="array" name="config_nonPreemptibleInputMethods" />

  <java-symbol type="bool" name="config_enhancedConfirmationModeEnabled" />

  <java-symbol type="bool" name="config_persistBrightnessNitsForDefaultDisplay" />

  <java-symbol type="bool" name="config_isPreApprovalRequestAvailable" />



  <java-symbol type="layout" name="resolver_list" />

  <java-symbol type="id" name="resolver_list" />

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

+5 −0
Original line number Diff line number Diff line
@@ -7208,6 +7208,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
     * TODO: In the meantime, can this be moved to a schedule call?

     * TODO(b/182523293): This should be removed once we finish migration of permission storage.

     */

    @SuppressWarnings("GuardedBy")

    void writeSettingsLPrTEMP(boolean sync) {

        snapshotComputer(false);

        mPermissionManager.writeLegacyPermissionsTEMP(mSettings.mPermissions);
@@ -7257,6 +7258,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
    static boolean isPreapprovalRequestAvailable() {

        final long token = Binder.clearCallingIdentity();

        try {

            if (!Resources.getSystem().getBoolean(

                    com.android.internal.R.bool.config_isPreApprovalRequestAvailable)) {

                return false;

            }

            return DeviceConfig.getBoolean(NAMESPACE_PACKAGE_MANAGER_SERVICE,

                    PROPERTY_IS_PRE_APPROVAL_REQUEST_AVAILABLE, true /* defaultValue */);

        } finally {