summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2014-12-30 19:51:20 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-30 19:51:20 +0000
commit342e9030002e5a1c654f3f802e0d6cc0498ac32c (patch)
treebdf96f20e7709676cc625c610e6c899d0ca73d89
parent4d72e3e07e23fb13d4ba7f97f4c088948fef3e64 (diff)
parent95700457139803af54a5e731816cedf1c924f3a6 (diff)
am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
* commit '95700457139803af54a5e731816cedf1c924f3a6': Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
-rw-r--r--core/java/android/content/Context.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index e6bb09fcc3a2..26735a6c6a6c 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2142,6 +2142,7 @@ public abstract class Context {
MEDIA_SESSION_SERVICE,
BATTERY_SERVICE,
JOB_SCHEDULER_SERVICE,
+ MEDIA_PROJECTION_SERVICE,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ServiceName {}