Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread (9e1266da) · Commits · e / os / android_frameworks_base

Android.mk

+28 −17

Original line number	Diff line number	Diff line
		@@ -100,9 +100,11 @@ LOCAL_SRC_FILES += \
		core/java/android/bluetooth/IBluetoothCallback.aidl \
		core/java/android/bluetooth/IBluetoothHeadset.aidl \
		core/java/android/bluetooth/IBluetoothPbap.aidl \
		core/java/android/content/IClipboard.aidl \
		core/java/android/content/IContentService.aidl \
		core/java/android/content/IIntentReceiver.aidl \
		core/java/android/content/IIntentSender.aidl \
		core/java/android/content/IOnPrimaryClipChangedListener.aidl \
		core/java/android/content/ISyncAdapter.aidl \
		core/java/android/content/ISyncContext.aidl \
		core/java/android/content/ISyncStatusObserver.aidl \
		@@ -129,7 +131,6 @@ LOCAL_SRC_FILES += \
		core/java/android/service/wallpaper/IWallpaperConnection.aidl \
		core/java/android/service/wallpaper/IWallpaperEngine.aidl \
		core/java/android/service/wallpaper/IWallpaperService.aidl \
		core/java/android/text/IClipboard.aidl \
		core/java/android/view/accessibility/IAccessibilityManager.aidl \
		core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
		core/java/android/view/IApplicationToken.aidl \
		@@ -159,6 +160,9 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/view/IInputMethodClient.aidl \
		core/java/com/android/internal/view/IInputMethodManager.aidl \
		core/java/com/android/internal/view/IInputMethodSession.aidl \
		core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
		location/java/android/location/ICountryDetector.aidl \
		location/java/android/location/ICountryListener.aidl \
		location/java/android/location/IGeocodeProvider.aidl \
		location/java/android/location/IGpsStatusListener.aidl \
		location/java/android/location/IGpsStatusProvider.aidl \
		@@ -348,7 +352,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
		framework \

		framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		framework_docs_LOCAL_DROIDDOC_HTML_DIR := $(LOCAL_PATH)/docs/html $(OUT_DOCS)/gen
		framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
		# The since flag (-since N.xml API_LEVEL) is used to add API Level information
		# to the reference documentation. Must be in order of oldest to newest.
		framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		@@ -361,7 +365,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-since ./frameworks/base/api/6.xml 6 \
		-since ./frameworks/base/api/7.xml 7 \
		-since ./frameworks/base/api/8.xml 8 \
		-werror -hide 13 \
		-since ./frameworks/base/api/current.xml HC \
		-werror -hide 113 \
		-overview $(LOCAL_PATH)/core/java/overview.html

		framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework)
		@@ -420,7 +425,9 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/WiktionarySimple \
		resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
		-samplecode $(sample_dir)/VoiceRecognitionService \
		resources/samples/VoiceRecognitionService "Voice Recognition Service"
		resources/samples/VoiceRecognitionService "Voice Recognition Service" \
		-samplecode $(sample_dir)/XmlAdapters \
		resources/samples/XmlAdapters "XML Adapters"

		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)
		@@ -455,11 +462,13 @@ LOCAL_DROIDDOC_OPTIONS:=\
		-nodocs

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_DROIDDOC)

		$(full_target): $(framework_built)
		# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
		$(full_target): $(framework_built) $(gen)
		$(INTERNAL_PLATFORM_API_FILE): $(full_target)
		$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))

		@@ -482,7 +491,8 @@ LOCAL_DROIDDOC_OPTIONS:=\
		-parsecomments

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_DROIDDOC)

		@@ -520,7 +530,6 @@ ifeq ($(framework_docs_SDK_PREVIEW),true)
		endif

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		include $(BUILD_DROIDDOC)

		@@ -533,7 +542,6 @@ $(static_doc_index_redirect): \
		$(full_target): $(static_doc_index_redirect)
		$(full_target): $(framework_built)


		# ==== docs for the web (on the google app engine server) =======================
		include $(CLEAR_VARS)

		@@ -557,12 +565,11 @@ LOCAL_DROIDDOC_OPTIONS:= \
		-hdf template.showLanguageMenu true

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		include $(BUILD_DROIDDOC)

		# explicitly specify that online-sdk depends on framework-res and any generated docs
		$(full_target): framework-res-package-target $(ALL_GENERATED_DOCS)
		$(full_target): framework-res-package-target

		# ==== docs that have all of the stuff that's @hidden =======================
		include $(CLEAR_VARS)
		@@ -583,7 +590,6 @@ LOCAL_DROIDDOC_OPTIONS:=\
		# -hidden

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

		include $(BUILD_DROIDDOC)

		@@ -593,10 +599,14 @@ include $(BUILD_DROIDDOC)
		ext_dirs := \
		../../external/nist-sip/java \
		../../external/apache-http/src \
		../../external/tagsoup/src
		../../external/tagsoup/src \
		../../external/libphonenumber/java/src

		ext_src_files := $(call all-java-files-under,$(ext_dirs))

		ext_res_dirs := \
		../../external/libphonenumber/java/src

		# ==== the library =========================================
		include $(CLEAR_VARS)

		@@ -604,6 +614,7 @@ LOCAL_SRC_FILES := $(ext_src_files)

		LOCAL_NO_STANDARD_LIBRARIES := true
		LOCAL_JAVA_LIBRARIES := core
		LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE := ext

