Merge "Fix hidden subtitle issue" (c244e9ae) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowState.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -5125,9 +5125,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		// relative layering of multiple APPLICATION_MEDIA/OVERLAY has never
		// been defined and so we can use static layers and leave it that way.
		if (w.mAttrs.type == TYPE_APPLICATION_MEDIA) {
		if (mWinAnimator.hasSurface()) {
		w.assignRelativeLayer(t, mWinAnimator.mSurfaceController.mSurfaceControl, -2);
		} else {
		w.assignLayer(t, -2);
		}
		} else if (w.mAttrs.type == TYPE_APPLICATION_MEDIA_OVERLAY) {
		if (mWinAnimator.hasSurface()) {
		w.assignRelativeLayer(t, mWinAnimator.mSurfaceController.mSurfaceControl, -1);
		} else {
		w.assignLayer(t, -1);
		}
		} else {
		w.assignLayer(t, layer);
		}