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

Commit 1a6ec0cd authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Fixed NPE when subscription plan is null am: d187f6fd am: f0cd168c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2032391

Change-Id: Icbf83850ef1959fd6567a92e739866ade53ce4fd
parents dacc0e0f f0cd168c

src/java/com/android/internal/telephony/data/DataNetworkController.java

+4 −2
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.Iterator;

import java.util.LinkedList;

import java.util.List;
@@ -2247,8 +2248,9 @@ public class DataNetworkController extends Handler { 
     * Update {@link SubscriptionPlan}s from {@link NetworkPolicyManager}.

     */

    private void updateSubscriptionPlans() {

        mSubscriptionPlans = Arrays.asList(mNetworkPolicyManager.getSubscriptionPlans(

                mSubId, mPhone.getContext().getOpPackageName()));

        SubscriptionPlan[] plans = mNetworkPolicyManager.getSubscriptionPlans(

                mSubId, mPhone.getContext().getOpPackageName());

        mSubscriptionPlans = plans != null ? Arrays.asList(plans) : Collections.emptyList();

        mCongestedOverrideNetworkTypes.clear();

        mUnmeteredOverrideNetworkTypes.clear();

        log("Subscription plans initialized: " + mSubscriptionPlans);