Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

api/current.txt

@@ -11230,10 +11230,7 @@ package android.hardware.usb {
     method public int getDeviceSubclass();
     method public android.hardware.usb.UsbInterface getInterface(int);
     method public int getInterfaceCount();
-    method public java.lang.String getManufacturerName();
     method public int getProductId();
-    method public java.lang.String getProductName();
-    method public java.lang.String getSerialNumber();
     method public int getVendorId();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator CREATOR;

core/java/android/hardware/usb/UsbDevice.java

@@ -91,6 +91,7 @@ public class UsbDevice implements Parcelable {
      * Returns the manufacturer name of the device.
      *
      * @return the manufacturer name
+     * @hide
      */
     public String getManufacturerName() {
         return mManufacturerName;
@@ -100,6 +101,7 @@ public class UsbDevice implements Parcelable {
      * Returns the product name of the device.
      *
      * @return the product name
+     * @hide
      */
     public String getProductName() {
         return mProductName;
@@ -109,6 +111,7 @@ public class UsbDevice implements Parcelable {
      * Returns the serial number of the device.
      *
      * @return the serial number name
+     * @hide
      */
     public String getSerialNumber() {
         return mSerialNumber;