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

Commit 2e14ef04 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

android-2.1_r1 snapshot

parent 9db3d07b

Android.mk

+28 −13
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
framework_docs_LOCAL_JAVA_LIBRARIES := \

			core \

			ext \

			framework \



framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES

framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
@@ -345,6 +346,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/3.xml 3 \

    -since ./frameworks/base/api/4.xml 4 \

    -since ./frameworks/base/api/5.xml 5 \

    -since ./frameworks/base/api/6.xml 6 \

    -since ./frameworks/base/api/7.xml 7 \

		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -355,25 +358,35 @@ sample_dir := development/samples 
web_docs_sample_code_flags := \

		-hdf android.hasSamples 1 \

		-samplecode $(sample_dir)/ApiDemos \

		            guide/samples/ApiDemos "API Demos" \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/BluetoothChat \

		            resources/samples/BluetoothChat "Bluetooth Chat" \

		-samplecode $(sample_dir)/ContactManager \

		            resources/samples/ContactManager "Contact Manager" \

		-samplecode $(sample_dir)/Home \

		            guide/samples/Home "Home" \

		            resources/samples/Home "Home" \

		-samplecode $(sample_dir)/JetBoy \

		            guide/samples/JetBoy "JetBoy" \

		            resources/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/LunarLander \

		            guide/samples/LunarLander "Lunar Lander" \

		            resources/samples/LunarLander "Lunar Lander" \

		-samplecode $(sample_dir)/MultiResolution \

		            resources/samples/MultiResolution "Multiple Resolutions" \

		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad" \

		            resources/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/SearchableDictionary \

		            guide/samples/SearchableDictionary "Searchable Dictionary" \

		            resources/samples/SearchableDictionary "Searchable Dictionary" \

		-samplecode $(sample_dir)/Snake \

		            guide/samples/Snake "Snake" \

		            resources/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            guide/samples/SoftKeyboard "Soft Keyboard"

		            resources/samples/SoftKeyboard "Soft Keyboard" \

		-samplecode $(sample_dir)/Wiktionary \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

		            resources/samples/WiktionarySimple "Wiktionary (Simplified)"



## SDK version identifiers used in the published docs

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

framework_docs_SDK_VERSION:=2.0

framework_docs_SDK_VERSION:=2.0.1

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

framework_docs_SDK_REL_ID:=1

  # name of current SDK directory (full releases only)
@@ -382,10 +395,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.4

framework_docs_ADT_DOWNLOAD:=ADT-0.9.4.zip

framework_docs_ADT_BYTES:=3367536

framework_docs_ADT_CHECKSUM:=4cdecd72b3e28022d8a55891f13e7d43

framework_docs_ADT_VERSION:=0.9.5

framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip

framework_docs_ADT_BYTES:=3372982

framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \
@@ -439,6 +452,8 @@ LOCAL_MODULE := offline-sdk 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

                $(web_docs_sample_code_flags) \

                -offlinemode \

		-title "Android SDK" \

		-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \

		-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \

api/6.xml

+7 −1376

File changed.

Preview size limit exceeded, changes collapsed.

api/7.xml

0 → 100644
+371697 −0

File added.

Preview size limit exceeded, changes collapsed.

api/current.xml

+497 −136
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ 
 value=""android.permission.SET_PREFERRED_APPLICATIONS""

 static="true"

 final="true"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</field>
@@ -1934,6 +1934,17 @@ 
 visibility="public"

>

</field>

<field name="author"

 type="int"

 transient="false"

 volatile="false"

 value="16843444"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="authorities"

 type="int"

 transient="false"
@@ -1967,6 +1978,17 @@ 
 visibility="public"

>

</field>

<field name="autoStart"

 type="int"

 transient="false"

 volatile="false"

 value="16843445"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="autoText"

 type="int"

 transient="false"
@@ -8842,17 +8864,6 @@ 
 visibility="public"

>

</field>

<field name="wallpaperAuthor"

 type="int"

 transient="false"

 volatile="false"

 value="16843444"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperCloseEnterAnimation"

 type="int"

 transient="false"
