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

Commit e0ee514e authored by Jin Seok Park's avatar Jin Seok Park Committed by Automerger Merge Worker
Browse files

Merge "[Media ML] Expose config values for OEMs to set custom classes" into sc-dev am: ee9b56d9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d291af1e44bff31b62f3a03db0344f072a3968
parents b4f1411c ee9b56d9

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ package android { 
  }















  public static final class R.string {













    field public static final int config_customMediaKeyDispatcher = 17039404; // 0x104002c













    field public static final int config_customMediaSessionPolicyProvider = 17039405; // 0x104002d















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultBrowser = 17039394; // 0x1040022















    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025

































core/res/res/values/config.xml



+4
−3




























Original line number
Diff line number
Diff line








@@ -4592,11 +4592,12 @@













        <item>com.android.systemui</item>















    </string-array>





























    <!-- Package name of custom media key dispatcher class used by MediaSessionService. -->













    <!-- Component name of custom media key dispatcher class used by MediaSessionService. -->















    <string name="config_customMediaKeyDispatcher"></string>





























    <!-- Package name of custom session policy provider class used by MediaSessionService. -->













    <string name="config_customSessionPolicyProvider"></string>













    <!-- Component name of custom media session policy provider class used by













         MediaSessionService. -->













    <string name="config_customMediaSessionPolicyProvider"></string>































    <!-- The max scale for the wallpaper when it's zoomed in -->















    <item name="config_wallpaperMaxScale" format="float" type="dimen">1.10</item>

































core/res/res/values/public.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -3153,6 +3153,10 @@













    <public name="config_systemShell" />















    <!-- @hide @SystemApi -->















    <public name="config_systemContacts" />













    <!-- @hide @SystemApi -->













    <public name="config_customMediaKeyDispatcher" />













    <!-- @hide @SystemApi -->













    <public name="config_customMediaSessionPolicyProvider" />















  </public-group>































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

































core/res/res/values/symbols.xml



+0
−2




























Original line number
Diff line number
Diff line








@@ -4115,8 +4115,6 @@





























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





























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













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















  <!-- The max scale for the wallpaper when it's zoomed in -->















  <java-symbol type="dimen" name="config_wallpaperMaxScale"/>

















































media/java/android/media/session/ISessionManager.aidl



+4
−2




























Original line number
Diff line number
Diff line








@@ -73,8 +73,10 @@ interface ISessionManager {













    void setOnMediaKeyListener(in IOnMediaKeyListener listener);































    boolean isTrusted(String controllerPackageName, int controllerPid, int controllerUid);













    void setCustomMediaKeyDispatcherForTesting(String name);













    void setCustomSessionPolicyProviderForTesting(String name);













    void setCustomMediaKeyDispatcher(String name);













    void setCustomMediaSessionPolicyProvider(String name);













    boolean hasCustomMediaKeyDispatcher(String componentName);













    boolean hasCustomMediaSessionPolicyProvider(String componentName);















    int getSessionPolicies(in MediaSession.Token token);















    void setSessionPolicies(in MediaSession.Token token, int policies);















}