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

Commit 841eb0a4 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 4c42d0bd 6bc3304b

api/8.xml

+0 −26
Original line number Diff line number Diff line
@@ -80490,19 +80490,6 @@ 
<parameter name="volume" type="float">

</parameter>

</method>

<method name="registerAudioFocusListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener">

</parameter>

</method>

<method name="registerMediaButtonEventReceiver"

 return="void"

 abstract="false"
@@ -80762,19 +80749,6 @@ 
 visibility="public"

>

</method>

<method name="unregisterAudioFocusListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener">

</parameter>

</method>

<method name="unregisterMediaButtonEventReceiver"

 return="void"

 abstract="false"

api/current.xml

+0 −26
Original line number Diff line number Diff line
@@ -80490,19 +80490,6 @@ 
<parameter name="volume" type="float">

</parameter>

</method>

<method name="registerAudioFocusListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener">

</parameter>

</method>

<method name="registerMediaButtonEventReceiver"

 return="void"

 abstract="false"
@@ -80762,19 +80749,6 @@ 
 visibility="public"

>

</method>

<method name="unregisterAudioFocusListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener">

</parameter>

</method>

<method name="unregisterMediaButtonEventReceiver"

 return="void"

 abstract="false"

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 push_messaging (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)

204005 data_messaging (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.pushmessaging.intent.RECEIVE";

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



    /**

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

core/java/android/net/Uri.java

+3 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,9 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
                break;

            }

            final int equalsIndex = keyIndex + encodedKeyLength;

            if (equalsIndex >= query.length()) {

                break;

            }

            if (query.charAt(equalsIndex) != '=') {

                encodedKeySearchIndex = equalsIndex + 1;

                continue;