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