Merge branch 'gingerbread' into gingerbread-release (037e3946) · Commits · e / os / android_frameworks_base

Android.mk

+12 −8

Original line number	Diff line number	Diff line
		@@ -116,6 +116,14 @@ LOCAL_SRC_FILES += \
		core/java/android/net/IConnectivityManager.aidl \
		core/java/android/net/INetworkManagementEventObserver.aidl \
		core/java/android/net/IThrottleManager.aidl \
		core/java/android/nfc/ILlcpConnectionlessSocket.aidl \
		core/java/android/nfc/ILlcpServiceSocket.aidl \
		core/java/android/nfc/ILlcpSocket.aidl \
		core/java/android/nfc/INdefTag.aidl \
		core/java/android/nfc/INfcAdapter.aidl \
		core/java/android/nfc/INfcTag.aidl \
		core/java/android/nfc/IP2pInitiator.aidl \
		core/java/android/nfc/IP2pTarget.aidl \
		core/java/android/os/IHardwareService.aidl \
		core/java/android/os/IMessenger.aidl \
		core/java/android/os/INetworkManagementService.aidl \
		@@ -159,14 +167,6 @@ 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/trustedlogic/trustednfc/android/ILlcpConnectionlessSocket.aidl \
		core/java/com/trustedlogic/trustednfc/android/ILlcpServiceSocket.aidl \
		core/java/com/trustedlogic/trustednfc/android/ILlcpSocket.aidl \
		core/java/com/trustedlogic/trustednfc/android/INdefTag.aidl \
		core/java/com/trustedlogic/trustednfc/android/INfcManager.aidl \
		core/java/com/trustedlogic/trustednfc/android/INfcTag.aidl \
		core/java/com/trustedlogic/trustednfc/android/IP2pInitiator.aidl \
		core/java/com/trustedlogic/trustednfc/android/IP2pTarget.aidl \
		location/java/android/location/IGeocodeProvider.aidl \
		location/java/android/location/IGpsStatusListener.aidl \
		location/java/android/location/IGpsStatusProvider.aidl \
		@@ -249,6 +249,10 @@ aidl_files := \
		frameworks/base/core/java/android/content/res/Configuration.aidl \
		frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
		frameworks/base/core/java/android/net/Uri.aidl \
		frameworks/base/core/java/android/nfc/NdefMessage.aidl \
		frameworks/base/core/java/android/nfc/NdefRecord.aidl \
		frameworks/base/core/java/android/nfc/Tag.aidl \
		frameworks/base/core/java/android/nfc/NdefTag.aidl \
		frameworks/base/core/java/android/os/Bundle.aidl \
		frameworks/base/core/java/android/os/DropBoxManager.aidl \
		frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

CleanSpec.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverb_inte
		$(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, 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/com/trustedlogic)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

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

api/current.xml

+664 −0

