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

Commit cd486c06 authored by Weng Su's avatar Weng Su Committed by Automerger Merge Worker
Browse files

Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d am: ee773103 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743



Change-Id: I3538fe496c4a5fd5e34d6cb066a8aaab132c2967
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99c0b8ba ee773103

src/com/android/settings/wifi/WifiUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,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;

        }