diff options
| 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 |
| commit | 342e9030002e5a1c654f3f802e0d6cc0498ac32c (patch) | |
| tree | bdf96f20e7709676cc625c610e6c899d0ca73d89 /core | |
| parent | 4d72e3e07e23fb13d4ba7f97f4c088948fef3e64 (diff) | |
| parent | 95700457139803af54a5e731816cedf1c924f3a6 (diff) | |
| download | frameworks_base-342e9030002e5a1c654f3f802e0d6cc0498ac32c.zip frameworks_base-342e9030002e5a1c654f3f802e0d6cc0498ac32c.tar.gz frameworks_base-342e9030002e5a1c654f3f802e0d6cc0498ac32c.tar.bz2 | |
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.
Diffstat (limited to 'core')
| -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 {} |