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

Merge commit '54f33d9af22e62629798555a3cde4e784bd8ba54' into manual_merge_54f33d9

Browse Source 
Change-Id: Icfd9bc3eff034d33e733dbb8386949c9ec345e58
This commit is contained in:
Jerry Zhang
2016-11-17 10:48:26 -08:00
parent e05713d93b 54f33d9af2
commit 4c4666c5ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/usb/IUsbManager.aidl
View File

@@ -88,10 +88,10 @@ interface IUsbManager
/* Returns true if the specified USB function is enabled. */
boolean isFunctionEnabled(String function);
/* Sets the current USB function as well as whether USB data
* (for example, MTP exposed pictures) should be made available
/* Sets the current USB function as well as whether USB data
* (for example, MTP exposed pictures) should be made available
* on the USB connection. Unlocking data should only be done with
* user involvement, since exposing pictures or other data could
* user involvement, since exposing pictures or other data could
* leak sensitive user information.
*/
void setCurrentFunction(String function, boolean usbDataUnlocked);