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

Commit 40c4020f authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 841eb0a4 8ea9f130

Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ web_docs_sample_code_flags := \ 


## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

framework_docs_SDK_VERSION:=2.1

framework_docs_SDK_VERSION:=2.2

  # release version (ie "Release x")  (full releases only)

framework_docs_SDK_REL_ID:=1

  # name of current SDK directory (full releases only)
@@ -437,10 +437,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_ 
framework_docs_SDK_PREVIEW:=0



## Latest ADT version identifiers, for reference from published docs

framework_docs_ADT_VERSION:=0.9.6

framework_docs_ADT_DOWNLOAD:=ADT-0.9.6.zip

framework_docs_ADT_BYTES:=7456339

framework_docs_ADT_CHECKSUM:=ea45d271be52b87b5dd1c9fb17536223

framework_docs_ADT_VERSION:=0.9.7

framework_docs_ADT_DOWNLOAD:=ADT-0.9.7.zip

framework_docs_ADT_BYTES:=na

framework_docs_ADT_CHECKSUM:=na



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \

common/java/com/android/common/GoogleLogTags.logtags

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ option java_package com.android.common 
204004 gtalk_heartbeat_reset (interval_and_nt|1),(ip|3)



# This event is logged when an Rmq v2 packet is sent or received.

204005 data_messaging (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)

204005 c2dm (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)



#####

# Google Login Service and Setup Wizard

core/java/android/content/Intent.java

+1 −1
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     */

    public static final String ACTION_REMOTE_INTENT =

            "com.google.android.datamessaging.intent.RECEIVE";

            "com.google.android.c2dm.intent.RECEIVE";



    /**

     * Broadcast Action: hook for permforming cleanup after a system update.

core/java/android/webkit/CallbackProxy.java

+7 −0
Original line number Diff line number Diff line
@@ -542,6 +542,13 @@ class CallbackProxy extends Handler { 
                                                    int which) {

                                                res.cancel();

                                            }})

                                .setOnCancelListener(

                                        new DialogInterface.OnCancelListener() {

                                            public void onCancel(

                                                    DialogInterface dialog) {

                                                res.cancel();

                                            }

                                        })

                                .show();

                    }

                    // Tell the JsResult that it is ready for client

core/res/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -1225,12 +1225,12 @@ 
        android:description="@string/permlab_copyProtectedData"

        android:protectionLevel="signature" />



    <!-- Data messaging permission. 

    <!-- C2DM permission. 

         @hide Used internally.

     -->

    <permission android:name="android.intent.category.MASTER_CLEAR.permission.DATA_MESSAGE"

    <permission android:name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"

          android:protectionLevel="signature" />

    <uses-permission android:name="android.intent.category.MASTER_CLEAR.permission.DATA_MESSAGE"/>

    <uses-permission android:name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"/>



    <application android:process="system"

                 android:persistent="true"
@@ -1314,7 +1314,7 @@ 
                <action android:name="android.intent.action.MASTER_CLEAR" />



                <!-- MCS always uses REMOTE_INTENT: category=MASTER_CLEAR -->

                <action android:name="com.google.android.datamessaging.intent.RECEIVE" />

                <action android:name="com.google.android.c2dm.intent.RECEIVE" />

                <category android:name="android.intent.category.MASTER_CLEAR" />

            </intent-filter>

        </receiver>