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 am: a5e81480b1

Browse Source 
am: 2a7c8c8024

* commit '2a7c8c8024895c3270d4351e6ca4a364d598d52c':
  Do not update packages in encrypted state

Change-Id: Ib0c5e3b003769c150631c7768918552902124456
This commit is contained in:
David Brazdil
2016-06-02 16:57:35 +00:00
committed by android-build-merger
parent b06c8adf8d 2a7c8c8024
commit ff46d9faf4
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 {