From 8153df7fff901dad928174821f62ef2b7b6e2f26 Mon Sep 17 00:00:00 2001
From: Tajinder Gadh <tgadh@google.com>
Date: Thu, 11 Mar 2021 12:28:15 -0800
Subject: [PATCH] DO NOT MERGE: AR Attributions for Location history. Parent cl
 (ag/13779796) It grants the AR permission to the extra location provider
 package. They follow the same model as location attribution to the headless
 apk. More details about design here: go/bluedoc-headless-lh

Bug: 181900091
Test: manual
Change-Id: Id8ff881ac344967f8aba9fb30609b2b422b16f01
(cherry picked from commit 151a571c1ffe0e56372547163355086403c16c03)
---
 .../server/pm/permission/DefaultPermissionGrantPolicy.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index e3ccb7521b588..27bf8a13766a3 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -737,10 +737,12 @@ final class DefaultPermissionGrantPolicy {
             }
         }
         if (locationExtraPackageNames != null) {
-            // Also grant location permission to location extra packages.
+            // Also grant location and activity recognition permission to location extra packages.
             for (String packageName : locationExtraPackageNames) {
                 grantPermissionsToSystemPackage(pm, packageName, userId,
                         ALWAYS_LOCATION_PERMISSIONS);
+                grantSystemFixedPermissionsToSystemPackage(pm, packageName, userId,
+                        ACTIVITY_RECOGNITION_PERMISSIONS);
             }
         }