Merge cherrypicks of [3519487, 3519488, 3520743, 3521264, 3521265] into oc-m2-release (dda26662) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -5871,6 +5871,16 @@ 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/view/autofill/AutofillManager.java

+13 −10

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.app.Activity;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		@@ -387,6 +386,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();
		}

		/**
		@@ -943,11 +949,8 @@ public final class AutofillManager {
		return mContext.getAutofillClient();
		}

		private ComponentName getComponentNameFromContext() {
		if (mContext instanceof Activity) {
		return ((Activity) mContext).getComponentName();
		}
		return null;
		private ComponentName getComponentNameFromContext(AutofillClient client) {
		return client == null ? null : client.getComponentNameForAutofill();
		}

		/** @hide */
		@@ -1000,7 +1003,8 @@ public final class AutofillManager {
		return;
		}
		try {
		final ComponentName componentName = getComponentNameFromContext();
		final AutofillClient client = getClientLocked();
		final ComponentName componentName = getComponentNameFromContext(client);
		if (componentName == null) {
		Log.w(TAG, "startSessionLocked(): context is not activity: " + mContext);
		return;
		@@ -1011,7 +1015,6 @@ public final class AutofillManager {
		if (mSessionId != NO_SESSION) {
		mState = STATE_ACTIVE;
		}
		final AutofillClient client = getClientLocked();
		if (client != null) {
		client.autofillCallbackResetableStateAvailable();
		}
		@@ -1065,7 +1068,8 @@ public final class AutofillManager {

		try {
		if (restartIfNecessary) {
		final ComponentName componentName = getComponentNameFromContext();
		final AutofillClient client = getClientLocked();
		final ComponentName componentName = getComponentNameFromContext(client);
		if (componentName == null) {
		Log.w(TAG, "startSessionLocked(): context is not activity: " + mContext);
		return;
		@@ -1077,7 +1081,6 @@ public final class AutofillManager {
		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();
		}

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+7 −14

Original line number	Diff line number	Diff line
		@@ -1687,19 +1687,10 @@ public class SettingsProvider extends ContentProvider {
		}

		private List<String> getSettingsNamesLocked(int settingsType, int userId) {
		boolean instantApp;
		if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {
		instantApp = false;
		} else {
		ApplicationInfo ai = getCallingApplicationInfoOrThrow();
		instantApp = ai.isInstantApp();
		}
		if (instantApp) {
		return new ArrayList<String>(getInstantAppAccessibleSettings(settingsType));
		} else {
		// Don't enforce the instant app whitelist for now -- its too prone to unintended breakage
		// in the current form.
		return mSettingsRegistry.getSettingsNamesLocked(settingsType, userId);
		}
		}

		private void enforceSettingReadable(String settingName, int settingsType, int userId) {
		if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) {
		@@ -1711,8 +1702,10 @@ public class SettingsProvider extends ContentProvider {
		}
		if (!getInstantAppAccessibleSettings(settingsType).contains(settingName)
		&& !getOverlayInstantAppAccessibleSettings(settingsType).contains(settingName)) {
		throw new SecurityException("Setting " + settingName + " is not accessible from"
		+ " ephemeral package " + getCallingPackage());
		// Don't enforce the instant app whitelist for now -- its too prone to unintended
		// breakage in the current form.
		Slog.w(LOG_TAG, "Instant App " + ai.packageName
		+ " trying to access unexposed setting, this will be an error in the future.");
		}
		}

proto/src/metrics_constants.proto

+5 −1

Original line number	Diff line number	Diff line
		@@ -4545,7 +4545,8 @@ message MetricsEvent {
		// OS: O MR
		AUTOFILL_SERVICE_DISABLED_SELF = 1135;

		// Counter showing how long it took (in ms) to show the autofill UI after a field was focused
		// Reports how long it took to show the autofill UI after a field was focused
		// Tag FIELD_AUTOFILL_DURATION: Duration in ms
		// Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request
		// Package: Package of the autofill service
		// OS: O MR
		@@ -4584,6 +4585,9 @@ message MetricsEvent {
		// logged when we cancel an app transition.
		APP_TRANSITION_CANCELLED = 1144;

		// Tag of a field representing a duration on autofill-related metrics.
		FIELD_AUTOFILL_DURATION = 1145;

		// ---- End O-MR1 Constants, all O-MR1 constants go above this line ----

		// ACTION: Stop an app and turn on background check

services/autofill/java/com/android/server/autofill/Session.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1397,7 +1397,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		mUiLatencyHistory.log(historyLog.toString());

		final LogMaker metricsLog = newLogMaker(MetricsEvent.AUTOFILL_UI_LATENCY)
		.setCounterValue((int) duration);
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, duration);
		mMetricsLogger.write(metricsLog);
		}
		}