Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev
This commit is contained in:
@@ -44,6 +44,7 @@ import android.os.Bundle;
|
|||||||
import android.os.PowerManager;
|
import android.os.PowerManager;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
import android.util.FeatureFlagUtils;
|
||||||
import android.view.ContextMenu;
|
import android.view.ContextMenu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@@ -131,6 +132,7 @@ public class NetworkProviderSettingsTest {
|
|||||||
mNetworkProviderSettings.mResetInternetPreference = mResetInternetPreference;
|
mNetworkProviderSettings.mResetInternetPreference = mResetInternetPreference;
|
||||||
mNetworkProviderSettings.mAirplaneModeMsgPreference = mAirplaneModeMsgPreference;
|
mNetworkProviderSettings.mAirplaneModeMsgPreference = mAirplaneModeMsgPreference;
|
||||||
mNetworkProviderSettings.mAirplaneModeEnabler = mAirplaneModeEnabler;
|
mNetworkProviderSettings.mAirplaneModeEnabler = mAirplaneModeEnabler;
|
||||||
|
FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Reference in New Issue
Block a user