Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-25 21:26:09 +00:00
committed by Android (Google) Code Review
parent 105f55ee8f d7355ccee6
commit 885b5f4466
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -8937,7 +8937,7 @@ package android.content {
field public static final java.lang.String CAPTIONING_SERVICE = "captioning"; 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 CARRIER_CONFIG_SERVICE = "carrier_config";
field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard"; 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 CONNECTIVITY_SERVICE = "connectivity";
field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir"; field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";
field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2 field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2

2
api/system-current.txt
View File

@@ -9442,7 +9442,7 @@ package android.content {
field public static final java.lang.String CAPTIONING_SERVICE = "captioning"; 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 CARRIER_CONFIG_SERVICE = "carrier_config";
field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard"; 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 CONNECTIVITY_SERVICE = "connectivity";
field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir"; field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";
field public static final java.lang.String CONTEXTHUB_SERVICE = "contexthub"; field public static final java.lang.String CONTEXTHUB_SERVICE = "contexthub";

2
api/test-current.txt
View File

@@ -8970,7 +8970,7 @@ package android.content {
field public static final java.lang.String CAPTIONING_SERVICE = "captioning"; 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 CARRIER_CONFIG_SERVICE = "carrier_config";
field public static final java.lang.String CLIPBOARD_SERVICE = "clipboard"; 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 CONNECTIVITY_SERVICE = "connectivity";
field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir"; field public static final java.lang.String CONSUMER_IR_SERVICE = "consumer_ir";
field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2 field public static final int CONTEXT_IGNORE_SECURITY = 2; // 0x2

2
core/java/android/content/Context.java
View File

@@ -3769,7 +3769,7 @@ public abstract class Context {
* @see #getSystemService * @see #getSystemService
* @see android.companion.CompanionDeviceManager * @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 * Use with {@link #getSystemService} to retrieve a