commit 41eab2c20329316b3263df1a88b1671302b4e807
author hughchen <hughchen@google.com> Wed Aug 14 16:27:12 2019 +0800
committer Raff Tsai <rafftsai@google.com> Fri Aug 16 01:26:42 2019 +0000
tree 58fafd5688ac05ee12d070e59b47e9292a6cb3b8
parent 772e21598e2d430cf31c8b479bfbad45a9d2894d

Fix flaky test error

Before this CL, we didn't consider the case of two
preferences timestamp are the same.

If 2 preferences timestamp are the same, the second preference
will first out. it will cause test case will fail some times.

In this CL, if two BluetoothDevicePreference's timestamp are the same,
The first BluetoothDevicePreference is first out.

Bug: 138547532
Test: make -j42 RunSettingsRoboTests
Change-Id: I7366275e8edf615c582481a570ea0c25b8d37a66

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