Original line number	Diff line number	Diff line
		@@ -24649,6 +24649,17 @@
		visibility="public"
		>
		</field>
		<field name="COLUMN_MEDIAPROVIDER_URI"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""mediaprovider_uri""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="COLUMN_MEDIA_TYPE"
		type="java.lang.String"
		transient="false"
		@@ -102984,6 +102995,33 @@
		</package>
		<package name="android.nfc"
		>
		<class name="FormatException"
		extends="java.lang.Exception"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="FormatException"
		type="android.nfc.FormatException"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</constructor>
		<constructor name="FormatException"
		type="android.nfc.FormatException"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="message" type="java.lang.String">
		</parameter>
		</constructor>
		</class>
		<class name="NdefMessage"
		extends="java.lang.Object"
		abstract="false"
		@@ -103323,6 +103361,632 @@
		>
		</field>
		</class>
		<class name="NdefTag"
		extends="android.nfc.Tag"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.os.Parcelable">
		</implements>
		<method name="getNdefMessages"
		return="android.nfc.NdefMessage[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getNdefMessages"
		return="android.nfc.NdefMessage[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="target" type="java.lang.String">
		</parameter>
		</method>
		<method name="getNdefTargets"
		return="java.lang.String[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<field name="CREATOR"
		type="android.os.Parcelable.Creator"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_MIFARE_CLASSIC"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""type_mifare_classic""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_OTHER"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""other""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_TYPE_1"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""type_1""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_TYPE_2"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""type_2""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_TYPE_3"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""type_3""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_TYPE_4"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""type_4""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="NdefTagConnection"
		extends="android.nfc.RawTagConnection"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="getModeHint"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="makeReadOnly"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="readNdefMessages"
		return="android.nfc.NdefMessage[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="FormatException" type="android.nfc.FormatException">
		</exception>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="writeNdefMessage"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="message" type="android.nfc.NdefMessage">
		</parameter>
		<exception name="FormatException" type="android.nfc.FormatException">
		</exception>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<field name="NDEF_MODE_READ_ONCE"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NDEF_MODE_READ_ONLY"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NDEF_MODE_UNKNOWN"
		type="int"
		transient="false"
		volatile="false"
		value="5"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NDEF_MODE_WRITE_MANY"
		type="int"
		transient="false"
		volatile="false"
		value="4"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="NDEF_MODE_WRITE_ONCE"
		type="int"
		transient="false"
		volatile="false"
		value="3"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="NfcAdapter"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="createNdefTagConnection"
		return="android.nfc.NdefTagConnection"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="tag" type="android.nfc.NdefTag">
		</parameter>
		</method>
		<method name="createNdefTagConnection"
		return="android.nfc.NdefTagConnection"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="tag" type="android.nfc.NdefTag">
		</parameter>
		<parameter name="target" type="java.lang.String">
		</parameter>
		</method>
		<method name="createRawTagConnection"
		return="android.nfc.RawTagConnection"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="tag" type="android.nfc.Tag">
		</parameter>
		</method>
		<method name="createRawTagConnection"
		return="android.nfc.RawTagConnection"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="tag" type="android.nfc.Tag">
		</parameter>
		<parameter name="target" type="java.lang.String">
		</parameter>
		</method>
		<method name="getDefaultAdapter"
		return="android.nfc.NfcAdapter"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getLocalNdefMessage"
		return="android.nfc.NdefMessage"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="isTagDiscoveryEnabled"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="setLocalNdefMessage"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="message" type="android.nfc.NdefMessage">
		</parameter>
		</method>
		<field name="ACTION_NDEF_TAG_DISCOVERED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.nfc.action.NDEF_TAG_DISCOVERED""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_TAG_DISCOVERED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.nfc.action.TAG_DISCOVERED""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_TAG"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.nfc.extra.TAG""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="RawTagConnection"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="close"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="connect"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="getTag"
		return="android.nfc.Tag"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getTagTarget"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="isConnected"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="transceive"
		return="byte[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="data" type="byte[]">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		</class>
		<class name="Tag"
		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="getId"
		return="byte[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getRawTargets"
		return="java.lang.String[]"
		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="dest" type="android.os.Parcel">
		</parameter>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<field name="CREATOR"
		type="android.os.Parcelable.Creator"
		transient="false"
		volatile="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_ISO_14443_3A"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""iso14443_3a""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_ISO_14443_3B"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""iso14443_3b""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_ISO_14443_3B_PRIME"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""iso14443_3b""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_ISO_14443_4"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""iso14443_4""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_ISO_15693"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""iso15693""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_JIS_X_6319_4"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""jis_x_6319_4""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_OTHER"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""other""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_TOPAZ"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""topaz""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		</package>
		<package name="android.opengl"
		>

