Merge branch 'cm-11.0' into stable/cm-11.0 (b52f594a) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ LOCAL_SRC_FILES += \
		core/java/android/content/pm/IPackageMoveObserver.aidl \
		core/java/android/content/pm/IPackageStatsObserver.aidl \
		core/java/android/content/res/IThemeChangeListener.aidl \
		core/java/android/content/res/IThemeProcessingListener.aidl \
		core/java/android/content/res/IThemeService.aidl \
		core/java/android/database/IContentObserver.aidl \
		core/java/android/hardware/ICameraService.aidl \

core/java/android/app/ActivityManager.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -576,11 +576,6 @@ public class ActivityManager {
		*/
		public static final int RECENT_IGNORE_UNAVAILABLE = 0x0002;

		/**
		* @hide
		*/
		public static final int RECENT_DO_NOT_COUNT_EXCLUDED = 0x0004;

		/**
		* Return a list of the tasks that the user has recently launched, with
		* the most recent being first and older ones after in order.

core/java/android/app/IBackupAgent.aidl

+25 −0

Original line number	Diff line number	Diff line
		@@ -116,4 +116,29 @@ oneway interface IBackupAgent {
		void doRestoreFile(in ParcelFileDescriptor data, long size,
		int type, String domain, String path, long mode, long mtime,
		int token, IBackupManager callbackBinder);


		/**
		* Perform a backup for all the files specified by domainTokens parameter. The output file
		* should be a socket or other non-seekable, write-only data sink. When this method is
		* called, the app should write all of its files to the output.
		*
		* @param data Write-only file to receive the backed-up content stream.
		* The data must be formatted correctly for the resulting archive to be
		* legitimate and restorable.
		*
		* @param token Opaque token identifying this transaction. This must
		* be echoed back to the backup service binder once the agent
		* completes restoring the application based on the restore data
		* contents.
		*
		* @param domainTokens File paths of the files (represented as domains) to include.
		*
		* @param excludeFilesRegex Files to exclude specified as a Java-compatible pattern.
		*
		* @param callbackBinder Binder on which to indicate operation completion,
		* passed here as a convenience to the agent.
		*/
		void doBackupFiles(in ParcelFileDescriptor data, int token, in String[] domainTokens,
		in String excludeFilesRegex, IBackupManager callbackBinder);
		}

