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
This commit is contained in:
hughchen
2019-08-14 16:27:12 +08:00
committed by Raff Tsai
parent 772e21598e
commit 41eab2c203

View File

@@ -221,7 +221,7 @@ public final class BluetoothDevicePreference extends GearPreference implements
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);
}