core/java/android/app/ContextImpl.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -102,9 +102,6 @@ import android.view.inputmethod.InputMethodManager;
		import android.accounts.AccountManager;
		import android.accounts.IAccountManager;
		import android.app.admin.DevicePolicyManager;
		import com.trustedlogic.trustednfc.android.NfcManager;
		import com.trustedlogic.trustednfc.android.INfcManager;

		import com.android.internal.os.IDropBoxManagerService;

		import java.io.File;
		@@ -173,7 +170,6 @@ class ContextImpl extends Context {
		private static ThrottleManager sThrottleManager;
		private static WifiManager sWifiManager;
		private static LocationManager sLocationManager;
		private static NfcManager sNfcManager;
		private static final HashMap<String, SharedPreferencesImpl> sSharedPrefs =
		new HashMap<String, SharedPreferencesImpl>();

		@@ -972,8 +968,6 @@ class ContextImpl extends Context {
		return getClipboardManager();
		} else if (WALLPAPER_SERVICE.equals(name)) {
		return getWallpaperManager();
		} else if (NFC_SERVICE.equals(name)) {
		return getNfcManager();
		} else if (DROPBOX_SERVICE.equals(name)) {
		return getDropBoxManager();
		} else if (DEVICE_POLICY_SERVICE.equals(name)) {
		@@ -1209,21 +1203,6 @@ class ContextImpl extends Context {
		return mDownloadManager;
		}

		private NfcManager getNfcManager()
		{
		synchronized (sSync) {
		if (sNfcManager == null) {
		IBinder b = ServiceManager.getService(NFC_SERVICE);
		if (b == null) {
		return null;
		}
		INfcManager service = INfcManager.Stub.asInterface(b);
		sNfcManager = new NfcManager(service, mMainThread.getHandler());
		}
		}
		return sNfcManager;
		}

		@Override
		public int checkPermission(String permission, int pid, int uid) {
		if (permission == null) {

core/java/android/app/DownloadManager.java

+34 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.os.Environment;
		import android.os.ParcelFileDescriptor;
		import android.provider.BaseColumns;
		import android.provider.Downloads;
		import android.util.Log;
		import android.util.Pair;

		import java.io.File;
		@@ -136,6 +135,12 @@ public class DownloadManager {
		*/
		public final static String COLUMN_LAST_MODIFIED_TIMESTAMP = "last_modified_timestamp";

		/**
		* The URI to the corresponding entry in MediaProvider for this downloaded entry. It is
		* used to delete the entries from MediaProvider database when it is deleted from the
		* downloaded list.
		*/
		public static final String COLUMN_MEDIAPROVIDER_URI = "mediaprovider_uri";

		/**
		* Value of {@link #COLUMN_STATUS} when the download is waiting to start.
		@@ -266,6 +271,7 @@ public class DownloadManager {
		// this array must contain all public columns
		private static final String[] COLUMNS = new String[] {
		COLUMN_ID,
		COLUMN_MEDIAPROVIDER_URI,
		COLUMN_TITLE,
		COLUMN_DESCRIPTION,
		COLUMN_URI,
		@@ -281,6 +287,7 @@ public class DownloadManager {
		// columns to request from DownloadProvider
		private static final String[] UNDERLYING_COLUMNS = new String[] {
		Downloads.Impl._ID,
		Downloads.Impl.COLUMN_MEDIAPROVIDER_URI,
		Downloads.COLUMN_TITLE,
		Downloads.COLUMN_DESCRIPTION,
		Downloads.COLUMN_URI,
		@@ -677,6 +684,9 @@ public class DownloadManager {
		selectionParts.add(Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI + " != '0'");
		}

		// only return rows which are not marked 'deleted = 1'
		selectionParts.add(Downloads.Impl.COLUMN_DELETED + " != '1'");

		String selection = joinStrings(" AND ", selectionParts);
		String orderDirection = (mOrderDirection == ORDER_ASCENDING ? "ASC" : "DESC");
		String orderBy = mOrderByColumn + " " + orderDirection;
		@@ -742,6 +752,26 @@ public class DownloadManager {
		return id;
		}

		/**
		* Marks the specified download as 'to be deleted'. This is done when a completed download
		* is to be removed but the row was stored without enough info to delete the corresponding
		* metadata from Mediaprovider database. Actual cleanup of this row is done in DownloadService.
		*
		* @param ids the IDs of the downloads to be marked 'deleted'
		* @return the number of downloads actually updated
		* @hide
		*/
		public int markRowDeleted(long... ids) {
		if (ids == null \|\| ids.length == 0) {
		// called with nothing to remove!
		throw new IllegalArgumentException("input param 'ids' can't be null");
		}
		ContentValues values = new ContentValues();
		values.put(Downloads.Impl.COLUMN_DELETED, 1);
		return mResolver.update(mBaseUri, values, getWhereClauseForIds(ids),
		getWhereArgsForIds(ids));
		}

		/**
		* Cancel downloads and remove them from the download manager. Each download will be stopped if
		* it was running, and it will no longer be accessible through the download manager. If a file
		@@ -950,6 +980,9 @@ public class DownloadManager {
		if (column.equals(COLUMN_MEDIA_TYPE)) {
		return getUnderlyingString(Downloads.COLUMN_MIME_TYPE);
		}
		if (column.equals(COLUMN_MEDIAPROVIDER_URI)) {
		return getUnderlyingString(Downloads.Impl.COLUMN_MEDIAPROVIDER_URI);
		}

		assert column.equals(COLUMN_LOCAL_URI);
		return getLocalUri();