Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev (e0f4421f) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+1 −18

Original line number	Diff line number	Diff line
		@@ -190,8 +190,7 @@ public final class SurfaceControl implements Parcelable {

		private static native void nativeSetInputWindowInfo(long transactionObj, long nativeObject,
		InputWindowHandle handle);
		private static native void nativeTransferTouchFocus(long transactionObj, IBinder fromToken,
		IBinder toToken);

		private static native boolean nativeGetProtectedContentSupport();
		private static native void nativeSetMetadata(long transactionObj, long nativeObject, int key,
		Parcel data);
		@@ -2248,22 +2247,6 @@ public final class SurfaceControl implements Parcelable {
		return this;
		}

		/**
		* Transfers touch focus from one window to another. It is possible for multiple windows to
		* have touch focus if they support split touch dispatch
		* {@link android.view.WindowManager.LayoutParams#FLAG_SPLIT_TOUCH} but this
		* method only transfers touch focus of the specified window without affecting
		* other windows that may also have touch focus at the same time.
		* @param fromToken The token of a window that currently has touch focus.
		* @param toToken The token of the window that should receive touch focus in
		* place of the first.
		* @hide
		*/
		public Transaction transferTouchFocus(IBinder fromToken, IBinder toToken) {
		nativeTransferTouchFocus(mNativeObject, fromToken, toToken);
		return this;
		}

		/**
		* Waits until any changes to input windows have been sent from SurfaceFlinger to
		* InputFlinger before returning.

+0 −11

Original line number	Diff line number	Diff line
		@@ -463,15 +463,6 @@ static void nativeSetInputWindowInfo(JNIEnv* env, jclass clazz, jlong transactio
		transaction->setInputWindowInfo(ctrl, *handle->getInfo());
		}

		static void nativeTransferTouchFocus(JNIEnv* env, jclass clazz, jlong transactionObj,
		jobject fromTokenObj, jobject toTokenObj) {
		auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);

		sp<IBinder> fromToken(ibinderForJavaObject(env, fromTokenObj));
		sp<IBinder> toToken(ibinderForJavaObject(env, toTokenObj));
		transaction->transferTouchFocus(fromToken, toToken);
		}

		static void nativeSyncInputWindows(JNIEnv* env, jclass clazz, jlong transactionObj) {
		auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
		transaction->syncInputWindows();
		@@ -1381,8 +1372,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = {
		(void*)nativeCaptureLayers },
		{"nativeSetInputWindowInfo", "(JJLandroid/view/InputWindowHandle;)V",
		(void*)nativeSetInputWindowInfo },
		{"nativeTransferTouchFocus", "(JLandroid/os/IBinder;Landroid/os/IBinder;)V",
		(void*)nativeTransferTouchFocus },
		{"nativeSetMetadata", "(JJILandroid/os/Parcel;)V",
		(void*)nativeSetMetadata },
		{"nativeGetDisplayedContentSamplingAttributes",

+0 −5

Original line number	Diff line number	Diff line
		@@ -96,11 +96,6 @@ public class StubTransaction extends SurfaceControl.Transaction {
		return this;
		}

		@Override
		public SurfaceControl.Transaction transferTouchFocus(IBinder fromToken, IBinder toToken) {
		return this;
		}

		@Override
		public SurfaceControl.Transaction setGeometry(SurfaceControl sc, Rect sourceCrop,
		Rect destFrame, @Surface.Rotation int orientation) {