Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec7c9ff0 authored by Kenny Root's avatar Kenny Root
Browse files

Hide USB mass storage APIs in StorageManager 

They appear to have been unhidden in a bad merge from gingerbread.

Change-Id: Ice0fc865425d5d885af3c2e90a7ffeaa1d623b80
parent 38f79d01

api/11.xml

+0 −70
Original line number Diff line number Diff line
@@ -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"

api/current.xml

+0 −70
Original line number Diff line number Diff line
@@ -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"

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

+10 −0
Original line number Diff line number Diff line
@@ -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 {