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

Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev

Browse Source 
am: b67b5b9

* commit 'b67b5b9f3c947fc6d835459f0e880eb5fcaad50b':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: I8dd098ffb1a28c4061135112690fd1bdfca9a1b8
This commit is contained in:
David Brazdil
2016-03-30 12:51:29 +00:00
committed by android-build-merger
parent bd227a1499 b67b5b9f3c
commit 72ecc752ce
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/IPackageManager.aidl
View File

@@ -437,10 +437,9 @@ interface IPackageManager {
void performFstrimIfNeeded();
/**
* Ask the package manager to extract packages if needed, to save
* the VM unzipping the APK in memory during launch.
* Ask the package manager to update packages if needed.
*/
void extractPackagesIfNeeded();
void updatePackagesIfNeeded();
/**
* Notify the package manager that a package is going to be used.

13
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -6932,8 +6932,8 @@ public class PackageManagerService extends IPackageManager.Stub {
}
@Override
public void extractPackagesIfNeeded() {
enforceSystemOrRoot("Only the system can request package extraction");
public void updatePackagesIfNeeded() {
enforceSystemOrRoot("Only the system can request package update");
// We need to re-extract after an OTA.
boolean causeUpgrade = isUpgrade();
@@ -6964,15 +6964,6 @@ public class PackageManagerService extends IPackageManager.Stub {
Log.i(TAG, "Extracting app " + curr + " of " + total + ": " + pkg.packageName);
}
if (!isFirstBoot()) {
try {
ActivityManagerNative.getDefault().showBootMessage(
mContext.getResources().getString(R.string.android_upgrading_apk,
curr, total), true);
} catch (RemoteException e) {
}
}
if (PackageDexOptimizer.canOptimizePackage(pkg)) {
// If the cache was pruned, any compiled odex files will likely be out of date
// and would have to be patched (would be SELF_PATCHOAT, which is deprecated).

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

@@ -697,6 +697,14 @@ 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);
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "PerformFstrimIfNeeded");
try {
mPackageManagerService.performFstrimIfNeeded();
@@ -705,14 +713,6 @@ public final class SystemServer {
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "ExtractPackagesIfNeeded");
try {
mPackageManagerService.extractPackagesIfNeeded();
} catch (Throwable e) {
reportWtf("extract packages", e);
}
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
try {
ActivityManagerNative.getDefault().showBootMessage(
context.getResources().getText(