Merge "StorageManager: API_CHANGE: Move StorageManager into android.storage" (a55272af) · Commits · e / os / android_frameworks_base

api/current.xml

+120 −117

Original line number	Diff line number	Diff line
		@@ -117394,123 +117394,6 @@
		</parameter>
		</method>
		</class>
		<interface name="StorageEventListener"
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="onMediaInserted"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="label" type="java.lang.String">
		</parameter>
		<parameter name="path" type="java.lang.String">
		</parameter>
		<parameter name="major" type="int">
		</parameter>
		<parameter name="minor" type="int">
		</parameter>
		</method>
		<method name="onMediaRemoved"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="label" type="java.lang.String">
		</parameter>
		<parameter name="path" type="java.lang.String">
		</parameter>
		<parameter name="major" type="int">
		</parameter>
		<parameter name="minor" type="int">
		</parameter>
		<parameter name="clean" type="boolean">
		</parameter>
		</method>
		<method name="onShareAvailabilityChanged"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="method" type="java.lang.String">
		</parameter>
		<parameter name="available" type="boolean">
		</parameter>
		</method>
		<method name="onVolumeStateChanged"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="label" type="java.lang.String">
		</parameter>
		<parameter name="path" type="java.lang.String">
		</parameter>
		<parameter name="oldState" type="java.lang.String">
		</parameter>
		<parameter name="newState" type="java.lang.String">
		</parameter>
		</method>
		</interface>
		<class name="StorageManager"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="registerListener"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="listener" type="android.os.StorageEventListener">
		</parameter>
		</method>
		<method name="unregisterListener"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="listener" type="android.os.StorageEventListener">
		</parameter>
		</method>
		</class>
		<class name="SystemClock"
		extends="java.lang.Object"
		abstract="false"
		@@ -136182,6 +136065,126 @@
		</method>
		</interface>
		</package>
		<package name="android.storage"
		>
		<interface name="StorageEventListener"
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="onMediaInserted"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="label" type="java.lang.String">
		</parameter>
		<parameter name="path" type="java.lang.String">
		</parameter>
		<parameter name="major" type="int">
		</parameter>
		<parameter name="minor" type="int">
		</parameter>
		</method>
		<method name="onMediaRemoved"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="label" type="java.lang.String">
		</parameter>
		<parameter name="path" type="java.lang.String">
		</parameter>
		<parameter name="major" type="int">
		</parameter>
		<parameter name="minor" type="int">
		</parameter>
		<parameter name="clean" type="boolean">
		</parameter>
		</method>
		<method name="onShareAvailabilityChanged"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="method" type="java.lang.String">
		</parameter>
		<parameter name="available" type="boolean">
		</parameter>
		</method>
		<method name="onVolumeStateChanged"
		return="void"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="label" type="java.lang.String">
		</parameter>
		<parameter name="path" type="java.lang.String">
		</parameter>
		<parameter name="oldState" type="java.lang.String">
		</parameter>
		<parameter name="newState" type="java.lang.String">
		</parameter>
		</method>
		</interface>
		<class name="StorageManager"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="registerListener"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="listener" type="android.storage.StorageEventListener">
		</parameter>
		</method>
		<method name="unregisterListener"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="listener" type="android.storage.StorageEventListener">
		</parameter>
		</method>
		</class>
		</package>
		<package name="android.telephony"
		>
		<class name="CellLocation"

core/java/android/app/ApplicationContext.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,10 +81,10 @@ import android.os.PowerManager;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.StorageManager;
		import android.os.StatFs;
		import android.os.Vibrator;
		import android.os.FileUtils.FileStatus;
		import android.storage.StorageManager;
		import android.telephony.TelephonyManager;
		import android.text.ClipboardManager;
		import android.util.AndroidRuntimeException;

core/java/android/content/Context.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1110,7 +1110,7 @@ public abstract class Context {
		* @see #SENSOR_SERVICE
		* @see android.hardware.SensorManager
		* @see #STORAGE_SERVICE
		* @see android.os.StorageManager
		* @see android.storage.StorageManager
		* @see #VIBRATOR_SERVICE
		* @see android.os.Vibrator
		* @see #CONNECTIVITY_SERVICE
		@@ -1243,11 +1243,11 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.os.StorageManager} for accesssing system storage
		* android.storage.StorageManager} for accesssing system storage
		* functions.
		*
		* @see #getSystemService
		* @see android.os.StorageManager
		* @see android.storage.StorageManager
		*/
		public static final String STORAGE_SERVICE = "storage";

core/java/android/os/StorageEventListener.java→core/java/android/storage/StorageEventListener.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package android.os;
		package android.storage;

		/**
		* Used for receiving notifications from the StorageManager

core/java/android/os/StorageManager.java→core/java/android/storage/StorageManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package android.os;
		package android.storage;

		import android.content.Context;
		import android.os.Binder;
		@@ -261,9 +261,9 @@ public class StorageManager


		/**
		* Registers a {@link android.os.StorageEventListener StorageEventListener}.
		* Registers a {@link android.storage.StorageEventListener StorageEventListener}.
		*
		* @param listener A {@link android.os.StorageEventListener StorageEventListener} object.
		* @param listener A {@link android.storage.StorageEventListener StorageEventListener} object.
		*
		*/
		public void registerListener(StorageEventListener listener) {
		@@ -277,9 +277,9 @@ public class StorageManager
		}

		/**
		* Unregisters a {@link android.os.StorageEventListener StorageEventListener}.
		* Unregisters a {@link android.storage.StorageEventListener StorageEventListener}.
		*
		* @param listener A {@link android.os.StorageEventListener StorageEventListener} object.
		* @param listener A {@link android.storage.StorageEventListener StorageEventListener} object.
		*
		*/
		public void unregisterListener(StorageEventListener listener) {