Merge "Frameworks/base: Add A/B OTA preopting" (fe54b118) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ LOCAL_SRC_FILES += \
		core/java/android/content/ISyncStatusObserver.aidl \
		core/java/android/content/pm/ILauncherApps.aidl \
		core/java/android/content/pm/IOnAppsChangedListener.aidl \
		core/java/android/content/pm/IOtaDexopt.aidl \
		core/java/android/content/pm/IPackageDataObserver.aidl \
		core/java/android/content/pm/IPackageDeleteObserver.aidl \
		core/java/android/content/pm/IPackageDeleteObserver2.aidl \

core/java/android/content/pm/IOtaDexopt.aidl

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2016, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/

		package android.content.pm;

		/**
		* A/B OTA dexopting service.
		*
		* {@hide}
		*/
		interface IOtaDexopt {
		/**
		* Prepare for A/B OTA dexopt. Initialize internal structures.
		*
		* Calls to the other methods are only valid after a call to prepare. You may not call
		* prepare twice without a cleanup call.
		*/
		void prepare();

		/**
		* Clean up all internal state.
		*/
		void cleanup();

		/**
		* Check whether all updates have been performed.
		*/
		boolean isDone();

		/**
		* Optimize the next package. Note: this command is synchronous, that is, only returns after
		* the package has been dexopted (or dexopting failed).
		*/
		void dexoptNextPackage();
		}

