diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-12-03 17:38:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-03 17:38:41 +0000 |
| commit | 0ab6472237d2c69aaf9d2c87f496444321a1f4df (patch) | |
| tree | 7c889148fb992d24b60e64112a9bc3b5f541d7eb /core/java/android/content | |
| parent | 20f51e0841d3f6d108fe3140a3a186b35f21afec (diff) | |
| parent | ce1c67cdd7a0d0ad64e9a7ef4e9eef7847347ce9 (diff) | |
| download | frameworks_base-0ab6472237d2c69aaf9d2c87f496444321a1f4df.zip frameworks_base-0ab6472237d2c69aaf9d2c87f496444321a1f4df.tar.gz frameworks_base-0ab6472237d2c69aaf9d2c87f496444321a1f4df.tar.bz2 | |
Merge "Add BIND_IMPORTANT to @BindServiceFlags"
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/Context.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index e6bb09f..231dcaf 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -146,12 +146,13 @@ public abstract class Context { @IntDef(flag = true, value = { BIND_AUTO_CREATE, - BIND_AUTO_CREATE, BIND_DEBUG_UNBIND, BIND_NOT_FOREGROUND, BIND_ABOVE_CLIENT, BIND_ALLOW_OOM_MANAGEMENT, - BIND_WAIVE_PRIORITY + BIND_WAIVE_PRIORITY, + BIND_IMPORTANT, + BIND_ADJUST_WITH_ACTIVITY }) @Retention(RetentionPolicy.SOURCE) public @interface BindServiceFlags {} |