Merge "Fix flaky test error"

This commit is contained in:
TreeHugger Robot
2019-08-19 02:44:56 +00:00
committed by Android (Google) Code Review

View File

@@ -221,7 +221,7 @@ public final class BluetoothDevicePreference extends GearPreference implements
return mCachedDevice return mCachedDevice
.compareTo(((BluetoothDevicePreference) another).mCachedDevice); .compareTo(((BluetoothDevicePreference) another).mCachedDevice);
case SortType.TYPE_FIFO: case SortType.TYPE_FIFO:
return (int)(mCurrentTime - ((BluetoothDevicePreference) another).mCurrentTime); return mCurrentTime > ((BluetoothDevicePreference) another).mCurrentTime ? 1 : -1;
default: default:
return super.compareTo(another); return super.compareTo(another);
} }