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

Commit 7a23442b authored by MingWei Liao's avatar MingWei Liao Committed by Android (Google) Code Review
Browse files

Merge "Map device setting apps to android package" into main

parents 736de6dc d4d97c54

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ package android.app.admin { 
package android.app.appfunctions {



  @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {

    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull public java.util.Set<java.lang.String> getDeviceSettingPackages();

    field public static final int ACCESS_FLAG_MASK_ALL = 31; // 0x1f

    field public static final int ACCESS_FLAG_MASK_OTHER = 6; // 0x6

    field public static final int ACCESS_FLAG_MASK_USER = 24; // 0x18

core/java/android/app/appfunctions/AppFunctionManager.java

+151 −109

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -7625,10 +7625,10 @@ 
    <!-- Maximum number of devices that allows for audio sharing. -->

    <integer name="config_audio_sharing_maximum_sinks">2</integer>



    <!--For App Functions, this configuration lists package names grouped as "Device Settings".

    <!--For App Function, this configuration lists package names grouped as "Device Settings".

        Packages in this list share the same App Function access settings. In the UI, they are

        presented as a single "Device Settings" item rather than individually. -->

    <string-array name="config_appFunctionsDeviceSettingsPackages" translatable="false">

    <string-array name="config_appFunctionDeviceSettingsPackages" translatable="false">

    </string-array>



    <!-- Package name for developer verification service provider app [DO NOT TRANSLATE] -->

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -6267,4 +6267,7 @@ 
  <!-- Package and class info to bind to ProximityProviderService -->

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

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



  <!-- For App Functions -->

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

</resources>

services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java

+95 −36

File changed.

Preview size limit exceeded, changes collapsed.