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

Commit 57ce3e22 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e am: 4973cc90 

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

Change-Id: I209f5a3899e50a4bf69a1eebe1ac62e00ccb9f02
parents 54018f78 4973cc90

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1995,6 +1995,7 @@ package android.content { 
    field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";

    field public static final String MEDIA_TRANSCODING_SERVICE = "media_transcoding";

    field public static final String MUSIC_RECOGNITION_SERVICE = "music_recognition";

    field public static final String NEARBY_SERVICE = "nearby";

    field public static final String NETD_SERVICE = "netd";

    field public static final String NETWORK_SCORE_SERVICE = "network_score";

    field public static final String OEM_LOCK_SERVICE = "oem_lock";

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -5785,6 +5785,7 @@ public abstract class Context { 
     * @see android.nearby.NearbyManager

     * @hide

     */

    @SystemApi

    public static final String NEARBY_SERVICE = "nearby";



    /**