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

Commit c7ed8bb7 authored by Joanne Chung's avatar Joanne Chung
Browse files

Allow pre-commit confirmation toggle-able via resource config 

Currently, the pre-commit confirmation is controlled by device config
and default value is true. This makes the feature default enabled.
Even partners update the default value to false, it still can be
overrided by device config mechanism.

It is possible the partners would like to disable the feature so in
this change, we allow the feature can be toggled by resource config,
the value should not be overrided by device config.

Bug: 272507743
Test: atest PreapprovalInstallTest

Change-Id: I2fb45bb6da608d6772335d63d452d60560bcce27
parent 9bfbfcc4

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -6386,4 +6386,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
@@ -2235,6 +2235,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 {