commit 5c49b5a4b2cb1d90a02ce8610340db7020715de7
author Jorim Jaggi <jjaggi@google.com> Fri Sep 11 01:58:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 11 01:58:55 2015 +0000
tree 45ea160d9bf8842d774066296b39178dd8c08019
parent d3c60afe5267eb614b9c0a99b797e6bbb51de16f
parent 69671dafc8b950c71f2ed303a145feb6f4d4fba8

Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev

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 846d6e3..210e0a0 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -71,8 +71,7 @@
         if (mPort != null) {
             int power = mPortStatus.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE
                     ? MODE_POWER_SOURCE : MODE_POWER_SINK;
-            return power | (mPortStatus.getCurrentDataRole() == UsbPort.DATA_ROLE_DEVICE
-                    ? getUsbDataMode() : MODE_DATA_NONE);
+            return power | getUsbDataMode();
         }
         return MODE_POWER_SINK | getUsbDataMode();
     }