Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a7f5524 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev

parents 82c1e0ae 6bf47f62

src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll 
        if (mOnItemSelectedListener == null) {

            return;

        }

        mOnItemSelectedListener.onItemSelected(mStorageAdapter.getItem(position));

        mOnItemSelectedListener.onItemSelected(

                (StorageEntry) mSpinnerPreference.getSelectedItem());

    }



    @Override

tests/unit/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ android_test { 
        "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.