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

Commit a72b73ea authored by Dirk Rettschlag's avatar Dirk Rettschlag Committed by Steve Kondik
Browse files

Tethering: fix NPE when retrieving active interfaces 



When in airplane mode getActiveNetworkInfo() may return null.

Change-Id: Icba37abb51b9378c8af73d9f6587e04c588dd85e
Signed-off-by: default avatarDirk Rettschlag <dirk.rettschlag@gmail.com>
parent e72cbd0e

services/java/com/android/server/connectivity/Tethering.java

+7 −4
Original line number Diff line number Diff line
@@ -202,12 +202,15 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
        IBinder b = ServiceManager.getService(Context.CONNECTIVITY_SERVICE);

        IConnectivityManager cm = IConnectivityManager.Stub.asInterface(b);

        try {

            int activeNetType = cm.getActiveNetworkInfo().getType();

            NetworkInfo networkInfo = cm.getActiveNetworkInfo();

            if (networkInfo != null) {

                int activeNetType = networkInfo.getType();

                for (int i : ifaceTypes) {

                    if(i == activeNetType) {

                        upstreamIfaceTypes.add(new Integer(i));

                    }

                }

            }

        } catch (Exception e) {

            Log.d(TAG, "Exception adding default nw to upstreamIfaceTypes: " + e);

        }