summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-10-30 09:10:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-30 09:10:59 +0000
commit2635bb28b430ccf8afffa2dcc2b939daed066a9d (patch)
treeb25deb869b3204cfd64d2e48d8e33c161205f1cd
parent0a354a95f4a13a42522f26af2ab11c9ed6d06789 (diff)
parentf86cf6fb6c5f5bd70a93d277d73106f3e1d30bd6 (diff)
Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902 Change-Id: I2815b83b72268d53b057f072d447b6688bb7d77e
-rw-r--r--telephony/common/com/android/internal/telephony/CarrierAppUtils.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/telephony/common/com/android/internal/telephony/CarrierAppUtils.java b/telephony/common/com/android/internal/telephony/CarrierAppUtils.java
index e57b03098758..7aecfdde71bc 100644
--- 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;
}
/**