Merge "Remove silky flag from tests for official release" into sc-dev (a8e4d51c) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -35,10 +35,8 @@ import android.content.res.Resources;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.util.FeatureFlagUtils;

		import com.android.settings.R;
		import com.android.settings.core.FeatureFlags;

		import org.junit.Before;
		import org.junit.Test;
		@@ -83,7 +81,6 @@ public class BackupSettingsHelperTest {
		when(mBackupManager.getCurrentTransport()).thenReturn("test_transport");
		mBackupSettingsHelper = new BackupSettingsHelper(mContext);
		mUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE));
		FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
		}

		@Test

+0 −3

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import android.graphics.drawable.Icon;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.util.FeatureFlagUtils;
		import android.util.Pair;

		import androidx.fragment.app.FragmentActivity;
		@@ -66,7 +65,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.Utils;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.testutils.FakeFeatureFactory;
		import com.android.settings.testutils.shadow.ShadowTileUtils;
		import com.android.settings.testutils.shadow.ShadowUserManager;
		@@ -146,7 +144,6 @@ public class DashboardFeatureProviderImplTest {
		.thenReturn(new ResolveInfo());
		mFeatureFactory = FakeFeatureFactory.setupForTest();
		mImpl = new DashboardFeatureProviderImpl(mContext);
		FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
		}

		@Test

+0 −3

Original line number	Diff line number	Diff line
		@@ -32,12 +32,10 @@ import static org.mockito.Mockito.when;
		import android.app.Activity;
		import android.content.ComponentName;
		import android.content.Context;
		import android.util.FeatureFlagUtils;

		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.testutils.FakeFeatureFactory;

		import org.junit.After;
		@@ -64,7 +62,6 @@ public class TopLevelBatteryPreferenceControllerTest {
		mController = new TopLevelBatteryPreferenceController(mContext, "test_key");
		mBatterySettingsFeatureProvider =
		mFeatureFactory.batterySettingsFeatureProvider;
		FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
		}

		@After