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

Commit 0c3bbbc5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add a blacklist for preinstalled carrier apps.""

parents ef6dcbff d094e977

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -4309,10 +4309,6 @@ 
    notifications until they target R -->

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



    <!-- Contains a blacklist of apps that should not get pre-installed carrier app permission

         grants, even if the UICC claims that the app should be privileged. See b/138150105 -->

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



    <!-- Sharesheet: define a max number of targets per application for new shortcuts-based direct share introduced in Q -->

    <integer name="config_maxShortcutTargetsPerApp">3</integer>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -3825,7 +3825,6 @@ 
  <java-symbol type="color" name="decor_view_status_guard_light" />



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

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



  <java-symbol type="drawable" name="android_logotype" />

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

telephony/common/com/android/internal/telephony/CarrierAppUtils.java

+1 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.SystemConfigManager;

import android.os.UserHandle;

import android.permission.PermissionManager;
@@ -30,9 +29,7 @@ import android.telephony.TelephonyManager; 
import android.util.ArrayMap;

import android.util.Log;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.util.ArrayUtils;



import java.util.ArrayList;

import java.util.List;
@@ -162,12 +159,9 @@ public final class CarrierAppUtils { 
        try {

            for (ApplicationInfo ai : candidates) {

                String packageName = ai.packageName;

                String[] restrictedCarrierApps = Resources.getSystem().getStringArray(

                        R.array.config_restrictedPreinstalledCarrierApps);

                boolean hasPrivileges = telephonyManager != null

                        && telephonyManager.checkCarrierPrivilegesForPackageAnyPhone(packageName)

                                == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS

                        && !ArrayUtils.contains(restrictedCarrierApps, packageName);

                                == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;



                // add hiddenUntilInstalled flag for carrier apps and associated apps

                packageManager.setSystemAppState(