services/core/java/com/android/server/pm/Installer.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ public final class Installer extends SystemService {
		public static final int DEXOPT_BOOTCOMPLETE = 1 << 4;
		/** Do not compile, only extract bytecode into an OAT file */
		public static final int DEXOPT_EXTRACTONLY = 1 << 5;
		/** This is an OTA update dexopt */
		public static final int DEXOPT_OTA = 1 << 6;

		/** @hide */
		@IntDef(flag = true, value = {

services/core/java/com/android/server/pm/OtaDexoptService.java

0 → 100644

+274 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.pm;

		import android.app.AppGlobals;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.IOtaDexopt;
		import android.content.pm.PackageParser;
		import android.content.pm.PackageParser.Package;
		import android.content.pm.ResolveInfo;
		import android.os.Environment;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.os.storage.StorageManager;
		import android.util.ArraySet;
		import android.util.Log;

		import dalvik.system.DexFile;

		import java.io.File;
		import java.io.FileDescriptor;
		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.Date;
		import java.util.HashSet;
		import java.util.Iterator;
		import java.util.LinkedList;
		import java.util.List;
		import java.util.Set;

		import static com.android.server.pm.Installer.DEXOPT_OTA;

		/**
		* A service for A/B OTA dexopting.
		*
		* {@hide}
		*/
		public class OtaDexoptService extends IOtaDexopt.Stub {
		private final static String TAG = "OTADexopt";
		private final static boolean DEBUG_DEXOPT = true;
		// Apps used in the last 7 days.
		private final static long DEXOPT_LRU_THRESHOLD_IN_MINUTES = 7 * 24 * 60;

		private final Context mContext;
		private final PackageDexOptimizer mPackageDexOptimizer;
		private final PackageManagerService mPackageManagerService;

		// TODO: Evaluate the need for WeakReferences here.
		private List<PackageParser.Package> mDexoptPackages;

		public OtaDexoptService(Context context, PackageManagerService packageManagerService) {
		this.mContext = context;
		this.mPackageManagerService = packageManagerService;

		// Use the package manager install and install lock here for the OTA dex optimizer.
		mPackageDexOptimizer = new OTADexoptPackageDexOptimizer(packageManagerService.mInstaller,
		packageManagerService.mInstallLock, context);
		}

		public static OtaDexoptService main(Context context,
		PackageManagerService packageManagerService) {
		OtaDexoptService ota = new OtaDexoptService(context, packageManagerService);
		ServiceManager.addService("otadexopt", ota);

		return ota;
		}

		@Override
		public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
		String[] args, ResultReceiver resultReceiver) throws RemoteException {
		(new OtaDexoptShellCommand(this)).exec(
		this, in, out, err, args, resultReceiver);
		}

		@Override
		public synchronized void prepare() throws RemoteException {
		if (mDexoptPackages != null) {
		throw new IllegalStateException("already called prepare()");
		}

		mDexoptPackages = new LinkedList<>();

		ArrayList<PackageParser.Package> pkgs;
		synchronized (mPackageManagerService.mPackages) {
		pkgs = new ArrayList<PackageParser.Package>(mPackageManagerService.mPackages.values());
		}

		// Sort apps by importance for dexopt ordering. Important apps are given more priority
		// in case the device runs out of space.

		// Give priority to core apps.
		for (PackageParser.Package pkg : pkgs) {
		if (pkg.coreApp) {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Adding core app " + mDexoptPackages.size() + ": " + pkg.packageName);
		}
		mDexoptPackages.add(pkg);
		}
		}
		pkgs.removeAll(mDexoptPackages);

		// Give priority to system apps that listen for pre boot complete.
		Intent intent = new Intent(Intent.ACTION_PRE_BOOT_COMPLETED);
		ArraySet<String> pkgNames = getPackageNamesForIntent(intent, UserHandle.USER_SYSTEM);
		for (PackageParser.Package pkg : pkgs) {
		if (pkgNames.contains(pkg.packageName)) {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Adding pre boot system app " + mDexoptPackages.size() + ": " +
		pkg.packageName);
		}
		mDexoptPackages.add(pkg);
		}
		}
		pkgs.removeAll(mDexoptPackages);

		// Filter out packages that aren't recently used, add all remaining apps.
		// TODO: add a property to control this?
		if (mPackageManagerService.isHistoricalPackageUsageAvailable()) {
		filterRecentlyUsedApps(pkgs, DEXOPT_LRU_THRESHOLD_IN_MINUTES * 60 * 1000);
		}
		mDexoptPackages.addAll(pkgs);

		// Now go ahead and also add the libraries required for these packages.
		// TODO: Think about interleaving things.
		Set<PackageParser.Package> dependencies = new HashSet<>();
		for (PackageParser.Package p : mDexoptPackages) {
		dependencies.addAll(mPackageManagerService.findSharedNonSystemLibraries(p));
		}
		if (!dependencies.isEmpty()) {
		dependencies.removeAll(mDexoptPackages);
		}
		mDexoptPackages.addAll(dependencies);

		if (DEBUG_DEXOPT) {
		StringBuilder sb = new StringBuilder();
		for (PackageParser.Package pkg : mDexoptPackages) {
		if (sb.length() > 0) {
		sb.append(", ");
		}
		sb.append(pkg.packageName);
		}
		Log.i(TAG, "Packages to be optimized: " + sb.toString());
		}
		}

		@Override
		public synchronized void cleanup() throws RemoteException {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Cleaning up OTA Dexopt state.");
		}
		mDexoptPackages = null;
		}

		@Override
		public synchronized boolean isDone() throws RemoteException {
		if (mDexoptPackages == null) {
		throw new IllegalStateException("done() called before prepare()");
		}

		return mDexoptPackages.isEmpty();
		}

		@Override
		public synchronized void dexoptNextPackage() throws RemoteException {
		if (mDexoptPackages == null) {
		throw new IllegalStateException("dexoptNextPackage() called before prepare()");
		}
		if (mDexoptPackages.isEmpty()) {
		// Tolerate repeated calls.
		return;
		}

		PackageParser.Package nextPackage = mDexoptPackages.remove(0);

		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Processing " + nextPackage.packageName + " for OTA dexopt.");
		}

		// Check for low space.
		// TODO: If apps are not installed in the internal /data partition, we should compare
		// against that storage's free capacity.
		File dataDir = Environment.getDataDirectory();
		long lowThreshold = StorageManager.from(mContext).getStorageLowBytes(dataDir);
		if (lowThreshold == 0) {
		throw new IllegalStateException("Invalid low memory threshold");
		}
		long usableSpace = dataDir.getUsableSpace();
		if (usableSpace < lowThreshold) {
		Log.w(TAG, "Not running dexopt on " + nextPackage.packageName + " due to low memory: " +
		usableSpace);
		return;
		}

		mPackageDexOptimizer.performDexOpt(nextPackage, null /* ISAs /, false / useProfiles */,
		false /* extractOnly */);
		}

		private ArraySet<String> getPackageNamesForIntent(Intent intent, int userId) {
		List<ResolveInfo> ris = null;
		try {
		ris = AppGlobals.getPackageManager().queryIntentReceivers(
		intent, null, 0, userId);
		} catch (RemoteException e) {
		}
		ArraySet<String> pkgNames = new ArraySet<String>(ris == null ? 0 : ris.size());
		if (ris != null) {
		for (ResolveInfo ri : ris) {
		pkgNames.add(ri.activityInfo.packageName);
		}
		}
		return pkgNames;
		}

		private void filterRecentlyUsedApps(Collection<PackageParser.Package> pkgs,
		long dexOptLRUThresholdInMills) {
		// Filter out packages that aren't recently used.
		int total = pkgs.size();
		int skipped = 0;
		long now = System.currentTimeMillis();
		for (Iterator<PackageParser.Package> i = pkgs.iterator(); i.hasNext();) {
		PackageParser.Package pkg = i.next();
		long then = pkg.mLastPackageUsageTimeInMills;
		if (then + dexOptLRUThresholdInMills < now) {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Skipping dexopt of " + pkg.packageName + " last resumed: " +
		((then == 0) ? "never" : new Date(then)));
		}
		i.remove();
		skipped++;
		}
		}
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Skipped optimizing " + skipped + " of " + total);
		}
		}

		private static class OTADexoptPackageDexOptimizer extends
		PackageDexOptimizer.ForcedUpdatePackageDexOptimizer {

		public OTADexoptPackageDexOptimizer(Installer installer, Object installLock,
		Context context) {
		super(installer, installLock, context, "otadexopt");
		}

		@Override
		protected int adjustDexoptFlags(int dexoptFlags) {
		// Add the OTA flag.
		return dexoptFlags \| DEXOPT_OTA;
		}

		@Override
		protected void recordSuccessfulDexopt(Package pkg, String instructionSet) {
		// Never record the dexopt, as it's in the B partition.
		}

		}
		}

