Merge branch 'eclair' into eclair-release (c92dac60) · Commits · e / os / android_frameworks_base

api/4.xml

+66 −0

Original line number	Original line	Diff line number	Diff line
	@@ -111799,6 +111799,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="DATA_ACTIVITY_DORMANT"
			type="int"
			transient="false"
			volatile="false"
			value="4"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="DATA_ACTIVITY_IN"		<field name="DATA_ACTIVITY_IN"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -111939,6 +111950,28 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="NETWORK_TYPE_1xRTT"
			type="int"
			transient="false"
			volatile="false"
			value="7"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="NETWORK_TYPE_CDMA"
			type="int"
			transient="false"
			volatile="false"
			value="4"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="NETWORK_TYPE_EDGE"		<field name="NETWORK_TYPE_EDGE"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -111950,6 +111983,28 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="NETWORK_TYPE_EVDO_0"
			type="int"
			transient="false"
			volatile="false"
			value="5"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="NETWORK_TYPE_EVDO_A"
			type="int"
			transient="false"
			volatile="false"
			value="6"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="NETWORK_TYPE_GPRS"		<field name="NETWORK_TYPE_GPRS"
	type="int"		type="int"
	transient="false"		transient="false"
	@@ -111983,6 +112038,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="PHONE_TYPE_CDMA"
			type="int"
			transient="false"
			volatile="false"
			value="2"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="PHONE_TYPE_GSM"		<field name="PHONE_TYPE_GSM"
	type="int"		type="int"
	transient="false"		transient="false"

api/current.xml

+643 −0

