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

Commit 46166bd5 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed NPE when subscription plan is null 

NetworkPolicyManager.getSubscriptionPlans() is supposed
to be @NonNull but it returns null. Made temporary fix
in telephony until the root cause is found.

Bug: 213896944
Test: Manual
Change-Id: Ibe4eef38e8ce1252a9f4905482b0e378a02fde93
parent 210ec3af

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;
@@ -2248,8 +2249,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);