Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev (b0b685ba) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceView.java

+26 −0

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

		package android.view;

		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
		import static android.view.WindowManagerPolicy.APPLICATION_MEDIA_OVERLAY_SUBLAYER;
		import static android.view.WindowManagerPolicy.APPLICATION_MEDIA_SUBLAYER;
		import static android.view.WindowManagerPolicy.APPLICATION_PANEL_SUBLAYER;
		@@ -871,6 +872,31 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		return callbacks;
		}

		/**
		* This method still exists only for compatibility reasons because some applications have relied
		* on this method via reflection. See Issue 36345857 for details.
		*
		* @deprecated No platform code is using this method anymore.
		* @hide
		*/
		@Deprecated
		public void setWindowType(int type) {
		if (getContext().getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O) {
		throw new UnsupportedOperationException(
		"SurfaceView#setWindowType() has never been a public API.");
		}

		if (type == TYPE_APPLICATION_PANEL) {
		Log.e(TAG, "If you are calling SurfaceView#setWindowType(TYPE_APPLICATION_PANEL) "
		+ "just to make the SurfaceView to be placed on top of its window, you must "
		+ "call setZOrderOnTop(true) instead.", new Throwable());
		setZOrderOnTop(true);
		return;
		}
		Log.e(TAG, "SurfaceView#setWindowType(int) is deprecated and now does nothing. "
		+ "type=" + type, new Throwable());
		}

		private void runOnUiThread(Runnable runnable) {
		Handler handler = getHandler();
		if (handler != null && handler.getLooper() != Looper.myLooper()) {