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

Commit 26ab5503 authored by George Chang's avatar George Chang
Browse files

Remove hack for SKU specific apks 

Bug: 111402650
Test: atest PackageManagerServiceTest
Flag: EXEMPT remove code
Change-Id: Ibd4758f39752c61fb95941a9f755239ce85a96f8
parent 3b463ca4

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -5126,10 +5126,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
@@ -4259,10 +4259,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
@@ -4240,8 +4240,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(),
@@ -4374,29 +4372,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,