diff options
| author | 2017-04-20 11:14:45 -0700 | |
|---|---|---|
| committer | 2017-04-20 12:21:17 -0700 | |
| commit | d7355ccee6d42ba3bb1227f5af4ce4e535da355b (patch) | |
| tree | 8c4bd1dc7e353893f01420c16cbbc1ae3876c983 | |
| parent | f3157e1692349d85ed6e7a3908b350fbcaeb176c (diff) | |
Remove underscore from Companion service name
Fixes: 37536706
Test: Ensure no boot-time error and companion functionality works
Change-Id: I80ced92cb62aa10e1847980eb9a169af3bcd21f0
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index e4169b2b7899..ee81ee1049b5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8933,7 +8933,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 diff --git a/api/system-current.txt b/api/system-current.txt index 5dd3b88f4ab7..48efe21826d7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9437,7 +9437,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 47a0fd8f8499..08d6981a6ea5 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -8966,7 +8966,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 diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 0adab1ad1752..1e28dd43878c 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3727,7 +3727,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 |