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

Commit e2a00b15 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by android-build-merger
Browse files

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

am: 8040c388

Change-Id: Icaf614f013c8af5eacd75f207a6cc26793759e04
parents f0d5ce7a 8040c388
Loading
Loading
Loading
Loading
+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();
        }