Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0998c789 authored by Abhijit Adsule's avatar Abhijit Adsule Committed by Shreerag Jayakrishnan
Browse files

Allow Wear Fitness tracker app to request for permissions. 

Bug: 145529699
Test: build passes
Change-Id: I4d251997394cf122c2e09586c9685d2480077e49
(cherry picked from commit 7cd2670397049a8d70f79c921aa80d64ba6c4f5a)
parent 28b33b31

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+7 −1
Original line number Diff line number Diff line
@@ -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,10 +767,15 @@ public final class DefaultPermissionGrantPolicy { 
            grantSystemFixedPermissionsToSystemPackage(pm, wearPackage, userId, PHONE_PERMISSIONS);



            // Fitness tracking on watches

            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

        grantSystemFixedPermissionsToSystemPackage(pm, PrintManager.PRINT_SPOOLER_PACKAGE_NAME,