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

Commit 65ff88c1 authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPE when calls manager isn't initialized 

CallsManager isn't initialized for users other than USER_OWNER, so need
to check whether getInstance() is null.

Bug:17684364
Change-Id: Ic3a2a41170a259f13ed4b685e00631c126db3951
parent 54e563bd

src/com/android/server/telecom/PhoneAccountBroadcastReceiver.java

+4 −1
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ public class PhoneAccountBroadcastReceiver extends BroadcastReceiver { 
     * @param packageName The name of the removed package.

     */

    private void handlePackageRemoved(Context context, String packageName) {

        CallsManager.getInstance().getPhoneAccountRegistrar().clearAccounts(packageName);

        final CallsManager callsManager = CallsManager.getInstance();

        if (callsManager != null) {

            callsManager.getPhoneAccountRegistrar().clearAccounts(packageName);

        }

    }

}