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

Commit 41ee2fae authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

Merge "Rename CDM provider config property" into sc-dev am: e9d0a16a 

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

Change-Id: I26c0ccbc4da20790063515c55edfcc87e409eabe
parents db3143e5 e9d0a16a

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ package android { 
    field public static final int config_systemAudioIntelligence;

    field public static final int config_systemAutomotiveCluster;

    field public static final int config_systemAutomotiveProjection;

    field public static final int config_systemCompanionDeviceProvider;

    field public static final int config_systemContacts;

    field public static final int config_systemGallery = 17039399; // 0x1040027

    field public static final int config_systemNotificationIntelligence;

core/res/res/values/config.xml

+2 −7
Original line number Diff line number Diff line
@@ -3721,13 +3721,6 @@ 
     -->

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



    <!-- The package name for the companion provider app.

         This package must be trusted, as it has the permissions to associate apps with devices

         without a UI prompt.

         Example: "com.google.android.gms"

     -->

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



    <!-- The component name for the default system attention service.

         This service must be trusted, as it can be activated without explicit consent of the user.

         See android.attention.AttentionManagerService.
@@ -4861,4 +4854,6 @@ 
    <string name="config_systemTextIntelligence" translatable="false"></string>

    <!-- On-device intelligent processor for visual features. -->

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

    <!-- On-device package for providing companion device associations. -->

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

</resources>

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -3225,6 +3225,8 @@ 
    <public name="config_systemVisualIntelligence" />

    <!-- @hide @SystemApi -->

    <public name="config_systemActivityRecognizer" />

    <!-- @hide @SystemApi -->

    <public name="config_systemCompanionDeviceProvider"/>

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01020055">

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -3537,7 +3537,6 @@ 
  <java-symbol type="string" name="notification_channel_do_not_disturb" />

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

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

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

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

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

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