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

Commit 100d13aa authored by Jorge De la Torre's avatar Jorge De la Torre
Browse files

Add default pregrant permission for Dock Manager. 

Bug: 243412479
Test: DefaultPermissionGrantPolicyTest
Change-Id: Ie18a6bf051f0149d486412af870ae0d1bcb84531
parent b0b34d3e

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1914,6 +1914,10 @@ 
    -->

    <string name="config_defaultCaptivePortalLoginPackageName" translatable="false">com.android.captiveportallogin</string>



    <!-- The package name of the dock manager app. Must be granted the

         POST_NOTIFICATIONS permission. -->

    <string name="config_defaultDockManagerPackageName" translatable="false"></string>



    <!-- Whether to enable geocoder overlay which allows geocoder to be replaced

         by an app at run-time. When disabled, only the

         config_geocoderProviderPackageName package will be searched for

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -3466,6 +3466,9 @@ 
  <!-- Captive Portal Login -->

  <java-symbol type="string" name="config_defaultCaptivePortalLoginPackageName" />



  <!-- Dock Manager -->

  <java-symbol type="string" name="config_defaultDockManagerPackageName" />



  <!-- Optional IPsec algorithms -->

  <java-symbol type="array" name="config_optionalIpSecAlgorithms" />

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

+8 −0
Original line number Diff line number Diff line
@@ -616,6 +616,10 @@ final class DefaultPermissionGrantPolicy { 
        grantPermissionsToSystemPackage(pm, getDefaultCaptivePortalLoginPackage(), userId,

                NOTIFICATION_PERMISSIONS);



        // Dock Manager

        grantPermissionsToSystemPackage(pm, getDefaultDockManagerPackage(), userId,

                NOTIFICATION_PERMISSIONS);



        // Camera

        grantPermissionsToSystemPackage(pm,

                getDefaultSystemHandlerActivityPackage(pm, MediaStore.ACTION_IMAGE_CAPTURE, userId),
@@ -932,6 +936,10 @@ final class DefaultPermissionGrantPolicy { 
        return mContext.getString(R.string.config_defaultCaptivePortalLoginPackageName);

    }



    private String getDefaultDockManagerPackage() {

        return mContext.getString(R.string.config_defaultDockManagerPackageName);

    }



    @SafeVarargs

    private final void grantPermissionToEachSystemPackage(PackageManagerWrapper pm,

            ArrayList<String> packages, int userId, Set<String>... permissions) {