Merge "Remove search duplicates for Wifi and Bluetooth" into oc-dev am: b48e6e46b3

am: 6e4d02fa86

Change-Id: I2a35e242e6430fe7f68eb10d5a96177898d29933
This commit is contained in:
Matthew Fritze
2017-04-27 20:01:56 +00:00
committed by android-build-merger
8 changed files with 55 additions and 21 deletions

View File

@@ -33,7 +33,7 @@ public class WifiMasterSwitchPreferenceController extends PreferenceController
implements SummaryUpdater.OnSummaryChangeListener,
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
public static final String KEY_TOGGLE_WIFI = "toggle_wifi";
private MasterSwitchPreference mWifiPreference;
private WifiEnabler mWifiEnabler;