customize update strategy in Android Studio

[idea/community.git] / platform / platform-impl / src / com / intellij / openapi / updateSettings / impl / UpdateSettings.java

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java
index b693bbf23b638c59ca1ddf790ea818d4d60f80a7..f032bdd57038a20db51cdde17ee536998d9ee641 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettings.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.updateSettings.impl;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
 import com.intellij.openapi.components.*;

+import com.intellij.openapi.updateSettings.UpdateStrategyCustomization;

 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;


@@ -106,7 +107,7 @@ public class UpdateSettings implements PersistentStateComponent<UpdateSettings.S
   }
 
   private void updateDefaultChannel() {
   }
 
   private void updateDefaultChannel() {

-    if (ApplicationInfoImpl.getShadowInstance().isEAP()) {
+    if (UpdateStrategyCustomization.getInstance().forceEapUpdateChannelForEapBuilds() && ApplicationInfoImpl.getShadowInstance().isEAP()) {

       myState.UPDATE_CHANNEL_TYPE = ChannelStatus.EAP_CODE;
     }
   }
       myState.UPDATE_CHANNEL_TYPE = ChannelStatus.EAP_CODE;
     }
   }


@@ -174,4 +175,4 @@ public class UpdateSettings implements PersistentStateComponent<UpdateSettings.S
   public boolean canUseSecureConnection() {
     return myState.SECURE_CONNECTION && NetUtils.isSniEnabled();
   }
   public boolean canUseSecureConnection() {
     return myState.SECURE_CONNECTION && NetUtils.isSniEnabled();
   }

-}
\ No newline at end of file
+}