diff --git a/api/11.xml b/api/11.xml
index 1ac57a16d1fc8..5b6765b888ee8 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -147426,28 +147426,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<method name="disableUsbMassStorage"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="enableUsbMassStorage"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="getMountedObbPath"
  return="java.lang.String"
  abstract="false"
@@ -147474,28 +147452,6 @@
 <parameter name="filename" type="java.lang.String">
 </parameter>
 </method>
-<method name="isUsbMassStorageConnected"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="isUsbMassStorageEnabled"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="mountObb"
  return="boolean"
  abstract="false"
@@ -147513,19 +147469,6 @@
 <parameter name="listener" type="android.os.storage.OnObbStateChangeListener">
 </parameter>
 </method>
-<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.storage.StorageEventListener">
-</parameter>
-</method>
 <method name="unmountObb"
  return="boolean"
  abstract="false"
@@ -147543,19 +147486,6 @@
 <parameter name="listener" type="android.os.storage.OnObbStateChangeListener">
 </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.storage.StorageEventListener">
-</parameter>
-</method>
 </class>
 <class name="StorageResultCode"
  extends="java.lang.Object"
diff --git a/api/current.xml b/api/current.xml
index 6b79074729819..ef23af2ff0006 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -147477,28 +147477,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<method name="disableUsbMassStorage"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="enableUsbMassStorage"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="getMountedObbPath"
  return="java.lang.String"
  abstract="false"
@@ -147525,28 +147503,6 @@
 <parameter name="filename" type="java.lang.String">
 </parameter>
 </method>
-<method name="isUsbMassStorageConnected"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
-<method name="isUsbMassStorageEnabled"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="mountObb"
  return="boolean"
  abstract="false"
@@ -147564,19 +147520,6 @@
 <parameter name="listener" type="android.os.storage.OnObbStateChangeListener">
 </parameter>
 </method>
-<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.storage.StorageEventListener">
-</parameter>
-</method>
 <method name="unmountObb"
  return="boolean"
  abstract="false"
@@ -147594,19 +147537,6 @@
 <parameter name="listener" type="android.os.storage.OnObbStateChangeListener">
 </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.storage.StorageEventListener">
-</parameter>
-</method>
 </class>
 <class name="StorageResultCode"
  extends="java.lang.Object"
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index fb7693712ed08..73ac79f302b51 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -312,6 +312,7 @@ public class StorageManager
      *
      * @param listener A {@link android.os.storage.StorageEventListener StorageEventListener} object.
      *
+     * @hide
      */
     public void registerListener(StorageEventListener listener) {
         if (listener == null) {
@@ -328,6 +329,7 @@ public class StorageManager
      *
      * @param listener A {@link android.os.storage.StorageEventListener StorageEventListener} object.
      *
+     * @hide
      */
     public void unregisterListener(StorageEventListener listener) {
         if (listener == null) {
@@ -348,6 +350,8 @@ public class StorageManager
 
     /**
      * Enables USB Mass Storage (UMS) on the device.
+     *
+     * @hide
      */
     public void enableUsbMassStorage() {
         try {
@@ -359,6 +363,8 @@ public class StorageManager
 
     /**
      * Disables USB Mass Storage (UMS) on the device.
+     *
+     * @hide
      */
     public void disableUsbMassStorage() {
         try {
@@ -371,6 +377,8 @@ public class StorageManager
     /**
      * Query if a USB Mass Storage (UMS) host is connected.
      * @return true if UMS host is connected.
+     *
+     * @hide
      */
     public boolean isUsbMassStorageConnected() {
         try {
@@ -384,6 +392,8 @@ public class StorageManager
     /**
      * Query if a USB Mass Storage (UMS) is enabled on the device.
      * @return true if UMS host is enabled.
+     *
+     * @hide
      */
     public boolean isUsbMassStorageEnabled() {
         try {