Merge "Fix test that assumed that previews were disabled by default" into studio-1.3-dev automerge: bf6ce10android-m-preview

automerge: e3ce426

* commit 'e3ce4265d2672616266f28d7f8a908e3f2b00c52':
  Fix test that assumed that previews were disabled by default

1 files changed, 4 insertions, 1 deletions

diff --git a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java
index 8135c08..4928540 100755
--- a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java
+++ b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java
@@ -982,7 +982,10 @@ public class PackagesDiffLogicTest extends TestCase {
     public void testToolsPreviewsDisabled() {
         // Test: No local tools installed. The remote server has both tools and platforms
         // in release and RC versions. However the settings "enable previews" is disabled
-        // (which is the default) so the previews are not actually loaded from the server.
+        // so the previews are not actually loaded from the server.
+
+        // Disable previews in the settings
+        u.overrideSetting(ISettingsPage.KEY_ENABLE_PREVIEWS, false);
 
         SdkSource src1 = new SdkRepoSource("http://1.example.com/url1", "repo1");