Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75d6d008 authored by Sundeep Ghuman's avatar Sundeep Ghuman Committed by android-build-merger
Browse files

Merge "Create Espresso test for WifiSettings." into oc-dev am: 0d475270 

am: 44132cec

Change-Id: I835e7acfd7c8e416318bc309032bcf0c9f6a9c8f
parents 923105b0 44132cec

packages/SettingsLib/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ LOCAL_USE_AAPT2 := true 
LOCAL_MODULE := SettingsLib

LOCAL_MODULE := SettingsLib





LOCAL_SHARED_ANDROID_LIBRARIES := \

LOCAL_SHARED_ANDROID_LIBRARIES := \

    android-support-annotations \

    android-support-v4 \

    android-support-v4 \

    android-support-v7-recyclerview \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-preference \

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

+2 −8
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settingslib.wifi; 




import android.content.Context;

import android.content.Context;

import android.os.Looper;

import android.os.Looper;

import android.support.annotation.Keep;





/**

/**

 * Factory method used to inject WifiTracker instances.

 * Factory method used to inject WifiTracker instances.
@@ -26,14 +27,7 @@ public class WifiTrackerFactory { 




    private static WifiTracker sTestingWifiTracker;

    private static WifiTracker sTestingWifiTracker;





    public static void enableTestingMode() {

    @Keep

        sTestingMode = true;

    }



    public static void disableTestingMode() {

        sTestingMode = false;

    }



    public static void setTestingWifiTracker(WifiTracker tracker) {

    public static void setTestingWifiTracker(WifiTracker tracker) {

        sTestingWifiTracker = tracker;

        sTestingWifiTracker = tracker;

    }

    }