Snap for 10850711 from c914c49cb46a9125a807b4123626920307f1e241 to udc-qpr1-release (4c1339d6) · Commits · e / os / android_frameworks_base

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -1246,6 +1246,40 @@ public class Bmgr {
		return "TRANSPORT_IS_NULL";
		case BackupManagerMonitor.LOG_EVENT_ID_AGENT_LOGGING_RESULTS:
		return "AGENT_LOGGING_RESULTS";
		case BackupManagerMonitor.LOG_EVENT_ID_START_SYSTEM_RESTORE:
		return "START_SYSTEM_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_START_RESTORE_AT_INSTALL:
		return "START_RESTORE_AT_INSTALL";
		case BackupManagerMonitor.LOG_EVENT_ID_TRANSPORT_ERROR_DURING_START_RESTORE:
		return "TRANSPORT_ERROR_DURING_START_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_CANNOT_GET_NEXT_PKG_NAME:
		return "CANNOT_GET_NEXT_PKG_NAME";
		case BackupManagerMonitor.LOG_EVENT_ID_UNKNOWN_RESTORE_TYPE:
		return "UNKNOWN_RESTORE_TYPE";
		case BackupManagerMonitor.LOG_EVENT_ID_KV_RESTORE:
		return "KV_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_FULL_RESTORE:
		return "FULL_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_NO_NEXT_RESTORE_TARGET:
		return "NO_NEXT_RESTORE_TARGET";
		case BackupManagerMonitor.LOG_EVENT_ID_KV_AGENT_ERROR:
		return "KV_AGENT_ERROR";
		case BackupManagerMonitor.LOG_EVENT_ID_PACKAGE_RESTORE_FINISHED:
		return "PACKAGE_RESTORE_FINISHED";
		case BackupManagerMonitor.LOG_EVENT_ID_TRANSPORT_ERROR_KV_RESTORE:
		return "TRANSPORT_ERROR_KV_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_NO_FEEDER_THREAD:
		return "NO_FEEDER_THREAD";
		case BackupManagerMonitor.LOG_EVENT_ID_FULL_AGENT_ERROR:
		return "FULL_AGENT_ERROR";
		case BackupManagerMonitor.LOG_EVENT_ID_TRANSPORT_ERROR_FULL_RESTORE:
		return "TRANSPORT_ERROR_FULL_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_RESTORE_COMPLETE:
		return "RESTORE_COMPLETE";
		case BackupManagerMonitor.LOG_EVENT_ID_START_PACKAGE_RESTORE:
		return "START_PACKAGE_RESTORE";
		case BackupManagerMonitor.LOG_EVENT_ID_AGENT_FAILURE:
		return "AGENT_FAILURE";
		default:
		return "UNKNOWN_ID";
		}

