From 5cddcf240898362fa24602919eccc62fa81573b3 Mon Sep 17 00:00:00 2001
From: Akshay Kannan <akshayk@google.com>
Date: Wed, 24 Feb 2016 10:07:27 -0800
Subject: [PATCH] Restrict ICE to system image only in settings.

Bug: 23591361
Change-Id: I56767e94eb5f30bc175a097bb8cae340cb9dfb3a
---
 .../settings/applications/DefaultEmergencyPreference.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index bb6e84d62ef..1d04f04f1ba 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -111,11 +111,9 @@ public class DefaultEmergencyPreference extends AppListPreference {
                 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;
             }
         }