commit 077794468a1bfee705366e02ff226fda2366d456
author Vladislav Kaznacheev <kaznacheev@google.com> Mon Oct 26 19:46:21 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 26 19:46:21 2015 +0000
tree a433eab9adbeeb011e2c448f99c184cbb8cd540a
parent 67b78a3daefcebd5a9c1c6d1d0f44c1eff861b1b
parent e71a321305381d039e3fe637f22e1f82b3dc9e91

Merge "Fix drag and drop URI permission grants"

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

diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java
index f5e97e5..f35ea66 100644
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -77,7 +77,6 @@
         mSurfaceControl = surface;
         mFlags = flags;
         mLocalWin = localWin;
-        mUid = Binder.getCallingUid();
         mNotifiedWindows = new ArrayList<WindowState>();
     }
 

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index cd5fbb0..05e51ca 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6972,7 +6972,7 @@
                     + " 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 @@
                         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