Merge "Add more instrumentation to BackupManagerService" (b870c8e3) · Commits · e / os / android_frameworks_base

api/system-current.txt

+40 −2

Original line number	Diff line number	Diff line
		@@ -6947,26 +6947,64 @@ package android.app.backup {
		public class BackupManagerMonitor {
		ctor public BackupManagerMonitor();
		method public void onEvent(android.os.Bundle);
		field public static final java.lang.String EXTRA_LOG_CANCEL_ALL = "android.app.backup.extra.LOG_CANCEL_ALL";
		field public static final java.lang.String EXTRA_LOG_EVENT_CATEGORY = "android.app.backup.extra.LOG_EVENT_CATEGORY";
		field public static final java.lang.String EXTRA_LOG_EVENT_ID = "android.app.backup.extra.LOG_EVENT_ID";
		field public static final java.lang.String EXTRA_LOG_EVENT_PACKAGE_NAME = "android.app.backup.extra.LOG_EVENT_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_LOG_EVENT_PACKAGE_VERSION = "android.app.backup.extra.LOG_EVENT_PACKAGE_VERSION";
		field public static final java.lang.String EXTRA_LOG_EXCEPTION_FULL_BACKUP = "android.app.backup.extra.LOG_EXCEPTION_FULL_BACKUP";
		field public static final java.lang.String EXTRA_LOG_ILLEGAL_KEY = "android.app.backup.extra.LOG_ILLEGAL_KEY";
		field public static final java.lang.String EXTRA_LOG_MANIFEST_PACKAGE_NAME = "android.app.backup.extra.LOG_MANIFEST_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_LOG_OLD_VERSION = "android.app.backup.extra.LOG_OLD_VERSION";
		field public static final java.lang.String EXTRA_LOG_POLICY_ALLOW_APKS = "android.app.backup.extra.LOG_POLICY_ALLOW_APKS";
		field public static final java.lang.String EXTRA_LOG_PREFLIGHT_ERROR = "android.app.backup.extra.LOG_PREFLIGHT_ERROR";
		field public static final java.lang.String EXTRA_LOG_RESTORE_ANYWAY = "android.app.backup.extra.LOG_RESTORE_ANYWAY";
		field public static final java.lang.String EXTRA_LOG_RESTORE_VERSION = "android.app.backup.extra.LOG_RESTORE_VERSION";
		field public static final java.lang.String EXTRA_LOG_WIDGET_PACKAGE_NAME = "android.app.backup.extra.LOG_WIDGET_PACKAGE_NAME";
		field public static final int LOG_EVENT_CATEGORY_AGENT = 2; // 0x2
		field public static final int LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY = 3; // 0x3
		field public static final int LOG_EVENT_CATEGORY_TRANSPORT = 1; // 0x1
		field public static final int LOG_EVENT_ID_APK_NOT_INSTALLED = 40; // 0x28
		field public static final int LOG_EVENT_ID_APP_HAS_NO_AGENT = 28; // 0x1c
		field public static final int LOG_EVENT_ID_BACKUP_DISABLED = 13; // 0xd
		field public static final int LOG_EVENT_ID_CANNOT_RESTORE_WITHOUT_APK = 41; // 0x29
		field public static final int LOG_EVENT_ID_CANT_FIND_AGENT = 30; // 0x1e
		field public static final int LOG_EVENT_ID_FULL_BACKUP_TIMEOUT = 4; // 0x4
		field public static final int LOG_EVENT_ID_CORRUPT_MANIFEST = 46; // 0x2e
		field public static final int LOG_EVENT_ID_DEVICE_NOT_PROVISIONED = 14; // 0xe
		field public static final int LOG_EVENT_ID_ERROR_PREFLIGHT = 16; // 0x10
		field public static final int LOG_EVENT_ID_EXCEPTION_FULL_BACKUP = 19; // 0x13
		field public static final int LOG_EVENT_ID_EXPECTED_DIFFERENT_PACKAGE = 43; // 0x2b
		field public static final int LOG_EVENT_ID_FULL_BACKUP_CANCEL = 4; // 0x4
		field public static final int LOG_EVENT_ID_FULL_RESTORE_ALLOW_BACKUP_FALSE = 39; // 0x27
		field public static final int LOG_EVENT_ID_FULL_RESTORE_SIGNATURE_MISMATCH = 37; // 0x25
		field public static final int LOG_EVENT_ID_FULL_RESTORE_TIMEOUT = 45; // 0x2d
		field public static final int LOG_EVENT_ID_KEY_VALUE_BACKUP_TIMEOUT = 21; // 0x15
		field public static final int LOG_EVENT_ID_ILLEGAL_KEY = 5; // 0x5
		field public static final int LOG_EVENT_ID_KEY_VALUE_BACKUP_CANCEL = 21; // 0x15
		field public static final int LOG_EVENT_ID_KEY_VALUE_RESTORE_TIMEOUT = 31; // 0x1f
		field public static final int LOG_EVENT_ID_LOST_TRANSPORT = 25; // 0x19
		field public static final int LOG_EVENT_ID_MISSING_SIGNATURE = 42; // 0x2a
		field public static final int LOG_EVENT_ID_NO_DATA_TO_SEND = 7; // 0x7
		field public static final int LOG_EVENT_ID_NO_PACKAGES = 49; // 0x31
		field public static final int LOG_EVENT_ID_NO_PM_METADATA_RECEIVED = 23; // 0x17
		field public static final int LOG_EVENT_ID_NO_RESTORE_METADATA_AVAILABLE = 22; // 0x16
		field public static final int LOG_EVENT_ID_PACKAGE_INELIGIBLE = 9; // 0x9
		field public static final int LOG_EVENT_ID_PACKAGE_KEY_VALUE_PARTICIPANT = 10; // 0xa
		field public static final int LOG_EVENT_ID_PACKAGE_NOT_FOUND = 12; // 0xc
		field public static final int LOG_EVENT_ID_PACKAGE_NOT_PRESENT = 26; // 0x1a
		field public static final int LOG_EVENT_ID_PACKAGE_STOPPED = 11; // 0xb
		field public static final int LOG_EVENT_ID_PACKAGE_TRANSPORT_NOT_PRESENT = 15; // 0xf
		field public static final int LOG_EVENT_ID_PM_AGENT_HAS_NO_METADATA = 24; // 0x18
		field public static final int LOG_EVENT_ID_QUOTA_HIT_PREFLIGHT = 18; // 0x12
		field public static final int LOG_EVENT_ID_RESTORE_ANY_VERSION = 34; // 0x22
		field public static final int LOG_EVENT_ID_RESTORE_VERSION_HIGHER = 27; // 0x1b
		field public static final int LOG_EVENT_ID_SIGNATURE_MISMATCH = 29; // 0x1d
		field public static final int LOG_EVENT_ID_SYSTEM_APP_NO_AGENT = 38; // 0x26
		field public static final int LOG_EVENT_ID_TRANSPORT_IS_NULL = 50; // 0x32
		field public static final int LOG_EVENT_ID_UNKNOWN_VERSION = 44; // 0x2c
		field public static final int LOG_EVENT_ID_VERSIONS_MATCH = 35; // 0x23
		field public static final int LOG_EVENT_ID_VERSION_OF_BACKUP_OLDER = 36; // 0x24
		field public static final int LOG_EVENT_ID_WIDGET_METADATA_MISMATCH = 47; // 0x2f
		field public static final int LOG_EVENT_ID_WIDGET_UNKNOWN_VERSION = 48; // 0x30
		}

		public abstract class BackupObserver {

core/java/android/app/backup/BackupManagerMonitor.java

+97 −5

Original line number	Diff line number	Diff line
		@@ -54,26 +54,118 @@ public class BackupManagerMonitor {
		public static final String EXTRA_LOG_EVENT_CATEGORY =
		"android.app.backup.extra.LOG_EVENT_CATEGORY";


		/**
		* boolean: when we have an event with id LOG_EVENT_ID_KEY_VALUE_BACKUP_CANCEL we record if
		* the call was to cancel backup of all packages
		*/
		public static final String EXTRA_LOG_CANCEL_ALL = "android.app.backup.extra.LOG_CANCEL_ALL";

		/**
		* string: when we have an event with id LOG_EVENT_ID_ILLEGAL_KEY we send the key that was used
		* by the app
		*/
		public static final String EXTRA_LOG_ILLEGAL_KEY = "android.app.backup.extra.LOG_ILLEGAL_KEY";

		/**
		* long: when we have an event with id LOG_EVENT_ID_ERROR_PREFLIGHT we send the error code that
		* was returned by the transport during preflight
		*/
		public static final String EXTRA_LOG_PREFLIGHT_ERROR =
		"android.app.backup.extra.LOG_PREFLIGHT_ERROR";

		/**
		* string: when we have an event with id LOG_EVENT_ID_EXCEPTION_FULL_BACKUP we send the
		* exception's stacktrace
		*/
		public static final String EXTRA_LOG_EXCEPTION_FULL_BACKUP =
		"android.app.backup.extra.LOG_EXCEPTION_FULL_BACKUP";

		/**
		* int: when we have an event with id LOG_EVENT_ID_RESTORE_VERSION_HIGHER we send the
		* restore package version
		*/
		public static final String EXTRA_LOG_RESTORE_VERSION =
		"android.app.backup.extra.LOG_RESTORE_VERSION";

		/**
		* boolean: when we have an event with id LOG_EVENT_ID_RESTORE_VERSION_HIGHER we record if
		* ApplicationInfo.FLAG_RESTORE_ANY_VERSION flag is set
		*/
		public static final String EXTRA_LOG_RESTORE_ANYWAY =
		"android.app.backup.extra.LOG_RESTORE_ANYWAY";


		/**
		* boolean: when we have an event with id LOG_EVENT_ID_APK_NOT_INSTALLED we record if
		* the policy allows to install apks provided with the dataset
		*/
		public static final String EXTRA_LOG_POLICY_ALLOW_APKS =
		"android.app.backup.extra.LOG_POLICY_ALLOW_APKS";


		/**
		* string: when we have an event with id LOG_EVENT_ID_EXPECTED_DIFFERENT_PACKAGE we record the
		* package name provided in the restore manifest
		*/
		public static final String EXTRA_LOG_MANIFEST_PACKAGE_NAME =
		"android.app.backup.extra.LOG_MANIFEST_PACKAGE_NAME";

		/**
		* string: when we have an event with id LOG_EVENT_ID_WIDGET_METADATA_MISMATCH we record the
		* package name provided in the widget metadata
		*/
		public static final String EXTRA_LOG_WIDGET_PACKAGE_NAME =
		"android.app.backup.extra.LOG_WIDGET_PACKAGE_NAME";

		/**
		* string: when we have event of id LOG_EVENT_ID_VERSION_OF_BACKUP_OLDER we send the version
		* int: when we have event of id LOG_EVENT_ID_VERSION_OF_BACKUP_OLDER we send the version
		* of the backup.
		*/
		public static final String EXTRA_LOG_OLD_VERSION =
		"android.app.backup.extra.LOG_OLD_VERSION";
		public static final String EXTRA_LOG_OLD_VERSION = "android.app.backup.extra.LOG_OLD_VERSION";

		// TODO complete this list with all log messages. And document properly.
		public static final int LOG_EVENT_ID_FULL_BACKUP_TIMEOUT = 4;
		public static final int LOG_EVENT_ID_FULL_BACKUP_CANCEL = 4;
		public static final int LOG_EVENT_ID_ILLEGAL_KEY = 5;
		public static final int LOG_EVENT_ID_NO_DATA_TO_SEND = 7;
		public static final int LOG_EVENT_ID_PACKAGE_INELIGIBLE = 9;
		public static final int LOG_EVENT_ID_PACKAGE_KEY_VALUE_PARTICIPANT = 10;
		public static final int LOG_EVENT_ID_PACKAGE_STOPPED = 11;
		public static final int LOG_EVENT_ID_PACKAGE_NOT_FOUND = 12;
		public static final int LOG_EVENT_ID_BACKUP_DISABLED = 13;
		public static final int LOG_EVENT_ID_DEVICE_NOT_PROVISIONED = 14;
		public static final int LOG_EVENT_ID_PACKAGE_TRANSPORT_NOT_PRESENT = 15;
		public static final int LOG_EVENT_ID_KEY_VALUE_BACKUP_TIMEOUT = 21;
		public static final int LOG_EVENT_ID_ERROR_PREFLIGHT = 16;
		public static final int LOG_EVENT_ID_QUOTA_HIT_PREFLIGHT = 18;
		public static final int LOG_EVENT_ID_EXCEPTION_FULL_BACKUP = 19;
		public static final int LOG_EVENT_ID_KEY_VALUE_BACKUP_CANCEL = 21;
		public static final int LOG_EVENT_ID_NO_RESTORE_METADATA_AVAILABLE = 22;
		public static final int LOG_EVENT_ID_NO_PM_METADATA_RECEIVED = 23;
		public static final int LOG_EVENT_ID_PM_AGENT_HAS_NO_METADATA = 24;
		public static final int LOG_EVENT_ID_LOST_TRANSPORT = 25;
		public static final int LOG_EVENT_ID_PACKAGE_NOT_PRESENT = 26;
		public static final int LOG_EVENT_ID_RESTORE_VERSION_HIGHER = 27;
		public static final int LOG_EVENT_ID_APP_HAS_NO_AGENT = 28;
		public static final int LOG_EVENT_ID_SIGNATURE_MISMATCH = 29;
		public static final int LOG_EVENT_ID_CANT_FIND_AGENT = 30;
		public static final int LOG_EVENT_ID_KEY_VALUE_RESTORE_TIMEOUT = 31;
		public static final int LOG_EVENT_ID_RESTORE_ANY_VERSION = 34;
		public static final int LOG_EVENT_ID_VERSIONS_MATCH = 35;
		public static final int LOG_EVENT_ID_VERSION_OF_BACKUP_OLDER = 36;
		public static final int LOG_EVENT_ID_FULL_RESTORE_SIGNATURE_MISMATCH = 37;
		public static final int LOG_EVENT_ID_SYSTEM_APP_NO_AGENT = 38;
		public static final int LOG_EVENT_ID_FULL_RESTORE_ALLOW_BACKUP_FALSE = 39;
		public static final int LOG_EVENT_ID_APK_NOT_INSTALLED = 40;
		public static final int LOG_EVENT_ID_CANNOT_RESTORE_WITHOUT_APK = 41;
		public static final int LOG_EVENT_ID_MISSING_SIGNATURE = 42;
		public static final int LOG_EVENT_ID_EXPECTED_DIFFERENT_PACKAGE = 43;
		public static final int LOG_EVENT_ID_UNKNOWN_VERSION = 44;
		public static final int LOG_EVENT_ID_FULL_RESTORE_TIMEOUT = 45;
		public static final int LOG_EVENT_ID_CORRUPT_MANIFEST = 46;
		public static final int LOG_EVENT_ID_WIDGET_METADATA_MISMATCH = 47;
		public static final int LOG_EVENT_ID_WIDGET_UNKNOWN_VERSION = 48;
		public static final int LOG_EVENT_ID_NO_PACKAGES = 49;
		public static final int LOG_EVENT_ID_TRANSPORT_IS_NULL = 50;

services/backup/java/com/android/server/backup/BackupManagerService.java

+255 −25

File changed.

Preview size limit exceeded, changes collapsed.