Turning off new added features by default

Summary: GK for instrument features will be off at beginning, it makes more sense to turn off these features before GK turned on for 100% public

Reviewed By: tianqibt

Differential Revision: D16853218

fbshipit-source-id: 3b247b32e4fa9ff56830d95e6ed885fbe44c393f

facebook-core/src/main/java/com/facebook/internal/FeatureManager.java

@@ -65,6 +65,9 @@ private static boolean getGKStatus(Feature feature) {
     private static boolean defaultStatus(Feature feature) {
         switch (feature) {
             case RestrictiveDataFiltering:
+            case Instrument:
+            case CrashReport:
+            case ErrorReport:
                 return false;
             default: return true;
         }

facebook-core/src/main/java/com/facebook/internal/instrument/InstrumentManager.java

@@ -22,6 +22,8 @@
 
 import android.support.annotation.RestrictTo;
 
+import com.facebook.FacebookSdk;
+import com.facebook.appevents.UserDataStore;
 import com.facebook.internal.FeatureManager;
 import com.facebook.internal.instrument.crashreport.CrashHandler;
 import com.facebook.internal.instrument.errorreport.ErrorReportHandler;
@@ -37,10 +39,13 @@ public class InstrumentManager {
      * reports.
      */
     public static void start() {
+        if (!FacebookSdk.getAutoLogAppEventsEnabled()) {
+            return;
+        }
         if (FeatureManager.isEnabled(FeatureManager.Feature.CrashReport)) {
             CrashHandler.enable();
         }
-        if (FeatureManager.isEnabled(FeatureManager.Feature.CrashReport)) {
+        if (FeatureManager.isEnabled(FeatureManager.Feature.ErrorReport)) {
             ErrorReportHandler.enable();
         }
     }