From 0998c7892060d35d7b4a2d3757850d25191b5123 Mon Sep 17 00:00:00 2001
From: Abhijit Adsule <adsule@google.com>
Date: Mon, 2 Dec 2019 10:33:34 -0800
Subject: [PATCH] Allow Wear Fitness tracker app to request for permissions.

Bug: 145529699
Test: build passes
Change-Id: I4d251997394cf122c2e09586c9685d2480077e49
(cherry picked from commit 7cd2670397049a8d70f79c921aa80d64ba6c4f5a)
---
 core/res/res/values/config.xml                            | 3 +++
 core/res/res/values/symbols.xml                           | 3 +++
 .../pm/permission/DefaultPermissionGrantPolicy.java       | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index daf884a58ed1b..705c0ca906124 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4522,4 +4522,7 @@
 
     <!-- If true, hide the display cutout with display area -->
     <bool name="config_hideDisplayCutoutWithDisplayArea">false</bool>
+
+    <!-- Indicates that default fitness tracker app needs to request sensor and location permissions. -->
+    <bool name="config_trackerAppNeedsPermissions">false</bool>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 40aae9e4e0857..e3986fa96fb5f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4103,4 +4103,7 @@
   <java-symbol type="string" name="window_magnification_prompt_content" />
   <java-symbol type="string" name="turn_on_magnification_settings_action" />
   <java-symbol type="string" name="dismiss_action" />
+
+  <java-symbol type="bool" name="config_trackerAppNeedsPermissions"/>
+
 </resources>
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 e5c93a32ae901..b3c786ea8b02f 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -63,6 +63,7 @@ import android.util.SparseArray;
 import android.util.TypedXmlPullParser;
 import android.util.Xml;
 
+import com.android.internal.R;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.XmlUtils;
 import com.android.server.LocalServices;
@@ -766,9 +767,14 @@ public final class DefaultPermissionGrantPolicy {
             grantSystemFixedPermissionsToSystemPackage(pm, wearPackage, userId, PHONE_PERMISSIONS);
 
             // Fitness tracking on watches
-            grantPermissionsToSystemPackage(pm,
+            if (mContext.getResources().getBoolean(R.bool.config_trackerAppNeedsPermissions)) {
+                Log.d(TAG, "Wear: Skipping permission grant for Default fitness tracker app : "
+                        + wearPackage);
+            } else {
+                grantPermissionsToSystemPackage(pm,
                     getDefaultSystemHandlerActivityPackage(pm, ACTION_TRACK, userId), userId,
                     SENSORS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
+            }
         }
 
         // Print Spooler