commit 31c7ac10172bb3220cca837df4cfe2662c56a7b6
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 19 02:44:56 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 19 02:44:56 2019 +0000
tree d66b025dae1b5e5ccff31536895dfb7856831081
parent 7af4e5a77ce1a9d6f0101fde4f2bd4df997e6ab7
parent 41eab2c20329316b3263df1a88b1671302b4e807

Merge "Fix flaky test error"

src/com/android/settings/bluetooth/BluetoothDevicePreference.java

diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index c56c50e..a8b1c97 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -221,7 +221,7 @@
                 return mCachedDevice
                         .compareTo(((BluetoothDevicePreference) another).mCachedDevice);
             case SortType.TYPE_FIFO:
-                return (int)(mCurrentTime - ((BluetoothDevicePreference) another).mCurrentTime);
+                return mCurrentTime > ((BluetoothDevicePreference) another).mCurrentTime ? 1 : -1;
             default:
                 return super.compareTo(another);
         }