Merge "Add COMPANION_DEVICE_SERVICE to @ServiceName"

2017-07-10 19:43:12 +00:00
parent e9b6896607 8246c07fa2
commit 2b8286d218
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2955,7 +2955,8 @@ public abstract class Context {
            SHORTCUT_SERVICE,
            //@hide: CONTEXTHUB_SERVICE,
            SYSTEM_HEALTH_SERVICE,
-            //@hide: INCIDENT_SERVICE
+            //@hide: INCIDENT_SERVICE,
+            COMPANION_DEVICE_SERVICE
    })
    @Retention(RetentionPolicy.SOURCE)
    public @interface ServiceName {}