Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
649135c11c
@@ -27,6 +27,7 @@ import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.location.LocationManager;
|
||||
import android.net.NetworkTemplate;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
import android.net.wifi.WifiManager;
|
||||
@@ -756,7 +757,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
if (context == null) {
|
||||
return;
|
||||
}
|
||||
if (isWifiEnabled || !mWifiManager.isScanAlwaysAvailable()) {
|
||||
|
||||
final LocationManager locationManager = context.getSystemService(LocationManager.class);
|
||||
if (isWifiEnabled || !locationManager.isLocationEnabled()
|
||||
|| !mWifiManager.isScanAlwaysAvailable()) {
|
||||
mWifiStatusMessagePreference.setVisible(false);
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user