Merge "Fix flaky test error"
This commit is contained in:
committed by
Android (Google) Code Review
commit
31c7ac1017
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user