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

Commit 532d5603 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I80022375 into eclair 

* changes:
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast
parents 001e5242 362d5b9b

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -35279,6 +35279,17 @@ 
 visibility="public"

>

</field>

<field name="ACTION_LOCALE_CHANGED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.action.LOCALE_CHANGED&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_MAIN"

 type="java.lang.String"

 transient="false"

core/java/android/content/Intent.java

+14 −0
Original line number Diff line number Diff line
@@ -1344,6 +1344,12 @@ public class Intent implements Parcelable { 
     * can not be restarted will need to watch for this action and handle it

     * appropriately.

     * 

     * <p class="note">

     * You can <em>not</em> receive this through components declared

     * in manifests, only by explicitly registering for it with

     * {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)

     * Context.registerReceiver()}.

     * 

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     *
@@ -1351,6 +1357,14 @@ public class Intent implements Parcelable { 
     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED";

    /**

     * Broadcast Action: The current device's locale has changed.

     * 

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";

    /**

     * Broadcast Action:  This is a <em>sticky broadcast</em> containing the

     * charging state, level, and other information about the battery.

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
    <protected-broadcast android:name="android.intent.action.PACKAGE_DATA_CLEARED" />

    <protected-broadcast android:name="android.intent.action.UID_REMOVED" />

    <protected-broadcast android:name="android.intent.action.CONFIGURATION_CHANGED" />

    <protected-broadcast android:name="android.intent.action.LOCALE_CHANGED" />

    <protected-broadcast android:name="android.intent.action.BATTERY_CHANGED" />

    <protected-broadcast android:name="android.intent.action.BATTERY_LOW" />

    <protected-broadcast android:name="android.intent.action.BATTERY_OKAY" />

services/java/com/android/server/am/ActivityManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -12834,8 +12834,15 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
                    }

                }

                Intent intent = new Intent(Intent.ACTION_CONFIGURATION_CHANGED);

                intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

                broadcastIntentLocked(null, null, intent, null, null, 0, null, null,

                        null, false, false, MY_PID, Process.SYSTEM_UID);

                if ((changes&ActivityInfo.CONFIG_LOCALE) != 0) {

                    broadcastIntentLocked(null, null,

                            new Intent(Intent.ACTION_LOCALE_CHANGED),

                            null, null, 0, null, null,

                            null, false, false, MY_PID, Process.SYSTEM_UID);

                }

                

                AttributeCache ac = AttributeCache.instance();

                if (ac != null) {