commit 4498aa6c58664d29779131751592d8dc5f53ce9c
author Vladislav Kaznacheev <kaznacheev@google.com> Thu Jul 21 13:12:29 2016 -0700
committer Vladislav Kaznacheev <kaznacheev@google.com> Fri Jul 22 18:13:39 2016 +0000
tree 1d35b29a1d50ab64c15e89367855331e3c3bba20
parent e86da3bc62e2ec650d69477ab7655aa7255be473

Fix AM.revokeUriPermissionFromOwner for prefix mode.

Currently ActivityManager.revokeUriPermissionFromOwner is doing
nothing when called with flags containing
Intent.FLAG_GRANT_PREFIX_URI_PERMISSION.

Bug: 30284061
Change-Id: Iafac98f3eb61a29f56ce274031c01cd555e13063
(cherry picked from commit ff7a500d72fa37ea3e2bf8e1c1908649475e9c2c)

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 59e3096..dca44b4 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -8607,7 +8607,8 @@
             if (uri == null) {
                 owner.removeUriPermissionsLocked(mode);
             } else {
-                owner.removeUriPermissionLocked(new GrantUri(userId, uri, false), mode);
+                final boolean prefix = (mode & Intent.FLAG_GRANT_PREFIX_URI_PERMISSION) != 0;
+                owner.removeUriPermissionLocked(new GrantUri(userId, uri, prefix), mode);
             }
         }
     }