CleanSpec.mk

+13 −0

Original line number	Diff line number	Diff line
		@@ -67,7 +67,20 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libequalizerte
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverb_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverbtest_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/)
		$(call add-clean-step, find . -type f -name "*.rs" -print0 \| xargs -0 touch)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libandroid_runtime.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libandroid_runtime.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libandroid_runtime.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhwui_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libhwui.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libhwui.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libhwui.so)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content/IClipboard.P)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/ITelephonyRegistry.P)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates)
		$(call add-clean-step, rm -rf out/target/common/docs/api-stubs*)

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

api/9.xml

+36 −280

Original line number	Diff line number	Diff line
		@@ -15845,17 +15845,6 @@
		visibility="public"
		>
		</method>
		<method name="getInstanceCount"
		return="long"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getIntent"
		return="android.content.Intent"
		abstract="false"
		@@ -58571,16 +58560,6 @@
		<parameter name="bitmap" type="android.graphics.Bitmap">
		</parameter>
		</constructor>
		<constructor name="Canvas"
		type="android.graphics.Canvas"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="gl" type="javax.microedition.khronos.opengles.GL">
		</parameter>
		</constructor>
		<method name="clipPath"
		return="boolean"
		abstract="false"
		@@ -59497,17 +59476,6 @@
		<parameter name="paint" type="android.graphics.Paint">
		</parameter>
		</method>
		<method name="freeGlCaches"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getClipBounds"
		return="boolean"
		abstract="false"
		@@ -59554,17 +59522,6 @@
		visibility="public"
		>
		</method>
		<method name="getGL"
		return="javax.microedition.khronos.opengles.GL"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getHeight"
		return="int"
		abstract="false"
		@@ -59928,21 +59885,6 @@
		<parameter name="matrix" type="android.graphics.Matrix">
		</parameter>
		</method>
		<method name="setViewport"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="width" type="int">
		</parameter>
		<parameter name="height" type="int">
		</parameter>
		</method>
		<method name="skew"
		return="void"
		abstract="false"
		@@ -74148,7 +74090,7 @@
		type="float"
		transient="false"
		volatile="false"
		value="0.0010f"
		value="0.001f"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -147760,17 +147702,6 @@
		visibility="public"
		>
		</constructor>
		<method name="abortUpdates"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="close"
		return="void"
		abstract="false"
		@@ -147782,30 +147713,6 @@
		visibility="public"
		>
		</method>
		<method name="commitUpdates"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="commitUpdates"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="values" type="java.util.Map<? extends java.lang.Long, ? extends java.util.Map<java.lang.String, java.lang.Object>>">
		</parameter>
		</method>
		<method name="copyStringToBuffer"
		return="void"
		abstract="false"
		@@ -147832,17 +147739,6 @@
		visibility="public"
		>
		</method>
		<method name="deleteRow"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getBlob"
		return="byte[]"
		abstract="false"
		@@ -148039,17 +147935,6 @@
		visibility="public"
		>
		</method>
		<method name="hasUpdates"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="isAfterLast"
		return="boolean"
		abstract="false"
		@@ -148253,17 +148138,6 @@
		<parameter name="uri" type="android.net.Uri">
		</parameter>
		</method>
		<method name="supportsUpdates"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="unregisterContentObserver"
		return="void"
		abstract="false"
		@@ -148290,124 +148164,6 @@
		<parameter name="observer" type="android.database.DataSetObserver">
		</parameter>
		</method>
		<method name="updateBlob"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="byte[]">
		</parameter>
		</method>
		<method name="updateDouble"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="double">
		</parameter>
		</method>
		<method name="updateFloat"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="float">
		</parameter>
		</method>
		<method name="updateInt"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="int">
		</parameter>
		</method>
		<method name="updateLong"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="long">
		</parameter>
		</method>
		<method name="updateShort"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="short">
		</parameter>
		</method>
		<method name="updateString"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		<parameter name="value" type="java.lang.String">
		</parameter>
		</method>
		<method name="updateToNull"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="columnIndex" type="int">
		</parameter>
		</method>
		</class>
		<class name="MockDialogInterface"
		extends="java.lang.Object"
		@@ -164674,7 +164430,7 @@
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""((aero\|arpa\|asia\|a[cdefgilmnoqrstuwxz])\|(biz\|b[abdefghijmnorstvwyz])\|(cat\|com\|coop\|c[acdfghiklmnoruvxyz])\|d[ejkmoz]\|(edu\|e[cegrstu])\|f[ijkmor]\|(gov\|g[abdefghilmnpqrstuwy])\|h[kmnrtu]\|(info\|int\|i[delmnoqrst])\|(jobs\|j[emop])\|k[eghimnprwyz]\|l[abcikrstuvy]\|(mil\|mobi\|museum\|m[acdeghklmnopqrstuvwxyz])\|(name\|net\|n[acefgilopruz])\|(org\|om)\|(pro\|p[aefghklmnrstwy])\|qa\|r[eosuw]\|s[abcdeghijklmnortuvyz]\|(tel\|travel\|t[cdfghjklmnoprtvwz])\|u[agksyz]\|v[aceginu]\|w[fs]\|(xn\\-\\-0zwm56d\|xn\\-\\-11b5bs3a9aj6g\|xn\\-\\-80akhbyknj4f\|xn\\-\\-9t4b11yi5a\|xn\\-\\-deba0ad\|xn\\-\\-g6w251d\|xn\\-\\-hgbk6aj7f53bba\|xn\\-\\-hlcj6aya9esc7a\|xn\\-\\-jxalpdlp\|xn\\-\\-kgbechtv\|xn\\-\\-zckzah)\|y[etu]\|z[amw])""
		value=""((aero\|arpa\|asia\|a[cdefgilmnoqrstuwxz])\|(biz\|b[abdefghijmnorstvwyz])\|(cat\|com\|coop\|c[acdfghiklmnoruvxyz])\|d[ejkmoz]\|(edu\|e[cegrstu])\|f[ijkmor]\|(gov\|g[abdefghilmnpqrstuwy])\|h[kmnrtu]\|(info\|int\|i[delmnoqrst])\|(jobs\|j[emop])\|k[eghimnprwyz]\|l[abcikrstuvy]\|(mil\|mobi\|museum\|m[acdeghklmnopqrstuvwxyz])\|(name\|net\|n[acefgilopruz])\|(org\|om)\|(pro\|p[aefghklmnrstwy])\|qa\|r[eosuw]\|s[abcdeghijklmnortuvyz]\|(tel\|travel\|t[cdfghjklmnoprtvwz])\|u[agksyz]\|v[aceginu]\|w[fs]\|(xn\\-\\-0zwm56d\|xn\\-\\-11b5bs3a9aj6g\|xn\\-\\-80akhbyknj4f\|xn\\-\\-9t4b11yi5a\|xn\\-\\-deba0ad\|xn\\-\\-g6w251d\|xn\\-\\-hgbk6aj7f53bba\|xn\\-\\-hlcj6aya9esc7a\|xn\\-\\-jxalpdlp\|xn\\-\\-kgbechtv\|xn\\-\\-mgbaam7a8h\|xn\\-\\-mgberp4a5d4ar\|xn\\-\\-wgbh1c\|xn\\-\\-zckzah)\|y[et]\|z[amw])""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -164685,7 +164441,7 @@
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""(?:(?:aero\|arpa\|asia\|a[cdefgilmnoqrstuwxz])\|(?:biz\|b[abdefghijmnorstvwyz])\|(?:cat\|com\|coop\|c[acdfghiklmnoruvxyz])\|d[ejkmoz]\|(?:edu\|e[cegrstu])\|f[ijkmor]\|(?:gov\|g[abdefghilmnpqrstuwy])\|h[kmnrtu]\|(?:info\|int\|i[delmnoqrst])\|(?:jobs\|j[emop])\|k[eghimnprwyz]\|l[abcikrstuvy]\|(?:mil\|mobi\|museum\|m[acdeghklmnopqrstuvwxyz])\|(?:name\|net\|n[acefgilopruz])\|(?:org\|om)\|(?:pro\|p[aefghklmnrstwy])\|qa\|r[eosuw]\|s[abcdeghijklmnortuvyz]\|(?:tel\|travel\|t[cdfghjklmnoprtvwz])\|u[agksyz]\|v[aceginu]\|w[fs]\|(?:xn\\-\\-0zwm56d\|xn\\-\\-11b5bs3a9aj6g\|xn\\-\\-80akhbyknj4f\|xn\\-\\-9t4b11yi5a\|xn\\-\\-deba0ad\|xn\\-\\-g6w251d\|xn\\-\\-hgbk6aj7f53bba\|xn\\-\\-hlcj6aya9esc7a\|xn\\-\\-jxalpdlp\|xn\\-\\-kgbechtv\|xn\\-\\-zckzah)\|y[etu]\|z[amw]))""
		value=""(?:(?:aero\|arpa\|asia\|a[cdefgilmnoqrstuwxz])\|(?:biz\|b[abdefghijmnorstvwyz])\|(?:cat\|com\|coop\|c[acdfghiklmnoruvxyz])\|d[ejkmoz]\|(?:edu\|e[cegrstu])\|f[ijkmor]\|(?:gov\|g[abdefghilmnpqrstuwy])\|h[kmnrtu]\|(?:info\|int\|i[delmnoqrst])\|(?:jobs\|j[emop])\|k[eghimnprwyz]\|l[abcikrstuvy]\|(?:mil\|mobi\|museum\|m[acdeghklmnopqrstuvwxyz])\|(?:name\|net\|n[acefgilopruz])\|(?:org\|om)\|(?:pro\|p[aefghklmnrstwy])\|qa\|r[eosuw]\|s[abcdeghijklmnortuvyz]\|(?:tel\|travel\|t[cdfghjklmnoprtvwz])\|u[agksyz]\|v[aceginu]\|w[fs]\|(?:xn\\-\\-0zwm56d\|xn\\-\\-11b5bs3a9aj6g\|xn\\-\\-80akhbyknj4f\|xn\\-\\-9t4b11yi5a\|xn\\-\\-deba0ad\|xn\\-\\-g6w251d\|xn\\-\\-hgbk6aj7f53bba\|xn\\-\\-hlcj6aya9esc7a\|xn\\-\\-jxalpdlp\|xn\\-\\-kgbechtv\|xn\\-\\-mgbaam7a8h\|xn\\-\\-mgberp4a5d4ar\|xn\\-\\-wgbh1c\|xn\\-\\-zckzah)\|y[et]\|z[amw]))""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -195596,6 +195352,39 @@
		<parameter name="defStyle" type="int">
		</parameter>
		</constructor>
		<field name="CHOICE_MODE_MULTIPLE"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CHOICE_MODE_NONE"
		type="int"
		transient="false"
		volatile="false"
		value="0"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CHOICE_MODE_SINGLE"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<method name="afterTextChanged"
		return="void"
		abstract="false"
		@@ -204052,39 +203841,6 @@
		<parameter name="y" type="int">
		</parameter>
		</method>
		<field name="CHOICE_MODE_MULTIPLE"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CHOICE_MODE_NONE"
		type="int"
		transient="false"
		volatile="false"
		value="0"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="CHOICE_MODE_SINGLE"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ListView.FixedViewInfo"
		extends="java.lang.Object"

