Snap for 4378450 from c765c2c448b7c38e6fb72c96fc31f4a568433404 to oc-mr1-release (dfbe7af5) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -6308,6 +6308,7 @@ package android.app {
		}

		public class VrManager {
		method public void setAndBindVrCompositor(android.content.ComponentName);
		method public void setPersistentVrModeEnabled(boolean);
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ import android.view.WindowManager;
		import android.view.WindowManagerGlobal;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.autofill.AutofillManager;
		import android.view.autofill.AutofillManager.AutofillClient;
		import android.view.autofill.AutofillPopupWindow;
		import android.view.autofill.IAutofillWindowPresenter;
		import android.widget.AdapterView;
		@@ -947,6 +948,18 @@ public class Activity extends ContextThemeWrapper
		return mAutofillManager;
		}

		@Override
		protected void attachBaseContext(Context newBase) {
		super.attachBaseContext(newBase);
		newBase.setAutofillClient(this);
		}

		/** @hide */
		@Override
		public final AutofillClient getAutofillClient() {
		return this;
		}

		/**
		* Called when the activity is starting. This is where most initialization
		* should go: calling {@link #setContentView(int)} to inflate the

+1 −1

Original line number	Diff line number	Diff line
		@@ -5766,7 +5766,7 @@ public final class ActivityThread {
		final int preloadedFontsResource = info.metaData.getInt(
		ApplicationInfo.METADATA_PRELOADED_FONTS, 0);
		if (preloadedFontsResource != 0) {
		data.info.mResources.preloadFonts(preloadedFontsResource);
		data.info.getResources().preloadFonts(preloadedFontsResource);
		}
		}
		} catch (RemoteException e) {

+15 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ import android.util.Log;
		import android.util.Slog;
		import android.view.Display;
		import android.view.DisplayAdjustments;
		import android.view.autofill.AutofillManager.AutofillClient;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.Preconditions;
		@@ -185,6 +186,8 @@ class ContextImpl extends Context {
		// The name of the split this Context is representing. May be null.
		private @Nullable String mSplitName = null;

		private AutofillClient mAutofillClient = null;

		private final Object mSync = new Object();

		@GuardedBy("mSync")
		@@ -2225,6 +2228,18 @@ class ContextImpl extends Context {
		return mUser.getIdentifier();
		}

		/** @hide */
		@Override
		public AutofillClient getAutofillClient() {
		return mAutofillClient;
		}

		/** @hide */
		@Override
		public void setAutofillClient(AutofillClient client) {
		mAutofillClient = client;
		}

		static ContextImpl createSystemContext(ActivityThread mainThread) {
		LoadedApk packageInfo = new LoadedApk(mainThread);
		ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, null, 0,

+17 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.content.ComponentName;
		import android.content.Context;
		import android.os.Handler;
		import android.os.RemoteException;
		@@ -181,4 +182,20 @@ public class VrManager {
		e.rethrowFromSystemServer();
		}
		}

		/**
		* Set the component name of the compositor service to bind.
		*
		* @param componentName ComponentName of a Service in the application's compositor process to
		* bind to, or null to clear the current binding.
		*/
		@RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS)
		public void setAndBindVrCompositor(ComponentName componentName) {
		try {
		mService.setAndBindCompositor(
		(componentName == null) ? null : componentName.flattenToString());
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		}
		}