PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev am: dc09b3ff49

Browse Source 
am: f549cd1e05

Change-Id: Ied4f01787aec0cf8f261483e942615abd1889918
This commit is contained in:
hjchangliao
2018-04-25 10:23:11 -07:00
committed by android-build-merger
parent 4333ac1e2e f549cd1e05
commit 98015e7c93
4 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
View File

@@ -78,7 +78,6 @@ public class ConnectedDeviceDashboardFragmentTest {
final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES,
NfcPreferenceController.KEY_TOGGLE_NFC);
assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES);
}
}