Merge "wm/Server.java: add missing @Override annotations" (e41f824c) · Commits · e / os / android_frameworks_base

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,7 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public void binderDied() {
		// Note: it is safe to call in to the input method manager
		// here because we are not holding our lock.
		@@ -205,6 +206,7 @@ public class Session extends IWindowSession.Stub
		outContentInsets, outStableInsets, null /* outOutsets */, null);
		}

		@Override
		public void remove(IWindow window) {
		mService.removeWindow(this, window);
		}
		@@ -214,6 +216,7 @@ public class Session extends IWindowSession.Stub
		mService.setWillReplaceWindows(appToken, childrenOnly);
		}

		@Override
		public int relayout(IWindow window, int seq, WindowManager.LayoutParams attrs,
		int requestedWidth, int requestedHeight, int viewFlags,
		int flags, Rect outFrame, Rect outOverscanInsets, Rect outContentInsets,
		@@ -230,42 +233,50 @@ public class Session extends IWindowSession.Stub
		return res;
		}

		@Override
		public boolean outOfMemory(IWindow window) {
		return mService.outOfMemoryWindow(this, window);
		}

		@Override
		public void setTransparentRegion(IWindow window, Region region) {
		mService.setTransparentRegionWindow(this, window, region);
		}

		@Override
		public void setInsets(IWindow window, int touchableInsets,
		Rect contentInsets, Rect visibleInsets, Region touchableArea) {
		mService.setInsetsWindow(this, window, touchableInsets, contentInsets,
		visibleInsets, touchableArea);
		}

		@Override
		public void getDisplayFrame(IWindow window, Rect outDisplayFrame) {
		mService.getWindowDisplayFrame(this, window, outDisplayFrame);
		}

		@Override
		public void finishDrawing(IWindow window) {
		if (WindowManagerService.localLOGV) Slog.v(
		TAG_WM, "IWindow finishDrawing called for " + window);
		mService.finishDrawingWindow(this, window);
		}

		@Override
		public void setInTouchMode(boolean mode) {
		synchronized(mService.mWindowMap) {
		mService.mInTouchMode = mode;
		}
		}

		@Override
		public boolean getInTouchMode() {
		synchronized(mService.mWindowMap) {
		return mService.mInTouchMode;
		}
		}

		@Override
		public boolean performHapticFeedback(IWindow window, int effectId,
		boolean always) {
		synchronized(mService.mWindowMap) {
		@@ -281,12 +292,14 @@ public class Session extends IWindowSession.Stub
		}

		/* Drag/drop */
		@Override
		public IBinder prepareDrag(IWindow window, int flags,
		int width, int height, Surface outSurface) {
		return mService.prepareDragSurface(window, mSurfaceSession, flags,
		width, height, outSurface);
		}

		@Override
		public boolean performDrag(IWindow window, IBinder dragToken,
		int touchSource, float touchX, float touchY, float thumbCenterX, float thumbCenterY,
		ClipData data) {
		@@ -370,6 +383,7 @@ public class Session extends IWindowSession.Stub
		return true; // success!
		}

		@Override
		public boolean startMovingTask(IWindow window, float startX, float startY) {
		if (DEBUG_TASK_POSITIONING) Slog.d(
		TAG_WM, "startMovingTask: {" + startX + "," + startY + "}");
		@@ -382,6 +396,7 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public void reportDropResult(IWindow window, boolean consumed) {
		IBinder token = window.asBinder();
		if (DEBUG_DRAG) {
		@@ -422,6 +437,7 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public void cancelDragAndDrop(IBinder dragToken) {
		if (DEBUG_DRAG) {
		Slog.d(TAG_WM, "cancelDragAndDrop");
		@@ -450,18 +466,21 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public void dragRecipientEntered(IWindow window) {
		if (DEBUG_DRAG) {
		Slog.d(TAG_WM, "Drag into new candidate view @ " + window.asBinder());
		}
		}

		@Override
		public void dragRecipientExited(IWindow window) {
		if (DEBUG_DRAG) {
		Slog.d(TAG_WM, "Drag from old candidate view @ " + window.asBinder());
		}
		}

		@Override
		public void setWallpaperPosition(IBinder window, float x, float y, float xStep, float yStep) {
		synchronized(mService.mWindowMap) {
		long ident = Binder.clearCallingIdentity();
		@@ -475,12 +494,14 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public void wallpaperOffsetsComplete(IBinder window) {
		synchronized (mService.mWindowMap) {
		mService.mRoot.mWallpaperController.wallpaperOffsetsComplete(window);
		}
		}

		@Override
		public void setWallpaperDisplayOffset(IBinder window, int x, int y) {
		synchronized(mService.mWindowMap) {
		long ident = Binder.clearCallingIdentity();
		@@ -493,6 +514,7 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public Bundle sendWallpaperCommand(IBinder window, String action, int x, int y,
		int z, Bundle extras, boolean sync) {
		synchronized(mService.mWindowMap) {
		@@ -507,12 +529,14 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public void wallpaperCommandComplete(IBinder window, Bundle result) {
		synchronized (mService.mWindowMap) {
		mService.mRoot.mWallpaperController.wallpaperCommandComplete(window);
		}
		}

		@Override
		public void onRectangleOnScreenRequested(IBinder token, Rect rectangle) {
		synchronized(mService.mWindowMap) {
		final long identity = Binder.clearCallingIdentity();
		@@ -524,6 +548,7 @@ public class Session extends IWindowSession.Stub
		}
		}

		@Override
		public IWindowId getWindowId(IBinder window) {
		return mService.getWindowId(window);
		}