PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict ICE to system image only in settings." into nyc-dev am: c4b8c70e8a

Browse Source 
am: d1590a9424

* commit 'd1590a94244f36133a64d2ec4e9341d4dbe7eeed':
  Restrict ICE to system image only in settings.
This commit is contained in:
Akshay Kannan
2016-02-24 18:42:01 +00:00
committed by android-build-merger
parent 8aeef47c23 d1590a9424
commit c2193039be
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/DefaultEmergencyPreference.java
View File

@@ -111,11 +111,9 @@ public class DefaultEmergencyPreference extends AppListPreference
continue; continue;
} }
// Get earliest installed app, but prioritize system apps. // Get earliest installed system app.
if (bestMatch == null if (isSystemApp(packageInfo) && (bestMatch == null ||
|| !isSystemApp(bestMatch) && isSystemApp(packageInfo) bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {
|| isSystemApp(bestMatch) == isSystemApp(packageInfo)
&& bestMatch.firstInstallTime > packageInfo.firstInstallTime) {
bestMatch = packageInfo; bestMatch = packageInfo;
} }
} }