Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032

Browse Source 
am: a5e81480b1

* commit 'a5e81480b16e8cbf5a3c4f015b667893defb1456':
  Do not update packages in encrypted state

Change-Id: I6307cc4b29146dc95f3b5b45f22270fc44d6d2b7
This commit is contained in:
David Brazdil
2016-06-02 16:48:51 +00:00
committed by android-build-merger
parent 9982d86abc a5e81480b1
commit 2a7c8c8024
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/SystemServer.java
View File

@@ -706,13 +706,15 @@ public final class SystemServer {
// as appropriate.
mSystemServiceManager.startService(UiModeManagerService.class);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded");
try {
mPackageManagerService.updatePackagesIfNeeded();
} catch (Throwable e) {
reportWtf("update packages", e);
if (!mOnlyCore) {
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded");
try {
mPackageManagerService.updatePackagesIfNeeded();
} catch (Throwable e) {
reportWtf("update packages", e);
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "PerformFstrimIfNeeded");
try {