Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev

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;

/**

        }

        if (result == null) {

            result = new ArrayList<SubscriptionInfo>();

            result = new ArrayList<>();

        }

        return result;

    }

        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();

        }