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

Commit 3c948e10 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix potential NPE in SubscriptionMonitor" 

am: 0040150a

Change-Id: I4573e3049fcee14430f2661486ec75d222bad43f
parents dfdd8786 0040150a

src/java/com/android/internal/telephony/SubscriptionMonitor.java

+6 −13
Original line number Original line Diff line number Diff line
@@ -27,20 +27,13 @@ import android.os.Handler; 
import android.os.Registrant;

import android.os.Registrant;

import android.os.RegistrantList;

import android.os.RegistrantList;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.telephony.Rlog;

import android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.util.LocalLog;

import android.util.LocalLog;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.ISub;

import com.android.internal.telephony.IOnSubscriptionsChangedListener;

import com.android.internal.telephony.ITelephonyRegistry;

import com.android.internal.telephony.PhoneConstants;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;

import java.lang.IllegalArgumentException;





/**

/**

 * Utility singleton to monitor subscription changes and help people act on them.

 * Utility singleton to monitor subscription changes and help people act on them.
@@ -69,12 +62,6 @@ public class SubscriptionMonitor { 




    public SubscriptionMonitor(ITelephonyRegistry tr, Context context,

    public SubscriptionMonitor(ITelephonyRegistry tr, Context context,

            SubscriptionController subscriptionController, int numPhones) {

            SubscriptionController subscriptionController, int numPhones) {

        try {

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        }



        mSubscriptionController = subscriptionController;

        mSubscriptionController = subscriptionController;

        mContext = context;

        mContext = context;
@@ -91,6 +78,12 @@ public class SubscriptionMonitor { 
            mPhoneSubId[phoneId] = mSubscriptionController.getSubIdUsingPhoneId(phoneId);

            mPhoneSubId[phoneId] = mSubscriptionController.getSubIdUsingPhoneId(phoneId);

        }

        }





        try {

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        }



        mContext.registerReceiver(mDefaultDataSubscriptionChangedReceiver,

        mContext.registerReceiver(mDefaultDataSubscriptionChangedReceiver,

                new IntentFilter(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED));

                new IntentFilter(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED));

    }

    }