diff options
| author | 2024-10-04 17:48:33 +0000 | |
|---|---|---|
| committer | 2024-10-04 17:48:33 +0000 | |
| commit | 0506a46f26c99a6c812760ba66a323f4c3f5406c (patch) | |
| tree | 4d41b22f241e5b34f39b0662b76d80d32b88e55f | |
| parent | fbca4c9c16f656cad25dff14058eeb8dcea88b04 (diff) | |
| parent | 0b3ce174e00a027b2bcc47e2a522c4056a53a2ce (diff) | |
Merge "CarrierAppUtils: Improve readability of update state logic" into main
| -rw-r--r-- | telephony/common/com/android/internal/telephony/CarrierAppUtils.java | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java index ff9cba2795fd..f001232ea93e 100644 --- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java +++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java @@ -33,6 +33,7 @@ import android.util.ArrayMap; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.telephony.flags.Flags; import com.android.internal.telephony.util.TelephonyUtils; import java.util.ArrayList; @@ -185,11 +186,7 @@ public final class CarrierAppUtils { if (hasPrivileges) { // Only update enabled state for the app on /system. Once it has been // updated we shouldn't touch it. - if (!isUpdatedSystemApp(ai) && enabledSetting - == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT - || enabledSetting - == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED - || (ai.flags & ApplicationInfo.FLAG_INSTALLED) == 0) { + if (shouldUpdateEnabledState(ai, enabledSetting)) { Log.i(TAG, "Update state (" + packageName + "): ENABLED for user " + userId); context.createContextAsUser(UserHandle.of(userId), 0) @@ -330,6 +327,21 @@ public final class CarrierAppUtils { } } + private static boolean shouldUpdateEnabledState(ApplicationInfo appInfo, int enabledSetting) { + if (Flags.cleanupCarrierAppUpdateEnabledStateLogic()) { + return !isUpdatedSystemApp(appInfo) + && (enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT + || enabledSetting + == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED + || (appInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0); + } else { + return !isUpdatedSystemApp(appInfo) + && enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT + || enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED + || (appInfo.flags & ApplicationInfo.FLAG_INSTALLED) == 0; + } + } + /** * Returns the list of "default" carrier apps. * |