Original line number	Original line	Diff line number	Diff line
	@@ -105888,6 +105888,17 @@
	<parameter name="time" type="long">		<parameter name="time" type="long">
	</parameter>		</parameter>
	</method>		</method>
			<method name="isScreenOn"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="newWakeLock"		<method name="newWakeLock"
	return="android.os.PowerManager.WakeLock"		return="android.os.PowerManager.WakeLock"
	abstract="false"		abstract="false"
	@@ -123754,6 +123765,34 @@
	</parameter>		</parameter>
	</method>		</method>
	</class>		</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=""android.service.wallpaper.PREVIEW_MODE""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
	</package>		</package>
	<package name="android.speech"		<package name="android.speech"
	>		>
	@@ -172849,6 +172888,17 @@
	visibility="public"		visibility="public"
	>		>
	</constructor>		</constructor>
			<method name="getContentDisposition"
			return="java.lang.String"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="getContentLength"		<method name="getContentLength"
	return="long"		return="long"
	abstract="false"		abstract="false"
	@@ -172893,6 +172943,17 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="getExpiresString"
			return="java.lang.String"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="getHttpStatusCode"		<method name="getHttpStatusCode"
	return="int"		return="int"
	abstract="false"		abstract="false"
	@@ -173017,6 +173078,23 @@
	<parameter name="w" type="android.webkit.WebView">		<parameter name="w" type="android.webkit.WebView">
	</parameter>		</parameter>
	</constructor>		</constructor>
			<method name="addMessageToConsole"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			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="createWindow"		<method name="createWindow"
	return="android.webkit.WebView"		return="android.webkit.WebView"
	abstract="false"		abstract="false"
	@@ -173069,6 +173147,30 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="getVisitedHistory"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="callback" type="android.webkit.ValueCallback<java.lang.String[]>">
			</parameter>
			</method>
			<method name="getWebChromeClient"
			return="android.webkit.WebChromeClient"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="onCloseWindow"		<method name="onCloseWindow"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -173141,6 +173243,32 @@
	<parameter name="resend" type="android.os.Message">		<parameter name="resend" type="android.os.Message">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onGeolocationPermissionsHidePrompt"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="onGeolocationPermissionsShowPrompt"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			<parameter name="callback" type="android.webkit.GeolocationPermissions.Callback">
			</parameter>
			</method>
	<method name="onJsAlert"		<method name="onJsAlert"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -173203,6 +173331,17 @@
	<parameter name="defaultValue" type="java.lang.String">		<parameter name="defaultValue" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onJsTimeout"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="onLoadResource"		<method name="onLoadResource"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -173257,6 +173396,23 @@
	<parameter name="newProgress" type="int">		<parameter name="newProgress" type="int">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onReachedMaxAppCacheSize"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="spaceNeeded" type="long">
			</parameter>
			<parameter name="totalUsedQuota" type="long">
			</parameter>
			<parameter name="quotaUpdater" type="android.webkit.WebStorage.QuotaUpdater">
			</parameter>
			</method>
	<method name="onReceivedError"		<method name="onReceivedError"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -173743,6 +173899,82 @@
	visibility="public"		visibility="public"
	>		>
	</constructor>		</constructor>
			<method name="allow"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			</method>
			<method name="clear"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			</method>
			<method name="clearAll"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getAllowed"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			<parameter name="callback" type="android.webkit.ValueCallback<java.lang.Boolean>">
			</parameter>
			</method>
			<method name="getInstance"
			return="android.webkit.GeolocationPermissions"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getOrigins"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="callback" type="android.webkit.ValueCallback<java.util.Set>">
			</parameter>
			</method>
	</class>		</class>
	<interface name="GeolocationPermissions.Callback"		<interface name="GeolocationPermissions.Callback"
	abstract="true"		abstract="true"
	@@ -174740,6 +174972,27 @@
	>		>
	</method>		</method>
	</class>		</class>
			<interface name="ValueCallback"
			abstract="true"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<method name="onReceiveValue"
			return="void"
			abstract="true"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="value" type="T">
			</parameter>
			</method>
			</interface>
	<class name="WebBackForwardList"		<class name="WebBackForwardList"
	extends="java.lang.Object"		extends="java.lang.Object"
	abstract="false"		abstract="false"
	@@ -174815,6 +175068,58 @@
	visibility="public"		visibility="public"
	>		>
	</constructor>		</constructor>
			<method name="addMessageToConsole"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			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"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getVideoLoadingProgressView"
			return="android.view.View"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getVisitedHistory"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="callback" type="android.webkit.ValueCallback<java.lang.String[]>">
			</parameter>
			</method>
	<method name="onCloseWindow"		<method name="onCloseWindow"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -174896,6 +175201,17 @@
	<parameter name="callback" type="android.webkit.GeolocationPermissions.Callback">		<parameter name="callback" type="android.webkit.GeolocationPermissions.Callback">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onHideCustomView"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="onJsAlert"		<method name="onJsAlert"
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"
	@@ -174974,6 +175290,17 @@
	<parameter name="result" type="android.webkit.JsPromptResult">		<parameter name="result" type="android.webkit.JsPromptResult">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onJsTimeout"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="onProgressChanged"		<method name="onProgressChanged"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -174989,6 +175316,23 @@
	<parameter name="newProgress" type="int">		<parameter name="newProgress" type="int">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onReachedMaxAppCacheSize"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="spaceNeeded" type="long">
			</parameter>
			<parameter name="totalUsedQuota" type="long">
			</parameter>
			<parameter name="quotaUpdater" type="android.webkit.WebStorage.QuotaUpdater">
			</parameter>
			</method>
	<method name="onReceivedIcon"		<method name="onReceivedIcon"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -175019,6 +175363,23 @@
	<parameter name="title" type="java.lang.String">		<parameter name="title" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onReceivedTouchIconUrl"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="view" type="android.webkit.WebView">
			</parameter>
			<parameter name="url" type="java.lang.String">
			</parameter>
			<parameter name="precomposed" type="boolean">
			</parameter>
			</method>
	<method name="onRequestFocus"		<method name="onRequestFocus"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -175032,7 +175393,41 @@
	<parameter name="view" type="android.webkit.WebView">		<parameter name="view" type="android.webkit.WebView">
	</parameter>		</parameter>
	</method>		</method>
			<method name="onShowCustomView"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="view" type="android.view.View">
			</parameter>
			<parameter name="callback" type="android.webkit.WebChromeClient.CustomViewCallback">
			</parameter>
			</method>
	</class>		</class>
			<interface name="WebChromeClient.CustomViewCallback"
			abstract="true"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<method name="onCustomViewHidden"
			return="void"
			abstract="true"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			</interface>
	<class name="WebHistoryItem"		<class name="WebHistoryItem"
	extends="java.lang.Object"		extends="java.lang.Object"
	abstract="false"		abstract="false"
	@@ -175336,6 +175731,28 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="getDefaultZoom"
			return="android.webkit.WebSettings.ZoomDensity"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getDomStorageEnabled"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="true"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="getFantasyFontFamily"		<method name="getFantasyFontFamily"
	return="java.lang.String"		return="java.lang.String"
	abstract="false"		abstract="false"
	@@ -175402,6 +175819,17 @@
	visibility="public"		visibility="public"
	>		>
	</method>		</method>
			<method name="getLoadWithOverviewMode"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="getLoadsImagesAutomatically"		<method name="getLoadsImagesAutomatically"
	return="boolean"		return="boolean"
	abstract="false"		abstract="false"
	@@ -175591,6 +176019,45 @@
	<parameter name="allow" type="boolean">		<parameter name="allow" type="boolean">
	</parameter>		</parameter>
	</method>		</method>
			<method name="setAppCacheEnabled"
			return="void"
			abstract="false"
			native="false"
			synchronized="true"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="flag" type="boolean">
			</parameter>
			</method>
			<method name="setAppCacheMaxSize"
			return="void"
			abstract="false"
			native="false"
			synchronized="true"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="appCacheMaxSize" type="long">
			</parameter>
			</method>
			<method name="setAppCachePath"
			return="void"
			abstract="false"
			native="false"
			synchronized="true"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="appCachePath" type="java.lang.String">
			</parameter>
			</method>
	<method name="setBlockNetworkImage"		<method name="setBlockNetworkImage"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -175708,6 +176175,32 @@
	<parameter name="encoding" type="java.lang.String">		<parameter name="encoding" type="java.lang.String">
	</parameter>		</parameter>
	</method>		</method>
			<method name="setDefaultZoom"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="zoom" type="android.webkit.WebSettings.ZoomDensity">
			</parameter>
			</method>
			<method name="setDomStorageEnabled"
			return="void"
			abstract="false"
			native="false"
			synchronized="true"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="flag" type="boolean">
			</parameter>
			</method>
	<method name="setFantasyFontFamily"		<method name="setFantasyFontFamily"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -175812,6 +176305,19 @@
	<parameter name="enabled" type="boolean">		<parameter name="enabled" type="boolean">
	</parameter>		</parameter>
	</method>		</method>
			<method name="setLoadWithOverviewMode"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="overview" type="boolean">
			</parameter>
			</method>
	<method name="setLoadsImagesAutomatically"		<method name="setLoadsImagesAutomatically"
	return="void"		return="void"
	abstract="false"		abstract="false"
	@@ -176249,6 +176755,39 @@
	>		>
	</method>		</method>
	</class>		</class>
			<class name="WebSettings.ZoomDensity"
			extends="java.lang.Enum"
			abstract="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			<method name="valueOf"
			return="android.webkit.WebSettings.ZoomDensity"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="name" type="java.lang.String">
			</parameter>
			</method>
			<method name="values"
			return="android.webkit.WebSettings.ZoomDensity[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			</class>
	<class name="WebStorage"		<class name="WebStorage"
	extends="java.lang.Object"		extends="java.lang.Object"
	abstract="false"		abstract="false"
	@@ -176265,6 +176804,99 @@
	visibility="public"		visibility="public"
	>		>
	</constructor>		</constructor>
			<method name="deleteAllData"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="deleteOrigin"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			</method>
			<method name="getInstance"
			return="android.webkit.WebStorage"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getOrigins"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="callback" type="android.webkit.ValueCallback<java.util.Map>">
			</parameter>
			</method>
			<method name="getQuotaForOrigin"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			<parameter name="callback" type="android.webkit.ValueCallback<java.lang.Long>">
			</parameter>
			</method>
			<method name="getUsageForOrigin"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			<parameter name="callback" type="android.webkit.ValueCallback<java.lang.Long>">
			</parameter>
			</method>
			<method name="setQuotaForOrigin"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="origin" type="java.lang.String">
			</parameter>
			<parameter name="quota" type="long">
			</parameter>
			</method>
	</class>		</class>
	<interface name="WebStorage.QuotaUpdater"		<interface name="WebStorage.QuotaUpdater"
	abstract="true"		abstract="true"
	@@ -176706,6 +177338,17 @@
	<parameter name="vy" type="int">		<parameter name="vy" type="int">
	</parameter>		</parameter>
	</method>		</method>
			<method name="freeMemory"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
	<method name="getCertificate"		<method name="getCertificate"
	return="android.net.http.SslCertificate"		return="android.net.http.SslCertificate"
	abstract="false"		abstract="false"

