Snap for 8931212 from 7aa7aeff3bc67d0e1b443066787f49461653c038 to tm-qpr1-release (1185bc01) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -15,14 +15,6 @@ filegroup {
	"*/.java",		"*/.java",
	"*/.aidl",		"*/.aidl",
	],		],
	exclude_srcs: [
	// Remove election toolbar code from build time
	"android/service/selectiontoolbar/*.aidl",
	"android/service/selectiontoolbar/*.java",
	"android/view/selectiontoolbar/*.aidl",
	"android/view/selectiontoolbar/*.java",
	"com/android/internal/widget/floatingtoolbar/RemoteFloatingToolbarPopup.java",
	],
	visibility: ["//frameworks/base"],		visibility: ["//frameworks/base"],
	}		}

core/java/android/app/SystemServiceRegistry.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,8 @@ import android.view.contentcapture.ContentCaptureManager;
	import android.view.contentcapture.IContentCaptureManager;		import android.view.contentcapture.IContentCaptureManager;
	import android.view.displayhash.DisplayHashManager;		import android.view.displayhash.DisplayHashManager;
	import android.view.inputmethod.InputMethodManager;		import android.view.inputmethod.InputMethodManager;
			import android.view.selectiontoolbar.ISelectionToolbarManager;
			import android.view.selectiontoolbar.SelectionToolbarManager;
	import android.view.textclassifier.TextClassificationManager;		import android.view.textclassifier.TextClassificationManager;
	import android.view.textservice.TextServicesManager;		import android.view.textservice.TextServicesManager;
	import android.view.translation.ITranslationManager;		import android.view.translation.ITranslationManager;
	@@ -363,6 +365,15 @@ public final class SystemServiceRegistry {
	return new TextClassificationManager(ctx);		return new TextClassificationManager(ctx);
	}});		}});

			registerService(Context.SELECTION_TOOLBAR_SERVICE, SelectionToolbarManager.class,
			new CachedServiceFetcher<SelectionToolbarManager>() {
			@Override
			public SelectionToolbarManager createService(ContextImpl ctx) {
			IBinder b = ServiceManager.getService(Context.SELECTION_TOOLBAR_SERVICE);
			return new SelectionToolbarManager(ctx.getOuterContext(),
			ISelectionToolbarManager.Stub.asInterface(b));
			}});

	registerService(Context.FONT_SERVICE, FontManager.class,		registerService(Context.FONT_SERVICE, FontManager.class,
	new CachedServiceFetcher<FontManager>() {		new CachedServiceFetcher<FontManager>() {
	@Override		@Override

core/java/android/hardware/camera2/CameraDevice.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -892,7 +892,7 @@ public abstract class CameraDevice implements AutoCloseable {
	* <tr><th colspan="7">Preview stabilization guaranteed stream configurations</th></tr>		* <tr><th colspan="7">Preview stabilization guaranteed stream configurations</th></tr>
	* <tr><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th rowspan="2">Sample use case(s)</th> </tr>		* <tr><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th rowspan="2">Sample use case(s)</th> </tr>
	* <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th></tr>		* <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th></tr>
	* <tr> <td>{@code PRIV / YUV}</td><td id="rb">{@code s1440p}</td><td colspan="4" id="rb"></td> <td>Stabilized preview, GPU video processing, or no-preview stabilized video recording.</td> </tr>		* <tr> <td>{@code PRIV / YUV}</td><td id="rb">{@code s1440p}</td><td colspan="2" id="rb"></td> <td>Stabilized preview, GPU video processing, or no-preview stabilized video recording.</td> </tr>
	* <tr> <td>{@code PRIV / YUV}</td><td id="rb">{@code s1440p}</td> <td>{@code JPEG / YUV}</td><td id="rb">{@code MAXIMUM }</td><td>Standard still imaging with stabilized preview.</td> </tr>		* <tr> <td>{@code PRIV / YUV}</td><td id="rb">{@code s1440p}</td> <td>{@code JPEG / YUV}</td><td id="rb">{@code MAXIMUM }</td><td>Standard still imaging with stabilized preview.</td> </tr>
	* <tr> <td>{@code PRIV / YUV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV / YUV}</td><td id="rb">{@code s1440p }</td><td>High-resolution recording with stabilized preview and recording stream.</td> </tr>		* <tr> <td>{@code PRIV / YUV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV / YUV}</td><td id="rb">{@code s1440p }</td><td>High-resolution recording with stabilized preview and recording stream.</td> </tr>
	* </table><br>		* </table><br>

core/java/android/provider/DeviceConfig.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -623,7 +623,7 @@ public final class DeviceConfig {
	private static final List<String> PUBLIC_NAMESPACES =		private static final List<String> PUBLIC_NAMESPACES =
	Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME, NAMESPACE_STATSD_JAVA,		Arrays.asList(NAMESPACE_TEXTCLASSIFIER, NAMESPACE_RUNTIME, NAMESPACE_STATSD_JAVA,
	NAMESPACE_STATSD_JAVA_BOOT, NAMESPACE_SELECTION_TOOLBAR, NAMESPACE_AUTOFILL,		NAMESPACE_STATSD_JAVA_BOOT, NAMESPACE_SELECTION_TOOLBAR, NAMESPACE_AUTOFILL,
	NAMESPACE_DEVICE_POLICY_MANAGER);		NAMESPACE_DEVICE_POLICY_MANAGER, NAMESPACE_CONTENT_CAPTURE);
	/**		/**
	* Privacy related properties definitions.		* Privacy related properties definitions.
	*		*

core/java/android/view/SurfaceControlViewHost.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -422,7 +422,7 @@ public class SurfaceControlViewHost {
	public void relayout(WindowManager.LayoutParams attrs,		public void relayout(WindowManager.LayoutParams attrs,
	WindowlessWindowManager.ResizeCompleteCallback callback) {		WindowlessWindowManager.ResizeCompleteCallback callback) {
	mViewRoot.setLayoutParams(attrs, false);		mViewRoot.setLayoutParams(attrs, false);
	mViewRoot.setReportNextDraw(true /* syncBuffer */);		mViewRoot.setReportNextDraw(true /* syncBuffer */, "scvh_relayout");
	mWm.setCompletionCallback(mViewRoot.mWindow.asBinder(), callback);		mWm.setCompletionCallback(mViewRoot.mWindow.asBinder(), callback);
	}		}