Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba0f43de authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Move non-public intent out of the public namespace" into oc-mr1-dev 

am: 3f1ba67f

Change-Id: Ie93db5b1770cc05ba476b97b829a8f8e1925f673
parents dae28d59 3f1ba67f

core/java/android/app/timezone/RulesUpdaterContract.java

+2 −2
Original line number Diff line number Diff line
@@ -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.

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -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