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

Commit c8ac4f3b authored by Rajeev Kumar's avatar Rajeev Kumar
Browse files

Fix NPE in calling getSubscriptionPlans method. 

Bug:63999806
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Change-Id: I22b013d7af60c6722c7748c88888ddbe1b7a414f
parent 5a3d561e

telephony/java/android/telephony/SubscriptionManager.java

+10 −9
Original line number Diff line number Diff line
@@ -31,14 +31,13 @@ import android.os.Message; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.DisplayMetrics;



import com.android.internal.telephony.IOnSubscriptionsChangedListener;

import com.android.internal.telephony.ISub;

import com.android.internal.telephony.ITelephonyRegistry;

import com.android.internal.telephony.PhoneConstants;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;



/**
@@ -621,7 +620,7 @@ public class SubscriptionManager { 
        }



        if (result == null) {

            result = new ArrayList<SubscriptionInfo>();

            result = new ArrayList<>();

        }

        return result;

    }
@@ -1560,8 +1559,10 @@ public class SubscriptionManager { 
        final INetworkPolicyManager npm = INetworkPolicyManager.Stub

                .asInterface(ServiceManager.getService(Context.NETWORK_POLICY_SERVICE));

        try {

            return Arrays.asList(npm.getSubscriptionPlans(subId,

                    mContext.getOpPackageName()));

            SubscriptionPlan[] subscriptionPlans =

                    npm.getSubscriptionPlans(subId, mContext.getOpPackageName());

            return subscriptionPlans == null

                    ? Collections.emptyList() : Arrays.asList(subscriptionPlans);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }