Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d
am: ee773103f8
am: cd486c06d0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743 Change-Id: Icca73d74b5ee6c32607761c8f3c45ab565419604 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -96,7 +96,7 @@ public class WifiUtils extends com.android.settingslib.wifi.WifiUtils {
|
|||||||
* @return true if Settings cannot modify the config due to lockDown.
|
* @return true if Settings cannot modify the config due to lockDown.
|
||||||
*/
|
*/
|
||||||
public static boolean isNetworkLockedDown(Context context, WifiConfiguration config) {
|
public static boolean isNetworkLockedDown(Context context, WifiConfiguration config) {
|
||||||
if (config == null) {
|
if (context == null || config == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user