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

Browse Source 
am: c4b8c70e8a

* commit 'c4b8c70e8a6e33da21f9969b0172d982e3b5cf31':
  Restrict ICE to system image only in settings.
This commit is contained in:
Akshay Kannan
2016-02-24 18:35:44 +00:00
committed by android-build-merger
parent 9c3e2bae74 c4b8c70e8a
commit d1590a9424
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;
}
// 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;
}
}