From ff7a500d72fa37ea3e2bf8e1c1908649475e9c2c Mon Sep 17 00:00:00 2001
From: Vladislav Kaznacheev <kaznacheev@google.com>
Date: Thu, 21 Jul 2016 13:12:29 -0700
Subject: [PATCH] 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
---
 .../java/com/android/server/am/ActivityManagerService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1a45e96d7ce96..2233bb8a69a74 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -8574,7 +8574,8 @@ public final class ActivityManagerService extends ActivityManagerNative
             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);
             }
         }
     }