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

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

Merge "Fix potential NPE from 326226" am: d9a5fa50 am: e5ef92a1 

am: d8223ed9

Change-Id: Id4b7ebd58d4d616afa08601ca79dfa2e4e53e219
parents 71d745a8 d8223ed9

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

+1 −2
Original line number Diff line number Diff line
@@ -448,8 +448,7 @@ public class PhoneAccountRegistrar { 
     */

    public boolean enablePhoneAccount(PhoneAccountHandle accountHandle, boolean isEnabled) {

        PhoneAccount account = getPhoneAccountUnchecked(accountHandle);

        Log.i(this, "Phone account %s %s.", accountHandle.toString(),

                isEnabled ? "enabled" : "disabled");

        Log.i(this, "Phone account %s %s.", accountHandle, isEnabled ? "enabled" : "disabled");

        if (account == null) {

            Log.w(this, "Could not find account to enable: " + accountHandle);

            return false;