core/java/android/app/TaskInfo.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -254,6 +254,12 @@ public class TaskInfo {
		*/
		public boolean isUserFullscreenOverrideEnabled;

		/**
		* Whether the top activity fillsParent() is false
		* @hide
		*/
		public boolean isTopActivityTransparent;

		/**
		* Hint about the letterbox state of the top activity.
		* @hide
		@@ -551,7 +557,8 @@ public class TaskInfo {
		&& Objects.equals(mTopActivityLocusId, that.mTopActivityLocusId)
		&& parentTaskId == that.parentTaskId
		&& Objects.equals(topActivity, that.topActivity)
		&& isUserFullscreenOverrideEnabled == that.isUserFullscreenOverrideEnabled;
		&& isUserFullscreenOverrideEnabled == that.isUserFullscreenOverrideEnabled
		&& isTopActivityTransparent == that.isTopActivityTransparent;
		}

		/**
		@@ -583,7 +590,9 @@ public class TaskInfo {
		== that.configuration.getLayoutDirection())
		&& (!hasCompatUI() \|\| configuration.uiMode == that.configuration.uiMode)
		&& (!hasCompatUI() \|\| isVisible == that.isVisible)
		&& isUserFullscreenOverrideEnabled == that.isUserFullscreenOverrideEnabled;
		&& isFocused == that.isFocused
		&& isUserFullscreenOverrideEnabled == that.isUserFullscreenOverrideEnabled
		&& isTopActivityTransparent == that.isTopActivityTransparent;
		}

		/**
		@@ -640,6 +649,7 @@ public class TaskInfo {
		topActivityLetterboxWidth = source.readInt();
		topActivityLetterboxHeight = source.readInt();
		isUserFullscreenOverrideEnabled = source.readBoolean();
		isTopActivityTransparent = source.readBoolean();
		}

		/**
		@@ -697,6 +707,7 @@ public class TaskInfo {
		dest.writeInt(topActivityLetterboxWidth);
		dest.writeInt(topActivityLetterboxHeight);
		dest.writeBoolean(isUserFullscreenOverrideEnabled);
		dest.writeBoolean(isTopActivityTransparent);
		}

		@Override
		@@ -744,6 +755,7 @@ public class TaskInfo {
		+ " topActivityLetterboxWidth=" + topActivityLetterboxWidth
		+ " topActivityLetterboxHeight=" + topActivityLetterboxHeight
		+ " isUserFullscreenOverrideEnabled=" + isUserFullscreenOverrideEnabled
		+ " isTopActivityTransparent=" + isTopActivityTransparent
		+ " locusId=" + mTopActivityLocusId
		+ " displayAreaFeatureId=" + displayAreaFeatureId
		+ " cameraCompatControlState="

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

+51 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app.backup;

		import android.annotation.SystemApi;
		import android.app.backup.BackupAnnotations.OperationType;
		import android.content.pm.PackageInfo;
		import android.os.Bundle;

		/**
		@@ -190,6 +191,56 @@ public class BackupManagerMonitor {
		public static final int LOG_EVENT_ID_TRANSPORT_NON_INCREMENTAL_BACKUP_REQUIRED = 51;

		public static final int LOG_EVENT_ID_AGENT_LOGGING_RESULTS = 52;
		/** @hide */
		public static final int LOG_EVENT_ID_START_SYSTEM_RESTORE = 53;
		/** @hide */
		public static final int LOG_EVENT_ID_START_RESTORE_AT_INSTALL = 54;
		/** A transport error happened during {@link PerformUnifiedRestoreTask#startRestore()}
		@hide */
		public static final int LOG_EVENT_ID_TRANSPORT_ERROR_DURING_START_RESTORE = 55;
		/** Unable to get the name of the next package in the queue during a restore operation
		@hide */
		public static final int LOG_EVENT_ID_CANNOT_GET_NEXT_PKG_NAME = 56;
		/** Attempting a restore operation that is neither KV nor full
		@hide */
		public static final int LOG_EVENT_ID_UNKNOWN_RESTORE_TYPE = 57;
		/** The package is part of KeyValue restore
		@hide */
		public static final int LOG_EVENT_ID_KV_RESTORE = 58;
		/** The package is part of Full restore
		@hide */
		public static final int LOG_EVENT_ID_FULL_RESTORE = 59;
		/** Unable to fetch the nest restore target in the queue
		@hide */
		public static final int LOG_EVENT_ID_NO_NEXT_RESTORE_TARGET = 60;
		/** An error occurred while attempting KeyValueRestore
		@hide */
		public static final int LOG_EVENT_ID_KV_AGENT_ERROR = 61;
		/** Restore operation finished for the given package
		@hide */
		public static final int LOG_EVENT_ID_PACKAGE_RESTORE_FINISHED= 62;
		/** A transport error happened during
		* {@link PerformUnifiedRestoreTask#initiateOneRestore(PackageInfo, long)}
		@hide */
		public static final int LOG_EVENT_ID_TRANSPORT_ERROR_KV_RESTORE = 63;
		/** Unable to instantiate the feeder thread in full restore
		@hide */
		public static final int LOG_EVENT_ID_NO_FEEDER_THREAD = 64;
		/** An error occurred while attempting Full restore
		@hide */
		public static final int LOG_EVENT_ID_FULL_AGENT_ERROR = 65;
		/** A transport error happened during a full restore
		@hide */
		public static final int LOG_EVENT_ID_TRANSPORT_ERROR_FULL_RESTORE = 66;
		/** Start restore operation for a given package
		@hide */
		public static final int LOG_EVENT_ID_START_PACKAGE_RESTORE = 67;
		/** Whole restore operation is complete
		@hide */
		public static final int LOG_EVENT_ID_RESTORE_COMPLETE = 68;
		/** Agent error during {@link PerformUnifiedRestoreTask#restoreFinished()}
		@hide */
		public static final int LOG_EVENT_ID_AGENT_FAILURE = 69;

		/**
		* This method will be called each time something important happens on BackupManager.

core/java/android/os/Build.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1555,7 +1555,7 @@ public class Build {
		String attestProp = getString(
		TextUtils.formatSimple("ro.product.%s_for_attestation", property));
		return attestProp.equals(UNKNOWN)
		? getString(TextUtils.formatSimple("ro.product.vendor.%s", property)) : UNKNOWN;
		? getString(TextUtils.formatSimple("ro.product.vendor.%s", property)) : attestProp;
		}

		private static String[] getStringList(String property, String separator) {

core/java/android/view/autofill/AutofillManager.java

+26 −13

Original line number	Diff line number	Diff line
		@@ -1436,7 +1436,7 @@ public final class AutofillManager {
		}
		for (int i = 0; i < infos.size(); i++) {
		final VirtualViewFillInfo info = infos.valueAt(i);
		final int virtualId = infos.indexOfKey(i);
		final int virtualId = infos.keyAt(i);
		notifyViewReadyInner(getAutofillId(view, virtualId),
		(info == null) ? null : info.getAutofillHints());
		}
		@@ -1450,9 +1450,6 @@ public final class AutofillManager {
		* @hide
		*/
		public void notifyViewEnteredForFillDialog(View v) {
		if (sDebug) {
		Log.d(TAG, "notifyViewEnteredForFillDialog:" + v.getAutofillId());
		}
		if (v.isCredential()
		&& mIsFillAndSaveDialogDisabledForCredentialManager) {
		if (sDebug) {
		@@ -1465,11 +1462,14 @@ public final class AutofillManager {
		notifyViewReadyInner(v.getAutofillId(), v.getAutofillHints());
		}

		private void notifyViewReadyInner(AutofillId id, String[] autofillHints) {
		private void notifyViewReadyInner(AutofillId id, @Nullable String[] autofillHints) {
		if (sDebug) {
		Log.d(TAG, "notifyViewReadyInner:" + id);
		}

		if (!hasAutofillFeature()) {
		return;
		}

		synchronized (mLock) {
		if (mAllTrackedViews.contains(id)) {
		// The id is tracked and will not trigger pre-fill request again.
		@@ -1511,20 +1511,32 @@ public final class AutofillManager {
		Log.v(TAG, "not starting session: no service client");
		}
		}

		}
		}
		}

		if (mIsFillDialogEnabled
		\|\| ArrayUtils.containsAny(autofillHints, mFillDialogEnabledHints)) {
		// Check if framework should send pre-fill request for fill dialog
		boolean shouldSendPreFillRequestForFillDialog = false;
		if (mIsFillDialogEnabled) {
		shouldSendPreFillRequestForFillDialog = true;
		} else if (autofillHints != null) {
		// check if supported autofill hint is present
		for (String autofillHint : autofillHints) {
		for (String filldialogEnabledHint : mFillDialogEnabledHints) {
		if (filldialogEnabledHint.equalsIgnoreCase(autofillHint)) {
		shouldSendPreFillRequestForFillDialog = true;
		break;
		}
		}
		if (shouldSendPreFillRequestForFillDialog) break;
		}
		}
		if (shouldSendPreFillRequestForFillDialog) {
		if (sDebug) {
		Log.d(TAG, "Triggering pre-emptive request for fill dialog.");
		}

		int flags = FLAG_SUPPORTS_FILL_DIALOG;
		flags \|= FLAG_VIEW_NOT_FOCUSED;

		synchronized (mLock) {
		// To match the id of the IME served view, used AutofillId.NO_AUTOFILL_ID on prefill
		// request, because IME will reset the id of IME served view to 0 when activity
		@@ -1535,6 +1547,7 @@ public final class AutofillManager {
		/* bounds= / null, / value= */ null, flags);
		}
		}
		return;
		}

		private boolean hasFillDialogUiFeature() {