Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev

Browse Source 
* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
  Hide UsbDevice changes in KKWT DO NOT MERGE
This commit is contained in:
Justin Koh
2014-05-05 22:42:15 +00:00
committed by Android Git Automerger
parent fd04632ab5 9cb3b162eb
commit 5aa34455d7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

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

3
core/java/android/hardware/usb/UsbDevice.java
View File

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