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

Commit 4f42663f authored by Jorge De la Torre's avatar Jorge De la Torre Committed by Automerger Merge Worker
Browse files

Merge "Add default pregrant permission for Dock Manager." into tm-qpr-dev am:... 

Merge "Add default pregrant permission for Dock Manager." into tm-qpr-dev am: 23cb3a7f am: 78bfafa9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20355062



Change-Id: I5a6a08049f2d86ff6540781447a7e4248985a4eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 270b411e 78bfafa9

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1855,6 +1855,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
@@ -3480,6 +3480,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),
@@ -933,6 +937,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) {