Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java
index 03fddec..d6dcbf1 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java
@@ -100,7 +100,8 @@
if (mOnItemSelectedListener == null) {
return;
}
- mOnItemSelectedListener.onItemSelected(mStorageAdapter.getItem(position));
+ mOnItemSelectedListener.onItemSelected(
+ (StorageEntry) mSpinnerPreference.getSelectedItem());
}
@Override
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 5582ff4..249ce72 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -32,10 +32,8 @@
"platform-test-annotations",
"truth-prebuilt",
"ub-uiautomator",
- "SettingsLibSettingsSpinner",
- "SettingsLibUsageProgressBarPreference",
- "SettingsLibTwoTargetPreference",
- "SettingsLibMainSwitchPreference",
+ // Don't add SettingsLib libraries here - you can use them directly as they are in the
+ // instrumented Settings app.
],
// Include all test java files.