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

Commit 43371da3 authored by Eugene Susla's avatar Eugene Susla Committed by android-build-merger
Browse files

Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f44 

am: 56620fee

Change-Id: I3a35f668dde82a8ccb1094988943039b4c93e4fa
parents 6c48dfc1 56620fee

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8940,7 +8940,7 @@ package android.content { 
    field public static final java.lang.String CAPTIONING_SERVICE = "captioning";

    field public static final java.lang.String CARRIER_CONFIG_SERVICE = "carrier_config";

    field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";

    field public static final java.lang.String COMPANION_DEVICE_SERVICE = "companion_device";

    field public static final java.lang.String COMPANION_DEVICE_SERVICE = "companiondevice";

    field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";

    field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";

    field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9445,7 +9445,7 @@ package android.content { 
    field public static final java.lang.String CAPTIONING_SERVICE = "captioning";

    field public static final java.lang.String CARRIER_CONFIG_SERVICE = "carrier_config";

    field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";

    field public static final java.lang.String COMPANION_DEVICE_SERVICE = "companion_device";

    field public static final java.lang.String COMPANION_DEVICE_SERVICE = "companiondevice";

    field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";

    field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";

    field public static final java.lang.String CONTEXTHUB_SERVICE = "contexthub";

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8973,7 +8973,7 @@ package android.content { 
    field public static final java.lang.String CAPTIONING_SERVICE = "captioning";

    field public static final java.lang.String CARRIER_CONFIG_SERVICE = "carrier_config";

    field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard";

    field public static final java.lang.String COMPANION_DEVICE_SERVICE = "companion_device";

    field public static final java.lang.String COMPANION_DEVICE_SERVICE = "companiondevice";

    field public static final java.lang.String CONNECTIVITY_SERVICE = "connectivity";

    field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";

    field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -3780,7 +3780,7 @@ public abstract class Context { 
     * @see #getSystemService

     * @see android.companion.CompanionDeviceManager

     */

    public static final String COMPANION_DEVICE_SERVICE = "companion_device";

    public static final String COMPANION_DEVICE_SERVICE = "companiondevice";



    /**

     * Use with {@link #getSystemService} to retrieve a