From d430f1a0be42bbf85fe75578a871d920ff922770 Mon Sep 17 00:00:00 2001
From: Ruben Brunk <rubenbrunk@google.com>
Date: Wed, 15 Jun 2016 17:55:41 -0700
Subject: [PATCH] Remove coarse location pre-grant for preinstalled
 VrListenerServices.

Bug: 28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6
---
 .../android/server/vr/VrManagerService.java   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java
index 2ac7e08f1ca29..5fefd4c8b2ce9 100644
--- a/services/core/java/com/android/server/vr/VrManagerService.java
+++ b/services/core/java/com/android/server/vr/VrManagerService.java
@@ -218,7 +218,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC
                     String packageName = mNotificationAccessPackageToUserId.keyAt(i);
                     revokeNotificationListenerAccess(packageName, grantUserId);
                     revokeNotificationPolicyAccess(packageName);
-                    revokeCoarseLocationPermissionIfNeeded(packageName, grantUserId);
                     mNotificationAccessPackageToUserId.removeAt(i);
                 }
             }
@@ -227,7 +226,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC
                 if (!packageNames.contains(pkg)) {
                     revokeNotificationListenerAccess(pkg, currentUserId);
                     revokeNotificationPolicyAccess(pkg);
-                    revokeCoarseLocationPermissionIfNeeded(pkg, currentUserId);
                     mNotificationAccessPackageToUserId.remove(pkg);
                 }
             }
@@ -235,7 +233,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC
                 if (!allowed.contains(pkg)) {
                     grantNotificationPolicyAccess(pkg);
                     grantNotificationListenerAccess(pkg, currentUserId);
-                    grantCoarseLocationPermissionIfNeeded(pkg, currentUserId);
                     mNotificationAccessPackageToUserId.put(pkg, currentUserId);
                 }
             }
@@ -760,22 +757,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC
                 flatSettings, userId);
     }
 
-    private void grantCoarseLocationPermissionIfNeeded(String pkg, int userId) {
-        // Don't clobber the user if permission set in current state explicitly
-        if (!isPermissionUserUpdated(Manifest.permission.ACCESS_COARSE_LOCATION, pkg, userId)) {
-            mContext.getPackageManager().grantRuntimePermission(pkg,
-                    Manifest.permission.ACCESS_COARSE_LOCATION, new UserHandle(userId));
-        }
-    }
-
-    private void revokeCoarseLocationPermissionIfNeeded(String pkg, int userId) {
-        // Don't clobber the user if permission set in current state explicitly
-        if (!isPermissionUserUpdated(Manifest.permission.ACCESS_COARSE_LOCATION, pkg, userId)) {
-            mContext.getPackageManager().revokeRuntimePermission(pkg,
-                    Manifest.permission.ACCESS_COARSE_LOCATION, new UserHandle(userId));
-        }
-    }
-
     private boolean isPermissionUserUpdated(String permission, String pkg, int userId) {
         final int flags = mContext.getPackageManager().getPermissionFlags(
                 permission, pkg, new UserHandle(userId));