commit 723c5b38b8fbd2db3a64b1ce782f8f760271ac98
author Baligh Uddin <baligh@google.com> Fri Sep 11 16:19:17 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 11 16:19:17 2015 +0000
tree 51ac07d53b407a018e2d853d2a84903c51fd9219
parent 5c49b5a4b2cb1d90a02ce8610340db7020715de7
parent 196555c71b77f83d8c36556a6e3b94e6a6df48bc

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

src/com/android/settings/CredentialCheckResultTracker.java

diff --git a/src/com/android/settings/CredentialCheckResultTracker.java b/src/com/android/settings/CredentialCheckResultTracker.java
index 7f72caa..5c55073 100644
--- a/src/com/android/settings/CredentialCheckResultTracker.java
+++ b/src/com/android/settings/CredentialCheckResultTracker.java
@@ -23,7 +23,7 @@
 /**
  * An invisible retained fragment to track lock check result.
  */
-class CredentialCheckResultTracker extends Fragment {
+public class CredentialCheckResultTracker extends Fragment {
 
     private Listener mListener;
     private boolean mHasResult = false;

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();
     }