commit 5d927b4fb0753b3524b884fd8ce41878ff8d3fb0
author Akshay Kannan <akshayk@google.com> Tue Feb 09 13:51:17 2016 -0800
committer Akshay Kannan <akshayk@google.com> Thu Feb 11 01:15:49 2016 +0000
tree 2ef556512a6bc4850502d1e29dd3f69330c7df7a
parent 9e5615a54d2a5383029e744fefcfacb8d50d5e5b

Restrict Emergency Assist API to system image only.

Bug: 23591361
Change-Id: Idecae74384568e9cb45e605b6eeadad9dea367ab
(cherry picked from commit 66229fd15cf42c0f09169122cc8a245f64569965)

src/com/android/phone/EmergencyActionGroup.java

diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index 2d70d01..039dd82 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -165,11 +165,9 @@
                 } catch (PackageManager.NameNotFoundException e) {
                     continue;
                 }
-                // Get earliest installed app, but prioritize system apps.
-                if (bestMatch == null
-                        || !isSystemApp(bestMatch) && isSystemApp(packageInfo)
-                        || isSystemApp(bestMatch) == isSystemApp(packageInfo)
-                                && bestMatch.firstInstallTime > packageInfo.firstInstallTime) {
+                // Get earliest installed system app.
+                if (isSystemApp(packageInfo) && (bestMatch == null ||
+                        bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {
                     bestMatch = packageInfo;
                 }
             }