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

Commit a75075e1 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

UsbManager: Hide APIs not needed for USB host or accessory support. 



Bug: 4067029

Change-Id: Ib63ab95a6571d6a691834bfb583a68d2e4cfd22e
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent c72eb911

api/current.xml

+0 −385
Original line number Diff line number Diff line
@@ -95470,32 +95470,6 @@ 
<parameter name="accessory" type="android.hardware.usb.UsbAccessory">

</parameter>

</method>

<method name="isFunctionEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="function" type="java.lang.String">

</parameter>

</method>

<method name="isFunctionSupported"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="function" type="java.lang.String">

</parameter>

</method>

<method name="openAccessory"

 return="android.os.ParcelFileDescriptor"

 abstract="false"
@@ -95596,17 +95570,6 @@ 
 visibility="public"

>

</field>

<field name="ACTION_USB_STATE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.usb.action.USB_STATE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="EXTRA_ACCESSORY"

 type="java.lang.String"

 transient="false"
@@ -95640,105 +95603,6 @@ 
 visibility="public"

>

</field>

<field name="USB_CONFIGURATION"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;configuration&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_CONNECTED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;connected&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_ACCESSORY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;accessory&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_ADB"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;adb&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_DISABLED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;disabled&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_ENABLED"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;enabled&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_MASS_STORAGE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;mass_storage&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_MTP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;mtp&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="USB_FUNCTION_RNDIS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;rndis&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="UsbRequest"

 extends="java.lang.Object"
@@ -112585,255 +112449,6 @@ 
</package>

<package name="android.mtp"

>

<class name="MtpClient"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="MtpClient"

 type="android.mtp.MtpClient"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

</constructor>

<method name="addListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.mtp.MtpClient.Listener">

</parameter>

</method>

<method name="close"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="deleteObject"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

<parameter name="objectHandle" type="int">

</parameter>

</method>

<method name="getDevice"

 return="android.mtp.MtpDevice"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

</method>

<method name="getDevice"

 return="android.mtp.MtpDevice"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="id" type="int">

</parameter>

</method>

<method name="getDeviceList"

 return="java.util.List&lt;android.mtp.MtpDevice&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getObject"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

<parameter name="objectHandle" type="int">

</parameter>

<parameter name="objectSize" type="int">

</parameter>

</method>

<method name="getObjectInfo"

 return="android.mtp.MtpObjectInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

<parameter name="objectHandle" type="int">

</parameter>

</method>

<method name="getObjectList"

 return="java.util.List&lt;android.mtp.MtpObjectInfo&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

<parameter name="storageId" type="int">

</parameter>

<parameter name="objectHandle" type="int">

</parameter>

</method>

<method name="getStorageList"

 return="java.util.List&lt;android.mtp.MtpStorageInfo&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

</method>

<method name="getThumbnail"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

<parameter name="objectHandle" type="int">

</parameter>

</method>

<method name="importFile"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="deviceName" type="java.lang.String">

</parameter>

<parameter name="objectHandle" type="int">

</parameter>

<parameter name="destPath" type="java.lang.String">

</parameter>

</method>

<method name="isCamera"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="device" type="android.hardware.usb.UsbDevice">

</parameter>

</method>

<method name="removeListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.mtp.MtpClient.Listener">

</parameter>

</method>

</class>

<interface name="MtpClient.Listener"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="deviceAdded"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="device" type="android.mtp.MtpDevice">

</parameter>

</method>

<method name="deviceRemoved"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="device" type="android.mtp.MtpDevice">

</parameter>

</method>

</interface>

<class name="MtpConstants"

 extends="java.lang.Object"

 abstract="false"

core/java/android/hardware/usb/UsbManager.java

+25 −1
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ public class UsbManager { 
     * {@link #USB_FUNCTION_MASS_STORAGE}, {@link #USB_FUNCTION_ADB}, {@link #USB_FUNCTION_RNDIS},

     * {@link #USB_FUNCTION_MTP} and {@link #USB_FUNCTION_ACCESSORY}.

     * </ul>

     *

     * {@hide}

     */

    public static final String ACTION_USB_STATE =

            "android.hardware.usb.action.USB_STATE";
@@ -110,42 +112,56 @@ public class UsbManager { 
    /**

     * Boolean extra indicating whether USB is connected or disconnected.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast.

     *

     * {@hide}

     */

    public static final String USB_CONNECTED = "connected";



    /**

     * Integer extra containing currently set USB configuration.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast.

     *

     * {@hide}

     */

    public static final String USB_CONFIGURATION = "configuration";



    /**

     * Name of the USB mass storage USB function.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_MASS_STORAGE = "mass_storage";



    /**

     * Name of the adb USB function.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_ADB = "adb";



    /**

     * Name of the RNDIS ethernet USB function.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_RNDIS = "rndis";



    /**

     * Name of the MTP USB function.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_MTP = "mtp";



    /**

     * Name of the Accessory USB function.

     * Used in extras for the {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_ACCESSORY = "accessory";
@@ -153,6 +169,8 @@ public class UsbManager { 
     * Value indicating that a USB function is enabled.

     * Used in {@link #USB_CONFIGURATION} extras bundle for the

     * {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_ENABLED = "enabled";
@@ -160,6 +178,8 @@ public class UsbManager { 
     * Value indicating that a USB function is disabled.

     * Used in {@link #USB_CONFIGURATION} extras bundle for the

     * {@link #ACTION_USB_STATE} broadcast

     *

     * {@hide}

     */

    public static final String USB_FUNCTION_DISABLED = "disabled";
@@ -378,6 +398,8 @@ public class UsbManager { 
     *

     * @param function name of the USB function

     * @return true if the USB function is supported.

     *

     * {@hide}

     */

    public static boolean isFunctionSupported(String function) {

        return getFunctionEnableFile(function).exists();
@@ -388,6 +410,8 @@ public class UsbManager { 
     *

     * @param function name of the USB function

     * @return true if the USB function is enabled.

     *

     * {@hide}

     */

    public static boolean isFunctionEnabled(String function) {

        try {
@@ -403,7 +427,7 @@ public class UsbManager { 
    /**

     * Enables or disables a USB function.

     *

     * @hide

     * {@hide}

     */

    public static boolean setFunctionEnabled(String function, boolean enable) {

        try {