diff options
| author | 2017-09-22 10:44:03 +0000 | |
|---|---|---|
| committer | 2017-09-22 10:44:03 +0000 | |
| commit | c94d9d6bc450943f97821c65f646e2adef21bf2f (patch) | |
| tree | 8bfe4ee8e53912d7761d0cfacb69907c8bc8a2f5 | |
| parent | 893aa48d93fc55156f4bfd0ab93a916cd68ccbf5 (diff) | |
| parent | ba0f43de1ffae0b4ede485239861211b156476ed (diff) | |
Merge "Move non-public intent out of the public namespace" into oc-mr1-dev am: 3f1ba67f1e
am: ba0f43de1f
Change-Id: I77143a608c7823dddd33a06d77936f7404a46f3d
| -rw-r--r-- | core/java/android/app/timezone/RulesUpdaterContract.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/timezone/RulesUpdaterContract.java b/core/java/android/app/timezone/RulesUpdaterContract.java index 9c62f46b6e36..2a22eadd28f2 100644 --- a/core/java/android/app/timezone/RulesUpdaterContract.java +++ b/core/java/android/app/timezone/RulesUpdaterContract.java @@ -51,7 +51,7 @@ public final class RulesUpdaterContract { * applies. */ public static final String ACTION_TRIGGER_RULES_UPDATE_CHECK = - "android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK"; + "com.android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK"; /** * The extra containing the {@code byte[]} that should be passed to @@ -61,7 +61,7 @@ public final class RulesUpdaterContract { * {@link #ACTION_TRIGGER_RULES_UPDATE_CHECK} intent has been processed. */ public static final String EXTRA_CHECK_TOKEN = - "android.intent.extra.timezone.CHECK_TOKEN"; + "com.android.intent.extra.timezone.CHECK_TOKEN"; /** * Creates an intent that would trigger a time zone rules update check. diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 83bb443e1b72..07a11098999d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1363,7 +1363,7 @@ <!-- The package of the time zone rules updater application. Expected to be the same for all Android devices that support APK-based time zone rule updates. - A package-targeted android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK intent + A package-targeted com.android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK intent will be sent to the updater app if the system server detects an update to the updater or data app packages. The package referenced here must have the android.permission.UPDATE_TIME_ZONE_RULES @@ -1374,7 +1374,7 @@ <!-- The package of the time zone rules data application. Expected to be configured by OEMs to reference their own priv-app APK package. - A package-targeted android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK intent + A package-targeted com.android.intent.action.timezone.TRIGGER_RULES_UPDATE_CHECK intent will be sent to the updater app if the system server detects an update to the updater or data app packages. [This is only used if config_enableUpdateableTimeZoneRules and |