Merge "Move USB framework support from android.hardware to android.hardware.usb package" (04e1a962) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ LOCAL_SRC_FILES += \
		core/java/android/content/pm/IPackageMoveObserver.aidl \
		core/java/android/content/pm/IPackageStatsObserver.aidl \
		core/java/android/database/IContentObserver.aidl \
		core/java/android/hardware/IUsbManager.aidl \
		core/java/android/hardware/usb/IUsbManager.aidl \
		core/java/android/net/IConnectivityManager.aidl \
		core/java/android/net/INetworkManagementEventObserver.aidl \
		core/java/android/net/IThrottleManager.aidl \

CleanSpec.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ModelViewer_intermediates/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PerfTest_intermediates/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/RSTest_intermediates/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/hardware/IUsbManager.java)


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

api/current.xml

+31 −28

Original line number	Diff line number	Diff line
		@@ -94374,11 +94374,14 @@
		>
		</field>
		</class>
		</package>
		<package name="android.hardware.usb"
		>
		<class name="UsbAccessory"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		@@ -94474,7 +94477,7 @@
		visibility="public"
		>
		<constructor name="UsbConstants"
		type="android.hardware.UsbConstants"
		type="android.hardware.usb.UsbConstants"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -94865,7 +94868,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="endpoint" type="android.hardware.UsbEndpoint">
		<parameter name="endpoint" type="android.hardware.usb.UsbEndpoint">
		</parameter>
		<parameter name="buffer" type="byte[]">
		</parameter>
		@@ -94884,7 +94887,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="intf" type="android.hardware.UsbInterface">
		<parameter name="intf" type="android.hardware.usb.UsbInterface">
		</parameter>
		<parameter name="force" type="boolean">
		</parameter>
		@@ -95029,7 +95032,7 @@
		>
		</method>
		<method name="getInterface"
		return="android.hardware.UsbInterface"
		return="android.hardware.usb.UsbInterface"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95095,11 +95098,11 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="intf" type="android.hardware.UsbInterface">
		<parameter name="intf" type="android.hardware.usb.UsbInterface">
		</parameter>
		</method>
		<method name="requestWait"
		return="android.hardware.UsbRequest"
		return="android.hardware.usb.UsbRequest"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95179,7 +95182,7 @@
		>
		</method>
		<method name="getDevice"
		return="android.hardware.UsbDevice"
		return="android.hardware.usb.UsbDevice"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95212,7 +95215,7 @@
		>
		</method>
		<method name="getInterface"
		return="android.hardware.UsbInterface"
		return="android.hardware.usb.UsbInterface"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95285,7 +95288,7 @@
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		@@ -95303,7 +95306,7 @@
		>
		</method>
		<method name="getDevice"
		return="android.hardware.UsbDevice"
		return="android.hardware.usb.UsbDevice"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95314,7 +95317,7 @@
		>
		</method>
		<method name="getEndpoint"
		return="android.hardware.UsbEndpoint"
		return="android.hardware.usb.UsbEndpoint"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95416,7 +95419,7 @@
		visibility="public"
		>
		<method name="getAccessoryList"
		return="android.hardware.UsbAccessory[]"
		return="android.hardware.usb.UsbAccessory[]"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95427,7 +95430,7 @@
		>
		</method>
		<method name="getDeviceList"
		return="java.util.HashMap<java.lang.String, android.hardware.UsbDevice>"
		return="java.util.HashMap<java.lang.String, android.hardware.usb.UsbDevice>"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95473,7 +95476,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="accessory" type="android.hardware.UsbAccessory">
		<parameter name="accessory" type="android.hardware.usb.UsbAccessory">
		</parameter>
		</method>
		<method name="openDevice"
		@@ -95486,14 +95489,14 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="device" type="android.hardware.UsbDevice">
		<parameter name="device" type="android.hardware.usb.UsbDevice">
		</parameter>
		</method>
		<field name="ACTION_USB_ACCESSORY_ATTACHED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.action.USB_ACCESSORY_ATTACHED""
		value=""android.hardware.usb.action.USB_ACCESSORY_ATTACHED""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -95504,7 +95507,7 @@
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.action.USB_ACCESSORY_DETACHED""
		value=""android.hardware.usb.action.USB_ACCESSORY_DETACHED""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -95515,7 +95518,7 @@
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.action.USB_DEVICE_ATTACHED""
		value=""android.hardware.usb.action.USB_DEVICE_ATTACHED""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -95526,7 +95529,7 @@
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.action.USB_DEVICE_DETACHED""
		value=""android.hardware.usb.action.USB_DEVICE_DETACHED""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -95537,7 +95540,7 @@
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.action.USB_STATE""
		value=""android.hardware.usb.action.USB_STATE""
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -95675,7 +95678,7 @@
		visibility="public"
		>
		<constructor name="UsbRequest"
		type="android.hardware.UsbRequest"
		type="android.hardware.usb.UsbRequest"
		static="false"
		final="false"
		deprecated="not deprecated"
		@@ -95716,7 +95719,7 @@
		>
		</method>
		<method name="getEndpoint"
		return="android.hardware.UsbEndpoint"
		return="android.hardware.usb.UsbEndpoint"
		abstract="false"
		native="false"
		synchronized="false"
		@@ -95736,7 +95739,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="endpoint" type="android.hardware.UsbEndpoint">
		<parameter name="endpoint" type="android.hardware.usb.UsbEndpoint">
		</parameter>
		</method>
		<method name="queue"
		@@ -112707,7 +112710,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="device" type="android.hardware.UsbDevice">
		<parameter name="device" type="android.hardware.usb.UsbDevice">
		</parameter>
		</method>
		<method name="removeListener"
		@@ -113474,7 +113477,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="device" type="android.hardware.UsbDevice">
		<parameter name="device" type="android.hardware.usb.UsbDevice">
		</parameter>
		</constructor>
		<method name="close"
		@@ -113667,7 +113670,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="manager" type="android.hardware.UsbManager">
		<parameter name="manager" type="android.hardware.usb.UsbManager">
		</parameter>
		</method>
		</class>
		@@ -266666,7 +266669,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="arg0" type="T">
		<parameter name="t" type="T">
		</parameter>
		</method>
		</interface>

core/java/android/app/ContextImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,9 +41,9 @@ import android.database.sqlite.SQLiteDatabase;
		import android.database.sqlite.SQLiteDatabase.CursorFactory;
		import android.graphics.Bitmap;
		import android.graphics.drawable.Drawable;
		import android.hardware.IUsbManager;
		import android.hardware.SensorManager;
		import android.hardware.UsbManager;
		import android.hardware.usb.IUsbManager;
		import android.hardware.usb.UsbManager;
		import android.location.CountryDetector;
		import android.location.ICountryDetector;
		import android.location.ILocationManager;

core/java/android/content/Context.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1664,11 +1664,11 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.hardware.UsbManager} for access to USB devices (as a USB host)
		* android.hardware.usb.UsbManager} for access to USB devices (as a USB host)
		* and for controlling this device's behavior as a USB device.
		*
		* @see #getSystemService
		* @see android.harware.UsbManager
		* @see android.harware.usb.UsbManager
		*/
		public static final String USB_SERVICE = "usb";