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

Commit 885b5f44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove underscore from Companion service name" into oc-dev

parents 105f55ee d7355cce

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8937,7 +8937,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
@@ -9442,7 +9442,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
@@ -8970,7 +8970,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
@@ -3769,7 +3769,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