Merge "Create Espresso test for WifiSettings." into oc-dev

packages/SettingsLib/Android.mk

@@ -6,6 +6,7 @@ LOCAL_USE_AAPT2 := true
 LOCAL_MODULE := SettingsLib
 
 LOCAL_SHARED_ANDROID_LIBRARIES := \
+    android-support-annotations \
     android-support-v4 \
     android-support-v7-recyclerview \
     android-support-v7-preference \

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java

@@ -17,6 +17,7 @@ package com.android.settingslib.wifi;
 
 import android.content.Context;
 import android.os.Looper;
+import android.support.annotation.Keep;
 
 /**
  * Factory method used to inject WifiTracker instances.
@@ -26,14 +27,7 @@ public class WifiTrackerFactory {
 
     private static WifiTracker sTestingWifiTracker;
 
-    public static void enableTestingMode() {
-        sTestingMode = true;
-    }
-
-    public static void disableTestingMode() {
-        sTestingMode = false;
-    }
-
+    @Keep
     public static void setTestingWifiTracker(WifiTracker tracker) {
         sTestingWifiTracker = tracker;
     }