commit 638f05cb620a17ae7334486d2f53e223ac65eef5
author Santos Cordon <santoscordon@google.com> Tue May 19 17:12:33 2015 -0700
committer Santos Cordon <santoscordon@google.com> Wed May 20 17:34:11 2015 -0700
tree 8afe80f0e7ee1dddfb088dc59a1efe046dce53bd
parent f8bdf691f571d3aa186a9bebbd93c69bea929db7

Add intent for enabling phone account.

Bug: 20303449
Change-Id: If6e717260df01160308fd395a6aac413aa5206d5

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

diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java
index 1ef869b..3d539cb 100644
--- a/src/com/android/server/telecom/PhoneAccountRegistrar.java
+++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -350,12 +350,16 @@
 
     public void enablePhoneAccount(PhoneAccountHandle accountHandle, boolean isEnabled) {
         PhoneAccount account = getPhoneAccount(accountHandle);
-        if (account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+        if (account == null) {
+            Log.w(this, "Could not find account to enable: " + accountHandle);
+            return;
+        } else if (account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
             // We never change the enabled state of SIM-based accounts.
+            Log.w(this, "Could not change enable state of SIM account: " + accountHandle);
             return;
         }
 
-        if (account != null && account.isEnabled() != isEnabled) {
+        if (account.isEnabled() != isEnabled) {
             account.setIsEnabled(isEnabled);
             write();
             fireAccountsChanged();