diff options
| author | Julia Reynolds <juliacr@google.com> | 2016-05-25 17:15:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 17:15:07 +0000 |
| commit | 5bf51f026cddca00b156f93089cb803e4c612d96 (patch) | |
| tree | 37a2a2fec39e029b99d13b9732892920540fa658 /core/java/android | |
| parent | e5a3df612adb24dbf89ddde96a75f75ff5ffd380 (diff) | |
| parent | d3827be1620a8cb3bb1dfa42d07334f3be4382ef (diff) | |
Merge changes from topic \'cps\' into nyc-dev
am: d3827be162
* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
Api updates.
Note timezone changes.
Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/service/notification/Condition.java | 2 | ||||
| -rw-r--r-- | core/java/android/service/notification/ConditionProviderService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/service/notification/Condition.java b/core/java/android/service/notification/Condition.java index 0163b47f2ba7..447afe62fd1a 100644 --- a/core/java/android/service/notification/Condition.java +++ b/core/java/android/service/notification/Condition.java @@ -33,7 +33,7 @@ import java.util.Objects; * {@link ConditionProviderService} that owns the rule. Used to tell the system to enter Do Not * Disturb mode and request that the system exit Do Not Disturb mode. */ -public class Condition implements Parcelable { +public final class Condition implements Parcelable { @SystemApi public static final String SCHEME = "condition"; diff --git a/core/java/android/service/notification/ConditionProviderService.java b/core/java/android/service/notification/ConditionProviderService.java index 44c3887ec35d..9d4b0a4057b3 100644 --- a/core/java/android/service/notification/ConditionProviderService.java +++ b/core/java/android/service/notification/ConditionProviderService.java @@ -95,7 +95,7 @@ public abstract class ConditionProviderService extends Service { /** * A String rule id extra passed to {@link #META_DATA_CONFIGURATION_ACTIVITY}. */ - public static final String EXTRA_RULE_ID = "android.content.automatic.ruleId"; + public static final String EXTRA_RULE_ID = "android.service.notification.extra.RULE_ID"; /** * Called when this service is connected. |