@@ -8875,17 +8886,6 @@ 
 visibility="public"

>

</field>

<field name="wallpaperDescription"

 type="int"

 transient="false"

 volatile="false"

 value="16843445"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperIntraCloseEnterAnimation"

 type="int"

 transient="false"
@@ -15058,71 +15058,6 @@ 
>

</method>

</interface>

<class name="AccountManagerResponse"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onError"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="onResult"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="result" type="android.os.Bundle">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="android.os.Parcel">

</parameter>

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

</parameter>

</method>

</class>

<class name="AccountsException"

 extends="java.lang.Exception"

 abstract="false"
@@ -25155,6 +25090,28 @@ 
 visibility="public"

>

</field>

<field name="COMMAND_DROP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.home.drop&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="COMMAND_TAP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.wallpaper.tap&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.appwidget"
@@ -34064,6 +34021,17 @@ 
<parameter name="defaultValue" type="short">

</parameter>

</method>

<method name="getSourceBounds"

 return="android.graphics.Rect"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStringArrayExtra"

 return="java.lang.String[]"

 abstract="false"
@@ -34875,6 +34843,19 @@ 
<parameter name="packageName" type="java.lang.String">

</parameter>

</method>

<method name="setSourceBounds"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="r" type="android.graphics.Rect">

</parameter>

</method>

<method name="setType"

 return="android.content.Intent"

 abstract="false"
@@ -35279,6 +35260,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"
@@ -36121,6 +36113,17 @@ 
 value="&quot;android.intent.extra.changed_component_name&quot;"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_CHANGED_COMPONENT_NAME_LIST"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.intent.extra.changed_component_name_list&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>
@@ -36433,6 +36436,17 @@ 
 visibility="public"

>

</field>

<field name="FILL_IN_SOURCE_BOUNDS"

 type="int"

 transient="false"

 volatile="false"

 value="32"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_ACTIVITY_BROUGHT_TO_FRONT"

 type="int"

 transient="false"
@@ -41118,7 +41132,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">
@@ -41871,7 +41885,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="packageName" type="java.lang.String">
@@ -42013,6 +42027,116 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_CAMERA"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.camera&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_CAMERA_AUTOFOCUS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.camera.autofocus&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_CAMERA_FLASH"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.camera.flash&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_LIVE_WALLPAPER"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.software.live_wallpaper&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_LIGHT"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.sensor.light&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_PROXIMITY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.sensor.proximity&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TELEPHONY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.telephony&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TELEPHONY_CDMA"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.telephony.cdma&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TELEPHONY_GSM"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.telephony.gsm&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.touchscreen.multitouch&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GET_ACTIVITIES"

 type="int"

 transient="false"
@@ -61985,6 +62109,17 @@ 
 visibility="public"

>

</method>

<method name="flattenToString"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="height"

 return="int"

 abstract="false"
@@ -62211,6 +62346,19 @@ 
 visibility="public"

>

</method>

<method name="unflattenFromString"

 return="android.graphics.Rect"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="union"

 return="void"

 abstract="false"
@@ -99828,7 +99976,7 @@ 
 visibility="public"

>

</field>

<field name="ECLAIR_MR1"

<field name="ECLAIR_0_1"

 type="int"

 transient="false"

 volatile="false"
@@ -99839,6 +99987,17 @@ 
 visibility="public"

>

</field>

<field name="ECLAIR_MR1"

 type="int"

 transient="false"

 volatile="false"

 value="7"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Bundle"

 extends="java.lang.Object"
@@ -123784,34 +123943,6 @@ 
</parameter>

</method>

</class>

<class name="WallpaperSettingsActivity"

 extends="android.preference.PreferenceActivity"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="WallpaperSettingsActivity"

 type="android.service.wallpaper.WallpaperSettingsActivity"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<field name="EXTRA_PREVIEW_MODE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.service.wallpaper.PREVIEW_MODE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.speech"

>
@@ -124678,6 +124809,20 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

</constructor>

<constructor name="NeighboringCellInfo"

 type="android.telephony.NeighboringCellInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="in" type="android.os.Parcel">

</parameter>

