diff options
| author | John Spurlock <jspurlock@google.com> | 2014-09-10 14:46:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 14:46:20 +0000 |
| commit | 3e5d59c3653700e4dfe77b665eba0bbc88e470de (patch) | |
| tree | 1ab30d74fa16626f8be49c135210e5a0d7c2c4a4 /core/java/android/service | |
| parent | b7d63aedf57e946c1a555e773d1e3591122544a7 (diff) | |
| parent | 9034f2452b94363bf4c868a32c4f7fed4ad6dc6a (diff) | |
| download | frameworks_base-3e5d59c3653700e4dfe77b665eba0bbc88e470de.zip frameworks_base-3e5d59c3653700e4dfe77b665eba0bbc88e470de.tar.gz frameworks_base-3e5d59c3653700e4dfe77b665eba0bbc88e470de.tar.bz2 | |
Merge "Zen: make Condition available over @SystemApi" into lmp-dev
Diffstat (limited to 'core/java/android/service')
| -rw-r--r-- | core/java/android/service/notification/Condition.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/service/notification/Condition.java b/core/java/android/service/notification/Condition.java index aa724f0..3a91d1a 100644 --- a/core/java/android/service/notification/Condition.java +++ b/core/java/android/service/notification/Condition.java @@ -16,6 +16,7 @@ package android.service.notification; +import android.annotation.SystemApi; import android.content.Context; import android.net.Uri; import android.os.Parcel; @@ -28,6 +29,7 @@ import java.util.Objects; * * @hide */ +@SystemApi public class Condition implements Parcelable { public static final String SCHEME = "condition"; |