Snap for 4603989 from 833770d26f7813768e195d22ca9c8e41dc83448a to oc-m2-release (65ff5247) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -5871,16 +5871,6 @@ public class Activity extends ContextThemeWrapper
		return mComponent;
		}

		/**
		* Temporary method on O-MR1 only.
		*
		* @hide
		*/
		@Override
		public ComponentName getComponentNameForAutofill() {
		return mComponent;
		}

		/**
		* Retrieve a {@link SharedPreferences} object for accessing preferences
		* that are private to this activity. This simply calls the underlying

core/java/android/app/ActivityManagerInternal.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -268,9 +268,4 @@ public abstract class ActivityManagerInternal {
		* @param token The IApplicationToken for the activity
		*/
		public abstract void setFocusedActivity(IBinder token);

		/**
		* Returns {@code true} if {@code uid} is running an activity from {@code packageName}.
		*/
		public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);
		}

core/java/android/app/assist/AssistStructure.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -2058,16 +2058,6 @@ public class AssistStructure implements Parcelable {
		return mActivityComponent;
		}

		/**
		* Called by Autofill server when app forged a different value.
		*
		* @hide
		*/
		public void setActivityComponent(ComponentName componentName) {
		ensureData();
		mActivityComponent = componentName;
		}

		/** @hide */
		public int getFlags() {
		return mFlags;

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

+5 −28

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemService;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentSender;
		@@ -45,7 +44,6 @@ import android.view.View;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.Preconditions;

		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		@@ -386,20 +384,13 @@ public final class AutofillManager {
		* Runs the specified action on the UI thread.
		*/
		void runOnUiThread(Runnable action);

		/**
		* Gets the complete component name of this client.
		*
		* <p>Temporary method on O-MR1 only.
		*/
		ComponentName getComponentNameForAutofill();
		}

		/**
		* @hide
		*/
		public AutofillManager(Context context, IAutoFillManager service) {
		mContext = Preconditions.checkNotNull(context, "context cannot be null");
		mContext = context;
		mService = service;
		}

		@@ -949,10 +940,6 @@ public final class AutofillManager {
		return mContext.getAutofillClient();
		}

		private ComponentName getComponentNameFromContext(AutofillClient client) {
		return client == null ? null : client.getComponentNameForAutofill();
		}

		/** @hide */
		public void onAuthenticationResult(int authenticationId, Intent data) {
		if (!hasAutofillFeature()) {
		@@ -1003,18 +990,13 @@ public final class AutofillManager {
		return;
		}
		try {
		final AutofillClient client = getClientLocked();
		final ComponentName componentName = getComponentNameFromContext(client);
		if (componentName == null) {
		Log.w(TAG, "startSessionLocked(): context is not activity: " + mContext);
		return;
		}
		mSessionId = mService.startSession(mContext.getActivityToken(),
		mServiceClient.asBinder(), id, bounds, value, mContext.getUserId(),
		mCallback != null, flags, componentName);
		mCallback != null, flags, mContext.getOpPackageName());
		if (mSessionId != NO_SESSION) {
		mState = STATE_ACTIVE;
		}
		final AutofillClient client = getClientLocked();
		if (client != null) {
		client.autofillCallbackResetableStateAvailable();
		}
		@@ -1068,19 +1050,14 @@ public final class AutofillManager {

		try {
		if (restartIfNecessary) {
		final AutofillClient client = getClientLocked();
		final ComponentName componentName = getComponentNameFromContext(client);
		if (componentName == null) {
		Log.w(TAG, "startSessionLocked(): context is not activity: " + mContext);
		return;
		}
		final int newId = mService.updateOrRestartSession(mContext.getActivityToken(),
		mServiceClient.asBinder(), id, bounds, value, mContext.getUserId(),
		mCallback != null, flags, componentName, mSessionId, action);
		mCallback != null, flags, mContext.getOpPackageName(), mSessionId, action);
		if (newId != mSessionId) {
		if (sDebug) Log.d(TAG, "Session restarted: " + mSessionId + "=>" + newId);
		mSessionId = newId;
		mState = (mSessionId == NO_SESSION) ? STATE_UNKNOWN : STATE_ACTIVE;
		final AutofillClient client = getClientLocked();
		if (client != null) {
		client.autofillCallbackResetableStateAvailable();
		}

core/java/android/view/autofill/IAutoFillManager.aidl

+2 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.view.autofill;

		import android.content.ComponentName;
		import android.graphics.Rect;
		import android.os.Bundle;
		import android.os.IBinder;
		@@ -35,15 +34,14 @@ interface IAutoFillManager {
		int addClient(in IAutoFillManagerClient client, int userId);
		int startSession(IBinder activityToken, in IBinder appCallback, in AutofillId autoFillId,
		in Rect bounds, in AutofillValue value, int userId, boolean hasCallback, int flags,
		in ComponentName componentName);
		String packageName);
		FillEventHistory getFillEventHistory();
		boolean restoreSession(int sessionId, in IBinder activityToken, in IBinder appCallback);
		void updateSession(int sessionId, in AutofillId id, in Rect bounds,
		in AutofillValue value, int action, int flags, int userId);
		int updateOrRestartSession(IBinder activityToken, in IBinder appCallback,
		in AutofillId autoFillId, in Rect bounds, in AutofillValue value, int userId,
		boolean hasCallback, int flags, in ComponentName componentName, int sessionId,
		int action);
		boolean hasCallback, int flags, String packageName, int sessionId, int action);
		void finishSession(int sessionId, int userId);
		void cancelSession(int sessionId, int userId);
		void setAuthenticationResult(in Bundle data, int sessionId, int authenticationId, int userId);