diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2020-06-09 16:52:56 +0000 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2020-06-09 18:38:05 +0000 |
| commit | c4b36e9d003111e14c2c96db736e3044431661e8 (patch) | |
| tree | 328c748195135a27d43e8f199b973d1fc561c8f9 /telephony | |
| parent | 611e7a484aac2ac77c1bed9c531580ec859a17c2 (diff) | |
Revert "Add a blacklist for preinstalled carrier apps."
This reverts commit 1a3158b8e17cfe81e4576c9f64522704de892481.
Reason for revert: The carrier for which this was needed has been
updated to no longer require this change.
Change-Id: I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6
Merged-In: I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6
Bug: 138150105
Fixes: 157957579
Test: verify that app is no longer there
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/common/com/android/internal/telephony/CarrierAppUtils.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java index b3d7c0d36763..4606fb4b631c 100644 --- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java +++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java @@ -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( |