Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 am: 9149eab591

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902 Change-Id: Ia64761f215a5b353ff961d234994d613412d5d0d
2020-10-30 10:04:13 +00:00
parent 1befdc9e4f 9149eab591
commit 853858890b
1 changed files with 1 additions and 5 deletions
--- a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
+++ b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
@@ -124,11 +124,7 @@ public final class CarrierAppUtils {
    }

    private static boolean isUpdatedSystemApp(ApplicationInfo ai) {
-        if ((ai.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
-            return true;
-        }
-
-        return false;
+        return (ai.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
    }

    /**