commit 51ba8b47f501d5fe5915a997507aba2fc246012e
author Jason Monk <jmonk@google.com> Mon Aug 17 15:41:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 17 15:41:16 2015 +0000
tree 8ac95092e050bc8518aa54a68cfa3624a348bc5a
parent f1ad264cf8ee8e0ca2f79c13618f4218bab560b1
parent 99df2376a161d1a1328b64dfd2451aeb2c50e532

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

* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
  Fix Usb-C dialog issues

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b536b20..f199673 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1828,7 +1828,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.MANAGE_USB"
-                  android:theme="@style/Transparent">
+                  android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
         </activity>
 
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"

src/com/android/settings/deviceinfo/UsbBackend.java

diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index c44f2eb..846d6e3 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -83,7 +83,7 @@
         } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
             return MODE_DATA_MTP;
         } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
-            return MODE_DATA_MTP;
+            return MODE_DATA_PTP;
         } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MIDI)) {
             return MODE_DATA_MIDI;
         }