Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07779446 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by Android (Google) Code Review
Browse files

Merge "Fix drag and drop URI permission grants"

parents 67b78a3d e71a3213

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

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ class DragState { 
        mSurfaceControl = surface;

        mFlags = flags;

        mLocalWin = localWin;

        mUid = Binder.getCallingUid();

        mNotifiedWindows = new ArrayList<WindowState>();

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -6972,7 +6972,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    + " asbinder=" + window.asBinder());

        }



        final int callerPid = Binder.getCallingPid();

        final int callerUid = Binder.getCallingUid();

        final long origId = Binder.clearCallingIdentity();

        IBinder token = null;
@@ -6997,6 +6997,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        final IBinder winBinder = window.asBinder();

                        token = new Binder();

                        mDragState = new DragState(this, token, surface, flags, winBinder);

                        mDragState.mUid = callerUid;

                        token = mDragState.mToken = new Binder();



                        // 5 second timeout for this window to actually begin the drag