diff options
| author | Michael Wright <michaelwr@google.com> | 2014-12-30 19:40:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-30 19:40:52 +0000 |
| commit | a33424a540ea725d4b513ee713931c66e62721a2 (patch) | |
| tree | eeffeadfc7d21d85c60051858cc80c22108c7fe2 /core/java/android/content | |
| parent | a30fdf790d66e241252c51d7dbdc401e021e51ad (diff) | |
| parent | 446e019a06d632d9d65679e27c7e963b2c5179d2 (diff) | |
| download | frameworks_base-a33424a540ea725d4b513ee713931c66e62721a2.zip frameworks_base-a33424a540ea725d4b513ee713931c66e62721a2.tar.gz frameworks_base-a33424a540ea725d4b513ee713931c66e62721a2.tar.bz2 | |
Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Context.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index e6bb09f..26735a6 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 {} |