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

Commit 633b273a authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 6634323b 5923c971

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/app)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/FrameworkTest_intermediates/)





# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

api/current.xml

+160 −58
Original line number Diff line number Diff line
@@ -38684,6 +38684,17 @@ 
 visibility="public"

>

</field>

<field name="CATEGORY_CAR_MODE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.category.CAR_MODE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="CATEGORY_DEFAULT"

 type="java.lang.String"

 transient="false"
@@ -82509,163 +82520,151 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="quality" type="android.media.CamcorderProfile.Quality">

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

</parameter>

</method>

<method name="getMmsRecordingDurationInSeconds"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

<field name="QUALITY_HIGH"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<field name="mAudioBitRate"

</field>

<field name="QUALITY_LOW"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mAudioChannels"

<field name="audioBitRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mAudioCodec"

<field name="audioChannels"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mAudioSampleRate"

<field name="audioCodec"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mFileFormat"

<field name="audioSampleRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mQuality"

 type="android.media.CamcorderProfile.Quality"

<field name="duration"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mVideoBitRate"

<field name="fileFormat"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mVideoCodec"

<field name="quality"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mVideoFrameHeight"

<field name="videoBitRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mVideoFrameRate"

<field name="videoCodec"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mVideoFrameWidth"

<field name="videoFrameHeight"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="CamcorderProfile.Quality"

 extends="java.lang.Enum"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="valueOf"

 return="android.media.CamcorderProfile.Quality"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

<field name="videoFrameRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="values"

 return="android.media.CamcorderProfile.Quality[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="true"

</field>

<field name="videoFrameWidth"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</field>

</class>

<class name="CameraProfile"

 extends="java.lang.Object"
@@ -82683,8 +82682,8 @@ 
 visibility="public"

>

</constructor>

<method name="getImageEncodingQualityLevels"

 return="int[]"

<method name="getJpegEncodingQualityParameter"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"
@@ -82693,7 +82692,42 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<field name="QUALITY_HIGH"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="QUALITY_LOW"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="QUALITY_MEDIUM"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ExifInterface"

 extends="java.lang.Object"
@@ -84608,6 +84642,19 @@ 
<parameter name="sv" type="android.view.Surface">

</parameter>

</method>

<method name="setProfile"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="profile" type="android.media.CamcorderProfile">

</parameter>

</method>

<method name="setVideoEncoder"

 return="void"

 abstract="false"
@@ -138885,6 +138932,28 @@ 
<parameter name="filename" type="java.lang.String">

</parameter>

</method>

<method name="areDefaultsEnforced"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDefaultEngine"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getLanguage"

 return="java.util.Locale"

 abstract="false"
@@ -139301,6 +139370,28 @@ 
 visibility="public"

>

</field>

<field name="EXTRA_AVAILABLE_VOICES"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;availableVoices&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_CHECK_VOICE_DATA_FOR"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;checkVoiceDataFor&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_TTS_DATA_INSTALLED"

 type="java.lang.String"

 transient="false"
@@ -139312,6 +139403,17 @@ 
 visibility="public"

>

</field>

<field name="EXTRA_UNAVAILABLE_VOICES"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;unavailableVoices&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_VOICE_DATA_FILES"

 type="java.lang.String"

 transient="false"

cmds/stagefright/stagefright.cpp

+15 −4
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) { 
    MediaSource::ReadOptions options;



    int64_t sumDecodeUs = 0;

    int64_t totalBytes = 0;



    while (numIterationsLeft-- > 0) {

        long numFrames = 0;
@@ -188,6 +189,7 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) { 
            }



            sumDecodeUs += delayDecodeUs;

            totalBytes += buffer->range_length();



            buffer->release();

            buffer = NULL;
@@ -216,11 +218,20 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) { 
    printf("\n");



    int64_t delay = getNowUs() - startTime;

    if (!strncasecmp("video/", mime, 6)) {

        printf("avg. %.2f fps\n", n * 1E6 / delay);



        printf("avg. time to decode one buffer %.2f usecs\n",

               (double)sumDecodeUs / n);



        printf("decoded a total of %d frame(s).\n", n);

    } else if (!strncasecmp("audio/", mime, 6)) {

        // Frame count makes less sense for audio, as the output buffer

        // sizes may be different across decoders.

        printf("avg. %.2f KB/sec\n", totalBytes / 1024 * 1E6 / delay);



        printf("decoded a total of %lld bytes\n", totalBytes);

    }

}



static void usage(const char *me) {

common/tests/src/com/android/common/OperationSchedulerTest.java

+5 −0
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ package com.android.common; 


import android.content.SharedPreferences;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.SmallTest;



public class OperationSchedulerTest extends AndroidTestCase {

    @MediumTest

    public void testScheduler() throws Exception {

        String name = "OperationSchedulerTest.testScheduler";

        SharedPreferences storage = getContext().getSharedPreferences(name, 0);
@@ -112,6 +115,7 @@ public class OperationSchedulerTest extends AndroidTestCase { 
        assertTrue(afterSuccess + 1000000 >= scheduler.getNextTimeMillis(options));

    }



    @SmallTest

    public void testParseOptions() throws Exception {

         OperationScheduler.Options options = new OperationScheduler.Options();

         assertEquals(
@@ -132,6 +136,7 @@ public class OperationSchedulerTest extends AndroidTestCase { 
                 OperationScheduler.parseOptions("", options).toString());

    }



    @SmallTest

    public void testMoratoriumWithHttpDate() throws Exception {

        String name = "OperationSchedulerTest.testMoratoriumWithHttpDate";

        SharedPreferences storage = getContext().getSharedPreferences(name, 0);

core/java/android/accounts/AccountManager.java

+5 −4
Original line number Diff line number Diff line
@@ -539,14 +539,15 @@ public class AccountManager { 
     * {@link android.Manifest.permission#MANAGE_ACCOUNTS} or

     * {@link android.Manifest.permission#USE_CREDENTIALS}

     *

     * @param accountType The account type of the auth token to invalidate

     * @param authToken The auth token to invalidate

     * @param accountType The account type of the auth token to invalidate, must not be null

     * @param authToken The auth token to invalidate, may be null

     */

    public void invalidateAuthToken(final String accountType, final String authToken) {

        if (accountType == null) throw new IllegalArgumentException("accountType is null");

        if (authToken == null) throw new IllegalArgumentException("authToken is null");

        try {

            if (authToken != null) {

                mService.invalidateAuthToken(accountType, authToken);

            }

        } catch (RemoteException e) {

            // won't ever happen

            throw new RuntimeException(e);