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

Commit 75823339 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a1c69e08: Fix a small bug when granting permissions through activity results. 

Merge commit 'a1c69e08' into gingerbread-plus-aosp

* commit 'a1c69e08':
  Fix a small bug when granting permissions through activity results.
parents 840f0fec a1c69e08

api/current.xml

+2 −2
Original line number Diff line number Diff line
@@ -203612,7 +203612,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -204160,7 +204160,7 @@ 
 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="pluginsPath" type="java.lang.String">

services/java/com/android/server/am/ActivityStack.java

+2 −1
Original line number Diff line number Diff line
@@ -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);