api/current.xml

+36308 −20510

File changed.

Preview size limit exceeded, changes collapsed.

cmds/am/src/com/android/commands/am/Am.java

+60 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.Intent;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.AndroidException;
		import android.view.IWindowManager;
		@@ -98,6 +97,8 @@ public class Am {
		sendBroadcast();
		} else if (op.equals("profile")) {
		runProfile();
		} else if (op.equals("dumpheap")) {
		runDumpHeap();
		} else {
		throw new IllegalArgumentException("Unknown command: " + op);
		}
		@@ -140,6 +141,31 @@ public class Am {
		String value = nextArgRequired();
		intent.putExtra(key, Integer.valueOf(value));
		hasIntentInfo = true;
		} else if (opt.equals("--eia")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		String[] strings = value.split(",");
		int[] list = new int[strings.length];
		for (int i = 0; i < strings.length; i++) {
		list[i] = Integer.valueOf(strings[i]);
		}
		intent.putExtra(key, list);
		hasIntentInfo = true;
		} else if (opt.equals("--el")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		intent.putExtra(key, Long.valueOf(value));
		hasIntentInfo = true;
		} else if (opt.equals("--ela")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		String[] strings = value.split(",");
		long[] list = new long[strings.length];
		for (int i = 0; i < strings.length; i++) {
		list[i] = Long.valueOf(strings[i]);
		}
		intent.putExtra(key, list);
		hasIntentInfo = true;
		} else if (opt.equals("--ez")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		@@ -424,6 +450,28 @@ public class Am {
		}
		}

		private void runDumpHeap() throws Exception {
		boolean managed = !"-n".equals(nextOption());
		String process = nextArgRequired();
		String heapFile = nextArgRequired();
		ParcelFileDescriptor fd = null;

		try {
		fd = ParcelFileDescriptor.open(
		new File(heapFile),
		ParcelFileDescriptor.MODE_CREATE \|
		ParcelFileDescriptor.MODE_TRUNCATE \|
		ParcelFileDescriptor.MODE_READ_WRITE);
		} catch (FileNotFoundException e) {
		System.err.println("Error: Unable to open file: " + heapFile);
		return;
		}

		if (!mAm.dumpHeap(process, managed, heapFile, fd)) {
		throw new AndroidException("HEAP DUMP FAILED on process " + process);
		}
		}

		private class IntentReceiver extends IIntentReceiver.Stub {
		private boolean mFinished = false;

		@@ -591,8 +639,15 @@ public class Am {
		" -p <FILE>: write profiling data to <FILE>\n" +
		" -w: wait for instrumentation to finish before returning\n" +
		"\n" +
		" run a test package against an application: am instrument [flags] <TEST_PACKAGE>/<RUNNER_CLASS>\n" +
		" -e <testrunner_flag> <testrunner_value> [,<testrunner_value>]\n" +
		" -w wait for the test to finish (required)\n" +
		" -r use with -e perf true to generate raw output for performance measurements\n" +
		"\n" +
		" start profiling: am profile <PROCESS> start <FILE>\n" +
		" stop profiling: am profile <PROCESS> stop\n" +
		" dump heap: am dumpheap [flags] <PROCESS> <FILE>\n" +
		" -n: dump native heap instead of managed heap\n" +
		"\n" +
		" <INTENT> specifications include these flags:\n" +
		" [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" +
		@@ -600,7 +655,10 @@ public class Am {
		" [-e\|--es <EXTRA_KEY> <EXTRA_STRING_VALUE> ...]\n" +
		" [--esn <EXTRA_KEY> ...]\n" +
		" [--ez <EXTRA_KEY> <EXTRA_BOOLEAN_VALUE> ...]\n" +
		" [-e\|--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]\n" +
		" [--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]\n" +
		" [--el <EXTRA_KEY> <EXTRA_LONG_VALUE> ...]\n" +
		" [--eia <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]\n" +
		" [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" +
		" [-n <COMPONENT>] [-f <FLAGS>]\n" +
		" [--grant-read-uri-permission] [--grant-write-uri-permission]\n" +
		" [--debug-log-resolution]\n" +