core/java/android/app/admin/DevicePolicyManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1234,6 +1234,12 @@ public class DevicePolicyManager {
		*/
		public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 1 << 1;

		/**
		* Disable the application widget on keyguard screens (e.g. PIN/Pattern/Password)
		* @hide
		*/
		public static final int KEYGUARD_DISABLE_APPLICATION_WIDGET = 1 << 2;

		/**
		* Disable all current and future keyguard customizations.
		*/

core/java/android/app/backup/BackupAgent.java

+166 −10

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import java.io.IOException;
		import java.util.HashSet;
		import java.util.LinkedList;
		import java.util.concurrent.CountDownLatch;
		import java.util.regex.Pattern;

		import libcore.io.ErrnoException;
		import libcore.io.Libcore;
		@@ -106,7 +107,14 @@ import libcore.io.StructStat;
		*/
		public abstract class BackupAgent extends ContextWrapper {
		private static final String TAG = "BackupAgent";
		private static final boolean DEBUG = true;
		private static final boolean DEBUG = false;

		/**
		* To lookup an application's database and shared preferences directories (usually
		* /data/data/com.application.name), this generic name is used to invoke the
		* getSharedPrefsFile(String) and getDatabasePath(String) APIs.
		*/
		private static final String GENERIC_FILE_NAME = "foo";

		/** @hide */
		public static final int TYPE_EOF = 0;
		@@ -252,8 +260,9 @@ public abstract class BackupAgent extends ContextWrapper {

		String rootDir = new File(appInfo.dataDir).getCanonicalPath();
		String filesDir = getFilesDir().getCanonicalPath();
		String databaseDir = getDatabasePath("foo").getParentFile().getCanonicalPath();
		String sharedPrefsDir = getSharedPrefsFile("foo").getParentFile().getCanonicalPath();
		String databaseDir = getDatabasePath(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		String sharedPrefsDir =
		getSharedPrefsFile(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		String cacheDir = getCacheDir().getCanonicalPath();
		String libDir = (appInfo.nativeLibraryDir != null)
		? new File(appInfo.nativeLibraryDir).getCanonicalPath()
		@@ -328,8 +337,8 @@ public abstract class BackupAgent extends ContextWrapper {
		try {
		mainDir = new File(appInfo.dataDir).getCanonicalPath();
		filesDir = getFilesDir().getCanonicalPath();
		dbDir = getDatabasePath("foo").getParentFile().getCanonicalPath();
		spDir = getSharedPrefsFile("foo").getParentFile().getCanonicalPath();
		dbDir = getDatabasePath(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		spDir = getSharedPrefsFile(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		cacheDir = getCacheDir().getCanonicalPath();
		libDir = (appInfo.nativeLibraryDir == null)
		? null
		@@ -394,7 +403,20 @@ public abstract class BackupAgent extends ContextWrapper {
		* @hide
		*/
		protected final void fullBackupFileTree(String packageName, String domain, String rootPath,
		HashSet<String> excludes, FullBackupDataOutput output) {
		HashSet<String> excludeFullPathDir, FullBackupDataOutput output) {
		fullBackupFileTree(packageName, domain, rootPath, excludeFullPathDir, null, output);
		}

		/**
		* Scan the dir tree (if it actually exists) and process each entry we find. If the
		* 'excludes' parameter is non-null, it is consulted each time a new file system entity
		* is visited to see whether that entity (and its subtree, if appropriate) should be
		* omitted from the backup process.
		*
		* @hide
		*/
		protected final void fullBackupFileTree(String packageName, String domain, String rootPath,
		HashSet<String> excludeFullPathDir, Pattern excludeFiles, FullBackupDataOutput output) {
		File rootFile = new File(rootPath);
		if (rootFile.exists()) {
		LinkedList<File> scanQueue = new LinkedList<File>();
		@@ -407,7 +429,14 @@ public abstract class BackupAgent extends ContextWrapper {
		filePath = file.getCanonicalPath();

		// prune this subtree?
		if (excludes != null && excludes.contains(filePath)) {
		if (excludeFullPathDir != null && excludeFullPathDir.contains(filePath)) {
		if (DEBUG) Log.i(TAG, "Excluding directory path: " + filePath);
		continue;
		}

		// Does this match the regex ?
		if (excludeFiles != null && excludeFiles.matcher(filePath).find()) {
		if (DEBUG) Log.i(TAG, "Excluding file: " + filePath);
		continue;
		}

		@@ -428,7 +457,9 @@ public abstract class BackupAgent extends ContextWrapper {
		if (DEBUG) Log.w(TAG, "Error canonicalizing path of " + file);
		continue;
		} catch (ErrnoException e) {
		if (DEBUG) Log.w(TAG, "Error scanning file " + file + " : " + e);
		if (DEBUG) {
		Log.w(TAG, "Error scanning file " + file + ", skipping this file backup");
		}
		continue;
		}

		@@ -439,6 +470,91 @@ public abstract class BackupAgent extends ContextWrapper {
		}
		}

		/**
		* Backup files specified by domainTokens parameter. It should be one (or more) of
		* rootDir, filesDir, databaseDir, cacheDir, sharedPrefsDir, externalFilesDir
		* excludeFiles is a regex of the files to be excluded when doing the backup.
		*
		* @param domainTokens
		* @param excludeFilesRegex
		* @param data
		* @hide
		*/
		private void onBackupFiles(String[] domainTokens, String excludeFilesRegex,
		FullBackupDataOutput data) throws IOException {
		String rootDir, filesDir, databaseDir, sharedPrefsDir, cacheDir, libDir, efLocationDir;
		ApplicationInfo appInfo = getApplicationInfo();

		rootDir = new File(appInfo.dataDir).getCanonicalPath();
		filesDir = getFilesDir().getCanonicalPath();
		databaseDir = getDatabasePath(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		sharedPrefsDir = getSharedPrefsFile(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		cacheDir = getCacheDir().getCanonicalPath();
		libDir = (appInfo.nativeLibraryDir != null)
		? new File(appInfo.nativeLibraryDir).getCanonicalPath()
		: null;
		efLocationDir = getExternalFilesDir(null).getCanonicalPath();

		// Filters, the scan queue, and the set of resulting entities
		HashSet<String> filterSet = new HashSet<String>();
		String packageName = getPackageName();
		// Okay, start with the app's root tree, but exclude all of the canonical subdirs
		if (libDir != null) {
		filterSet.add(libDir);
		}
		filterSet.add(cacheDir);
		filterSet.add(databaseDir);
		filterSet.add(sharedPrefsDir);
		filterSet.add(filesDir);

		Pattern excludeFiles = null;
		if (excludeFilesRegex != null) {
		excludeFiles = Pattern.compile(excludeFilesRegex, Pattern.CASE_INSENSITIVE);
		}

		for (String dToken : domainTokens) {
		if (FullBackup.ROOT_TREE_TOKEN.equals(dToken)) {
		fullBackupFileTree(packageName, FullBackup.ROOT_TREE_TOKEN, rootDir, filterSet,
		excludeFiles, data);
		}

		if (FullBackup.DATA_TREE_TOKEN.equals(dToken)) {
		filterSet.add(rootDir);
		filterSet.remove(filesDir);
		fullBackupFileTree(packageName, FullBackup.DATA_TREE_TOKEN, filesDir, filterSet,
		excludeFiles, data);
		}

		if (FullBackup.DATABASE_TREE_TOKEN.equals(dToken)) {
		filterSet.add(filesDir);
		filterSet.remove(databaseDir);
		fullBackupFileTree(packageName, FullBackup.DATABASE_TREE_TOKEN, databaseDir,
		filterSet, excludeFiles, data);
		}

		if (FullBackup.SHAREDPREFS_TREE_TOKEN.equals(dToken)) {
		filterSet.add(databaseDir);
		filterSet.remove(sharedPrefsDir);
		fullBackupFileTree(packageName, FullBackup.SHAREDPREFS_TREE_TOKEN, sharedPrefsDir,
		filterSet, excludeFiles, data);
		}

		if (FullBackup.MANAGED_EXTERNAL_TREE_TOKEN.equals(dToken)) {
		// getExternalFilesDir() location associated with this app. Technically there should
		// not be any files here if the app does not properly have permission to access
		// external storage, but edge cases happen. fullBackupFileTree() catches
		// IOExceptions and similar, and treats them as non-fatal, so we rely on that; and
		// we know a priori that processes running as the system UID are not permitted to
		// access external storage, so we check for that as well to avoid nastygrams in
		// the log.
		if (Process.myUid() != Process.SYSTEM_UID) {
		fullBackupFileTree(packageName, FullBackup.MANAGED_EXTERNAL_TREE_TOKEN,
		efLocationDir, null, excludeFiles, data);
		}
		}
		}
		}

		/**
		* Handle the data delivered via the given file descriptor during a full restore
		* operation. The agent is given the path to the file's original location as well
		@@ -489,11 +605,11 @@ public abstract class BackupAgent extends ContextWrapper {
		if (domain.equals(FullBackup.DATA_TREE_TOKEN)) {
		basePath = getFilesDir().getCanonicalPath();
		} else if (domain.equals(FullBackup.DATABASE_TREE_TOKEN)) {
		basePath = getDatabasePath("foo").getParentFile().getCanonicalPath();
		basePath = getDatabasePath(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		} else if (domain.equals(FullBackup.ROOT_TREE_TOKEN)) {
		basePath = new File(getApplicationInfo().dataDir).getCanonicalPath();
		} else if (domain.equals(FullBackup.SHAREDPREFS_TREE_TOKEN)) {
		basePath = getSharedPrefsFile("foo").getParentFile().getCanonicalPath();
		basePath = getSharedPrefsFile(GENERIC_FILE_NAME).getParentFile().getCanonicalPath();
		} else if (domain.equals(FullBackup.CACHE_TREE_TOKEN)) {
		basePath = getCacheDir().getCanonicalPath();
		} else if (domain.equals(FullBackup.MANAGED_EXTERNAL_TREE_TOKEN)) {
		@@ -659,6 +775,46 @@ public abstract class BackupAgent extends ContextWrapper {
		}
		}

		@Override
		public void doBackupFiles(ParcelFileDescriptor data, int token, String[] domainTokens,
		String excludeFilesRegex, IBackupManager callbackBinder) {
		// Ensure that we're running with the app's normal permission level
		long ident = Binder.clearCallingIdentity();

		// Ensure that any SharedPreferences writes have landed before
		// we potentially try to back up the underlying files directly.
		waitForSharedPrefs();

		try {
		BackupAgent.this.onBackupFiles(domainTokens, excludeFilesRegex,
		new FullBackupDataOutput(data));
		} catch (IOException ex) {
		throw new RuntimeException(ex);
		} catch (RuntimeException ex) {
		throw ex;
		} finally {
		// ... and then again after, as in the doBackup() case
		waitForSharedPrefs();

		// Send the EOD marker indicating that there is no more data
		// forthcoming from this agent.
		try {
		FileOutputStream out = new FileOutputStream(data.getFileDescriptor());
		byte[] buf = new byte[4];
		out.write(buf);
		} catch (IOException e) {
		Log.e(TAG, "Unable to finalize backup stream!");
		}

		Binder.restoreCallingIdentity(ident);
		try {
		callbackBinder.opComplete(token);
		} catch (RemoteException e) {
		// we'll time out anyway, so we're safe
		}
		}
		}

		@Override
		public void doRestoreFile(ParcelFileDescriptor data, long size,
		int type, String domain, String path, long mode, long mtime,