Snap for 10739918 from 2854796f6f4e52377bd4ec1f87f16cbb365068af to udc-qpr1-release (b2f5c19f) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1154,6 +1154,7 @@ package android.credentials {
		method @Nullable public CharSequence getSettingsSubtitle();
		method @NonNull public boolean hasCapability(@NonNull String);
		method public boolean isEnabled();
		method public boolean isPrimary();
		method public boolean isSystemProvider();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.credentials.CredentialProviderInfo> CREATOR;

+10 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.content.ServiceConnection;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ActivityPresentationInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageDataObserver;
		import android.content.pm.UserInfo;
		import android.net.Uri;
		import android.os.Bundle;
		@@ -1224,4 +1225,13 @@ public abstract class ActivityManagerInternal {
		*/
		@NonNull
		public abstract StatsEvent getCachedAppsHighWatermarkStats(int atomTag, boolean resetAfterPull);

		/**
		* Internal method for clearing app data, with the extra param that is used to indicate restore.
		* Used by Backup service during restore operation.
		*
		* @hide
		*/
		public abstract boolean clearApplicationUserData(String packageName, boolean keepState,
		boolean isRestore, IPackageDataObserver observer, int userId);
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -6685,6 +6685,15 @@ public class Intent implements Parcelable, Cloneable {
		public static final String EXTRA_VISIBILITY_ALLOW_LIST =
		"android.intent.extra.VISIBILITY_ALLOW_LIST";

		/**
		* A boolean extra used with {@link #ACTION_PACKAGE_DATA_CLEARED} which indicates if the intent
		* is broadcast as part of a restore operation.
		*
		* @hide
		*/
		public static final String EXTRA_IS_RESTORE =
		"android.intent.extra.IS_RESTORE";

		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Intent flags (see mFlags variable).

+0 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,6 @@ public final class CredentialProviderInfo implements Parcelable {
		/**
		* Returns whether the provider is set as primary by the user.
		*
		* @hide
		*/
		public boolean isPrimary() {
		return mIsPrimary;

+2 −9

Original line number	Diff line number	Diff line
		@@ -1149,11 +1149,7 @@ public class CameraDeviceImpl extends CameraDevice
		"remove holder for requestId %d, "
		+ "because lastFrame is %d.",
		requestId, lastFrameNumber));
		}
		}

		if (holder != null) {
		if (DEBUG) {
		Log.v(TAG, "immediately trigger onCaptureSequenceAborted because"
		+ " request did not reach HAL");
		}
		@@ -2180,11 +2176,9 @@ public class CameraDeviceImpl extends CameraDevice

		final CaptureCallbackHolder holder =
		CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId);
		final CaptureRequest request = holder.getRequest(resultExtras.getSubsequenceId());

		boolean isPartialResult =
		(resultExtras.getPartialResultCount() < mTotalPartialCount);
		int requestType = request.getRequestType();

		// Check if we have a callback for this
		if (holder == null) {
		@@ -2194,12 +2188,11 @@ public class CameraDeviceImpl extends CameraDevice
		+ frameNumber);
		}

		updateTracker(requestId, frameNumber, requestType, /result/null,
		isPartialResult);

		return;
		}

		final CaptureRequest request = holder.getRequest(resultExtras.getSubsequenceId());
		int requestType = request.getRequestType();
		if (isClosed()) {
		if (DEBUG) {
		Log.d(TAG,