PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

Browse Source 
* commit '9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
  Fix Usb-C dialog issues
This commit is contained in:
Jason Monk
2015-08-17 15:35:45 +00:00
committed by Android Git Automerger
parent 7533cd473d 9d59a2441e
commit 99df2376a1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1828,7 +1828,7 @@
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_USB" android:permission="android.permission.MANAGE_USB"
android:theme="@style/Transparent"> android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
</activity> </activity>
<activity android:name=".bluetooth.RequestPermissionHelperActivity" <activity android:name=".bluetooth.RequestPermissionHelperActivity"

2
src/com/android/settings/deviceinfo/UsbBackend.java
View File

@@ -83,7 +83,7 @@ public class UsbBackend {
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) { } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
return MODE_DATA_MTP; return MODE_DATA_MTP;
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) { } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
return MODE_DATA_MTP; return MODE_DATA_PTP;
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MIDI)) { } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MIDI)) {
return MODE_DATA_MIDI; return MODE_DATA_MIDI;
} }