</constructor>
@@ -125489,6 +125634,21 @@ 
<parameter name="state" type="int">

</parameter>

</method>

<method name="onDataConnectionStateChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="onMessageWaitingIndicatorChanged"

 return="void"

 abstract="false"
@@ -125528,6 +125688,19 @@ 
<parameter name="asu" type="int">

</parameter>

</method>

<method name="onSignalStrengthsChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="signalStrength" type="android.telephony.SignalStrength">

</parameter>

</method>

<field name="LISTEN_CALL_FORWARDING_INDICATOR"

 type="int"

 transient="false"
@@ -125623,6 +125796,17 @@ 
 value="2"

 static="true"

 final="true"

 deprecated="deprecated"

 visibility="public"

>

</field>

<field name="LISTEN_SIGNAL_STRENGTHS"

 type="int"

 transient="false"

 volatile="false"

 value="256"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>
@@ -125904,6 +126088,131 @@ 
>

</field>

</class>

<class name="SignalStrength"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getCdmaDbm"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getCdmaEcio"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getEvdoDbm"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getEvdoEcio"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getEvdoSnr"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getGsmBitErrorRate"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getGsmSignalStrength"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isGsm"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="out" type="android.os.Parcel">

</parameter>

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

</parameter>

</method>

</class>

<class name="SmsManager"

 extends="java.lang.Object"

 abstract="false"
@@ -173991,7 +174300,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>
@@ -175087,8 +175396,8 @@ 
 visibility="public"

>

</constructor>

<method name="addMessageToConsole"

 return="void"

<method name="getDefaultVideoPoster"

 return="android.graphics.Bitmap"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175097,15 +175406,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"
@@ -175115,8 +175418,8 @@ 
 visibility="public"

>

</method>

<method name="getVideoLoadingProgressView"

 return="android.view.View"

<method name="getVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175125,8 +175428,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"
@@ -175136,10 +175441,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"
@@ -175149,7 +175454,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"
@@ -189594,6 +189903,21 @@ 
<parameter name="parcel" type="android.os.Parcel">

</parameter>

</constructor>

<method name="addView"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

<parameter name="nestedView" type="android.widget.RemoteViews">

</parameter>

</method>

<method name="apply"

 return="android.view.View"

 abstract="false"
@@ -189670,6 +189994,19 @@ 
<parameter name="v" type="android.view.View">

</parameter>

</method>

<method name="removeAllViews"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</method>

<method name="setBitmap"

 return="void"

 abstract="false"
@@ -196255,6 +196592,17 @@ 
<parameter name="attrs" type="android.util.AttributeSet">

</parameter>

</constructor>

<method name="isAutoStart"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isFlipping"

 return="boolean"

 abstract="false"
@@ -196266,6 +196614,19 @@ 
 visibility="public"

>

</method>

<method name="setAutoStart"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="autoStart" type="boolean">

</parameter>

</method>

<method name="setFlipInterval"

 return="void"

 abstract="false"

camera/libcameraservice/CameraService.cpp

+16 −4
Original line number Diff line number Diff line
@@ -669,9 +669,15 @@ status_t CameraService::Client::startRecording() 
    LOGD("startRecording (pid %d)", getCallingPid());



    if (mMediaPlayerBeep.get() != NULL) {

        // do not play record jingle if stream volume is 0

        // (typically because ringer mode is silent).

        int index;

        AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index);

        if (index != 0) {

            mMediaPlayerBeep->seekTo(0);

            mMediaPlayerBeep->start();

        }

    }



    mHardware->enableMsgType(CAMERA_MSG_VIDEO_FRAME);
@@ -888,9 +894,15 @@ void CameraService::Client::handleShutter( 
{

    // Play shutter sound.

    if (mMediaPlayerClick.get() != NULL) {

        // do not play shutter sound if stream volume is 0

        // (typically because ringer mode is silent).

        int index;

        AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index);

        if (index != 0) {

            mMediaPlayerClick->seekTo(0);

            mMediaPlayerClick->start();

        }

    }



    // Screen goes black after the buffer is unregistered.

    if (mSurface != 0 && !mUseOverlay) {