camera/libcameraservice/CameraService.cpp

+14 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1215,20 +1215,27 @@ void CameraService::Client::copyFrameAndPostCopiedFrame(const sp<ICameraClient>&
	// the callback. For efficiency, reuse the same MemoryHeapBase		// the callback. For efficiency, reuse the same MemoryHeapBase
	// provided it's big enough. Don't allocate the memory or		// provided it's big enough. Don't allocate the memory or
	// perform the copy if there's no callback.		// perform the copy if there's no callback.

			// hold the lock while we grab a reference to the preview buffer
			sp<MemoryHeapBase> previewBuffer;
			{
			Mutex::Autolock lock(mLock);
	if (mPreviewBuffer == 0) {		if (mPreviewBuffer == 0) {
	mPreviewBuffer = new MemoryHeapBase(size, 0, NULL);		mPreviewBuffer = new MemoryHeapBase(size, 0, NULL);
	} else if (size > mPreviewBuffer->virtualSize()) {		} else if (size > mPreviewBuffer->virtualSize()) {
	mPreviewBuffer.clear();		mPreviewBuffer.clear();
	mPreviewBuffer = new MemoryHeapBase(size, 0, NULL);		mPreviewBuffer = new MemoryHeapBase(size, 0, NULL);
			}
	if (mPreviewBuffer == 0) {		if (mPreviewBuffer == 0) {
	LOGE("failed to allocate space for preview buffer");		LOGE("failed to allocate space for preview buffer");
	return;		return;
	}		}
			previewBuffer = mPreviewBuffer;
	}		}
	memcpy(mPreviewBuffer->base(),		memcpy(previewBuffer->base(),
	(uint8_t *)heap->base() + offset, size);		(uint8_t *)heap->base() + offset, size);

	sp<MemoryBase> frame = new MemoryBase(mPreviewBuffer, 0, size);		sp<MemoryBase> frame = new MemoryBase(previewBuffer, 0, size);
	if (frame == 0) {		if (frame == 0) {
	LOGE("failed to allocate space for frame callback");		LOGE("failed to allocate space for frame callback");
	return;		return;

cmds/bootanimation/BootAnimation.cpp

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -437,6 +437,9 @@ bool BootAnimation::movie()
	nsecs_t lastFrame = systemTime();		nsecs_t lastFrame = systemTime();
	nsecs_t frameDuration = s2ns(1) / animation.fps;		nsecs_t frameDuration = s2ns(1) / animation.fps;

			Region clearReg(Rect(mWidth, mHeight));
			clearReg.subtractSelf(Rect(xc, yc, xc+animation.width, yc+animation.height));

	for (int i=0 ; i<pcount && !exitPending() ; i++) {		for (int i=0 ; i<pcount && !exitPending() ; i++) {
	const Animation::Part& part(animation.parts[i]);		const Animation::Part& part(animation.parts[i]);
	const size_t fcount = part.frames.size();		const size_t fcount = part.frames.size();
	@@ -460,6 +463,18 @@ bool BootAnimation::movie()
	frame.map->getDataLength());		frame.map->getDataLength());
	}		}

			if (!clearReg.isEmpty()) {
			Region::const_iterator head(clearReg.begin());
			Region::const_iterator tail(clearReg.end());
			glEnable(GL_SCISSOR_TEST);
			while (head != tail) {
			const Rect& r(*head++);
			glScissor(r.left, mHeight - r.bottom,
			r.width(), r.height());
			glClear(GL_COLOR_BUFFER_BIT);
			}
			glDisable(GL_SCISSOR_TEST);
			}
	glDrawTexiOES(xc, yc, 0, animation.width, animation.height);		glDrawTexiOES(xc, yc, 0, animation.width, animation.height);
	eglSwapBuffers(mDisplay, mSurface);		eglSwapBuffers(mDisplay, mSurface);

core/java/android/app/ActivityThread.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1447,7 +1447,6 @@ public final class ActivityThread {
	Bundle instrumentationArgs, IInstrumentationWatcher instrumentationWatcher,		Bundle instrumentationArgs, IInstrumentationWatcher instrumentationWatcher,
	int debugMode, boolean isRestrictedBackupMode, Configuration config,		int debugMode, boolean isRestrictedBackupMode, Configuration config,
	Map<String, IBinder> services) {		Map<String, IBinder> services) {
	Process.setArgV0(processName);

	if (services != null) {		if (services != null) {
	// Setup the service cache in the ServiceManager		// Setup the service cache in the ServiceManager
	@@ -3818,6 +3817,7 @@ public final class ActivityThread {
	//Process.setUid(data.appInfo.uid);		//Process.setUid(data.appInfo.uid);

	// send up app name; do this before waiting for debugger		// send up app name; do this before waiting for debugger
			Process.setArgV0(data.processName);
	android.ddm.DdmHandleAppName.setAppName(data.processName);		android.ddm.DdmHandleAppName.setAppName(data.processName);

	/*		/*