diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 19:47:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 19:47:28 +0000 |
| commit | 2441a648a3b6643804bad30ef39c5253764207a9 (patch) | |
| tree | 4f83d2c68932f4e69665519886a1602063906949 /telephony/common | |
| parent | ebe5e9ff4f205f5c9dc41a2afffbf15dc57c8f22 (diff) | |
| parent | ddb640a883deca3a6e465626535e05dffd705e4e (diff) | |
Merge "Revert "Add a blacklist for preinstalled carrier apps."" into rvc-dev am: ddb640a883
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809242
Change-Id: I1e6065569e0d1daed0afb633356be11385a1b651
Diffstat (limited to 'telephony/common')
| -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( |