Revert "Add a blacklist for preinstalled carrier apps."

This reverts commit 1a3158b8e1.

Reason for revert: The carrier for which this was needed has been
updated to no longer require this change.

Change-Id: I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6
Bug: 138150105
Fixes: 157957579
Test: verify that app is no longer there
This commit is contained in:
Andrew Sapperstein
2020-06-09 16:52:56 +00:00
parent d2662a9c23
commit d094e97751
3 changed files with 1 additions and 12 deletions

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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(