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

Commit 2bcade63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove hack for SKU specific apks" into main am: b90cc002 am: d28fec11 

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



Change-Id: Ica5b65b959249bf9779a944b493930e5506c4272
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf14129a d28fec11

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -5235,10 +5235,6 @@ 
    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->

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



    <!-- Applications which are disabled unless matching a particular sku -->

    <string-array name="config_disableApksUnlessMatchedSku_apk_list" translatable="false" />

    <string-array name="config_disableApkUnlessMatchedSku_skus_list" translatable="false" />



    <!-- Whether or not we should show the option to show battery percentage -->

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

core/res/res/values/symbols.xml

+0 −4
Original line number Diff line number Diff line
@@ -4366,10 +4366,6 @@ 
  <java-symbol type="integer" name="config_unfoldTransitionHalfFoldedTimeout" />

  <java-symbol type="array" name="config_perDeviceStateRotationLockDefaults" />





  <java-symbol type="array" name="config_disableApksUnlessMatchedSku_apk_list" />

  <java-symbol type="array" name="config_disableApkUnlessMatchedSku_skus_list" />



  <java-symbol type="string" name="config_misprovisionedDeviceModel" />

  <java-symbol type="string" name="config_misprovisionedBrandValue" />

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

+0 −25
Original line number Diff line number Diff line
@@ -4255,8 +4255,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        CarrierAppUtils.disableCarrierAppsUntilPrivileged(

                mContext.getOpPackageName(), UserHandle.USER_SYSTEM, mContext);



        disableSkuSpecificApps();



        // Read the compatibilty setting when the system is ready.

        boolean compatibilityModeEnabled = android.provider.Settings.Global.getInt(

                mContext.getContentResolver(),
@@ -4390,29 +4388,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        }

    }



    //TODO: b/111402650

    private void disableSkuSpecificApps() {

        String[] apkList = mContext.getResources().getStringArray(

                R.array.config_disableApksUnlessMatchedSku_apk_list);

        String[] skuArray = mContext.getResources().getStringArray(

                R.array.config_disableApkUnlessMatchedSku_skus_list);

        if (ArrayUtils.isEmpty(apkList)) {

           return;

        }

        String sku = SystemProperties.get("ro.boot.hardware.sku");

        if (!TextUtils.isEmpty(sku) && ArrayUtils.contains(skuArray, sku)) {

            return;

        }

        final Computer snapshot = snapshotComputer();

        for (String packageName : apkList) {

            setSystemAppHiddenUntilInstalled(snapshot, packageName, true);

            final List<UserInfo> users = mInjector.getUserManagerInternal().getUsers(false);

            for (int i = 0; i < users.size(); i++) {

                setSystemAppInstallState(snapshot, packageName, false, users.get(i).id);

            }

        }

    }



    public PackageFreezer freezePackage(String packageName, int userId, String killReason,

            int exitInfoReason, InstallRequest request) {

        return freezePackage(packageName, userId, killReason, exitInfoReason, request,