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

Commit a1e6fe82 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '556os-fix-NPE' into 'master' 

Fix Null Pointer Exception

See merge request !48
parents 8a9f97a1 685acaf6

play-services-core/src/main/java/org/microg/gms/gcm/McsService.java

+4 −1
Original line number Diff line number Diff line
@@ -490,7 +490,10 @@ public class McsService extends Service implements Handler.Callback { 
        NetworkInfo activeNetworkInfo = cm.getActiveNetworkInfo();

        activeNetworkPref = GcmPrefs.get(this).getNetworkPrefForInfo(activeNetworkInfo);

        if (!GcmPrefs.get(this).isEnabledFor(activeNetworkInfo)) {

            logd(this, "Don't connect, because disabled for " + activeNetworkInfo.getTypeName());

            final String typeName =

                    activeNetworkInfo != null ? activeNetworkInfo.getTypeName() : "";



            logd(this, "Don't connect, because disabled for " + typeName);

            scheduleReconnect(this);

            return;

        }