diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-01 22:55:02 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-09-01 22:55:02 -0700 |
| commit | a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4 (patch) | |
| tree | a7717db542b45f4ad8fa9dc7f22c0a663d047c6b /services/java | |
| parent | d3efa3924407da6d38aa5931ac29aa088d9eb986 (diff) | |
| download | frameworks_base-a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4.zip frameworks_base-a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4.tar.gz frameworks_base-a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4.tar.bz2 | |
Fix a small bug when granting permissions through activity results.
Change-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index c21a221..5f79b85 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -2885,7 +2885,8 @@ public class ActivityStack { + " res=" + resultCode + " data=" + resultData); if (r.info.applicationInfo.uid > 0) { mService.grantUriPermissionFromIntentLocked(r.info.applicationInfo.uid, - r.packageName, resultData, r.getUriPermissionsLocked()); + resultTo.packageName, resultData, + resultTo.getUriPermissionsLocked()); } resultTo.addResultLocked(r, r.resultWho, r.requestCode, resultCode, resultData); |