services/core/java/com/android/server/pm/OtaDexoptShellCommand.java

0 → 100644

+100 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.pm;

		import android.content.pm.IOtaDexopt;
		import android.os.RemoteException;
		import android.os.ShellCommand;

		import java.io.PrintWriter;

		class OtaDexoptShellCommand extends ShellCommand {
		final IOtaDexopt mInterface;

		OtaDexoptShellCommand(OtaDexoptService service) {
		mInterface = service;
		}

		@Override
		public int onCommand(String cmd) {
		if (cmd == null) {
		return handleDefaultCommands(null);
		}

		final PrintWriter pw = getOutPrintWriter();
		try {
		switch(cmd) {
		case "prepare":
		return runOtaPrepare();
		case "cleanup":
		return runOtaCleanup();
		case "done":
		return runOtaDone();
		case "step":
		return runOtaStep();
		default:
		return handleDefaultCommands(cmd);
		}
		} catch (RemoteException e) {
		pw.println("Remote exception: " + e);
		}
		return -1;
		}

		private int runOtaPrepare() throws RemoteException {
		mInterface.prepare();
		getOutPrintWriter().println("Success");
		return 0;
		}

		private int runOtaCleanup() throws RemoteException {
		mInterface.cleanup();
		return 0;
		}

		private int runOtaDone() throws RemoteException {
		final PrintWriter pw = getOutPrintWriter();
		if (mInterface.isDone()) {
		pw.println("OTA complete.");
		} else {
		pw.println("OTA incomplete.");
		}
		return 0;
		}

		private int runOtaStep() throws RemoteException {
		mInterface.dexoptNextPackage();
		return 0;
		}

		@Override
		public void onHelp() {
		final PrintWriter pw = getOutPrintWriter();
		pw.println("OTA Dexopt (ota) commands:");
		pw.println(" help");
		pw.println(" Print this help text.");
		pw.println("");
		pw.println(" prepare");
		pw.println(" Prepare an OTA dexopt pass, collecting all packages.");
		pw.println(" done");
		pw.println(" Replies whether the OTA is complete or not.");
		pw.println(" step");
		pw.println(" OTA dexopt the next package.");
		pw.println(" cleanup");
		pw.println(" Clean up internal states. Ends an OTA session.");
		}
		}