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

Commit 7b7a802c authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents f033f79a f817218e

api/current.xml

+17 −17
Original line number Diff line number Diff line
@@ -174063,7 +174063,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.util.Set&gt;">

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.util.Set&lt;java.lang.String&gt;&gt;">

</parameter>

</method>

</class>
@@ -175159,8 +175159,8 @@ 
 visibility="public"

>

</constructor>

<method name="addMessageToConsole"

 return="void"

<method name="getDefaultVideoPoster"

 return="android.graphics.Bitmap"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175169,15 +175169,9 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="message" type="java.lang.String">

</parameter>

<parameter name="lineNumber" type="int">

</parameter>

<parameter name="sourceID" type="java.lang.String">

</parameter>

</method>

<method name="getDefaultVideoPoster"

 return="android.graphics.Bitmap"

<method name="getVideoLoadingProgressView"

 return="android.view.View"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175187,8 +175181,8 @@ 
 visibility="public"

>

</method>

<method name="getVideoLoadingProgressView"

 return="android.view.View"

<method name="getVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175197,8 +175191,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

</parameter>

</method>

<method name="getVisitedHistory"

<method name="onCloseWindow"

 return="void"

 abstract="false"

 native="false"
@@ -175208,10 +175204,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

<parameter name="window" type="android.webkit.WebView">

</parameter>

</method>

<method name="onCloseWindow"

<method name="onConsoleMessage"

 return="void"

 abstract="false"

 native="false"
@@ -175221,7 +175217,11 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="window" type="android.webkit.WebView">

<parameter name="message" type="java.lang.String">

</parameter>

<parameter name="lineNumber" type="int">

</parameter>

<parameter name="sourceID" type="java.lang.String">

</parameter>

</method>

<method name="onCreateWindow"

cmds/dumpstate/dumpstate.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void dumpstate(int full) { 
        PRINT("------ PACKAGE UID ERRORS ------");

        DUMP("/data/system/uiderrors.txt");



        dump_kernel_log("/data/dontpanic/last_kmsg", "LAST KMSG");

        dump_kernel_log("/proc/last_kmsg", "LAST KMSG");



        PRINT("------ LAST RADIO LOG ------");

        EXEC1("parse_radio_log", "/proc/last_radio_log");

core/java/android/content/pm/PackageParser.java

+0 −11
Original line number Diff line number Diff line
@@ -851,10 +851,6 @@ public class PackageParser { 
                        }

                    }

                    

                    int maxVers = sa.getInt(

                            com.android.internal.R.styleable.AndroidManifestUsesSdk_maxSdkVersion,

                            SDK_VERSION);



                    sa.recycle();



                    if (minCode != null) {
@@ -894,13 +890,6 @@ public class PackageParser { 
                    } else {

                        pkg.applicationInfo.targetSdkVersion = targetVers;

                    }

                    

                    if (maxVers < SDK_VERSION) {

                        outError[0] = "Requires older sdk version #" + maxVers

                                + " (current version is #" + SDK_VERSION + ")";

                        mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK;

                        return null;

                    }

                }



                XmlUtils.skipCurrentTag(parser);

core/java/android/view/ViewRoot.java

+2 −2
Original line number Diff line number Diff line
@@ -1407,8 +1407,8 @@ public final class ViewRoot extends Handler implements ViewParent, 


            // When in touch mode, focus points to the previously focused view,

            // which may have been removed from the view hierarchy. The following

            // line checks whether the view is still in the hierarchy

            if (focus == null || focus.getParent() == null) {

            // line checks whether the view is still in our hierarchy.

            if (focus == null || focus.mAttachInfo != mAttachInfo) {

                mRealFocusedView = null;

                return false;

            }

core/java/android/webkit/CacheManager.java

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ public final class CacheManager { 
    // Flag to clear the cache when the CacheManager is initialized

    private static boolean mClearCacheOnInit = false;



    /**

     * This class represents a resource retrieved from the HTTP cache.

     * Instances of this class can be obtained by invoking the

     * CacheManager.getCacheFile() method.

     */

    public static class CacheResult {

        // these fields are saved to the database

        int httpStatusCode;