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

Browse Source 
am: c4f1bc4032

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

Change-Id: Icdba2e72de1dbc284780df7f59cbdc56ff061ba1
This commit is contained in:
David Brazdil
2016-06-02 16:21:27 +00:00
committed by android-build-merger
parent ece7cd7120 c4f1bc4032
commit 7397e80504
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -701,6 +701,7 @@ public final class SystemServer {
// as appropriate. // as appropriate.
mSystemServiceManager.startService(UiModeManagerService.class); mSystemServiceManager.startService(UiModeManagerService.class);
if (!mOnlyCore) {
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded"); Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded");
try { try {
mPackageManagerService.updatePackagesIfNeeded(); mPackageManagerService.updatePackagesIfNeeded();
@@ -708,6 +709,7 @@ public final class SystemServer {
reportWtf("update packages", 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"); Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "PerformFstrimIfNeeded");
try { try {