diff options
| author | Usman Abdullah <uabdullah@google.com> | 2016-04-28 15:56:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 15:56:46 +0000 |
| commit | 32c19d58c3ad468bcdccb5c48947ba74a89d11be (patch) | |
| tree | 45d4f197e50c8f5fe927408bef5f7123334dda15 | |
| parent | 2f604615057379a670afbf1fc458efd59e54ee6f (diff) | |
| parent | 55fd06a7fde79daa0abf1f463926c2b34de3d80a (diff) | |
Merge "[DO NOT MERGE] Fix NPE caused by misplaced parenthesis." into nyc-dev am: 36a1cc6
am: 55fd06a
* commit '55fd06a7fde79daa0abf1f463926c2b34de3d80a':
[DO NOT MERGE] Fix NPE caused by misplaced parenthesis.
Change-Id: I39a418ef9466e5b238192cfe598adf8da6aa2051
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 3e3926ba9..d0762fdd0 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -249,7 +249,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> Call.areSameNumber(mPrimary, primary)); final boolean secondaryChanged = !(Call.areSame(mSecondary, secondary) && Call.areSameNumber(mSecondary, secondary)); - final boolean shouldShowCallSubject = shouldShowCallSubject(mPrimary); mSecondary = secondary; Call previousPrimary = mPrimary; @@ -262,9 +261,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> // Refresh primary call information if either: // 1. Primary call changed. // 2. The call's ability to manage conference has changed. - if (mPrimary != null && (primaryChanged || - ui.isManageConferenceVisible() != shouldShowManageConference()) || - ui.isCallSubjectVisible() != shouldShowCallSubject) { + // 3. The call subject should be shown or hidden. + if (shouldRefreshPrimaryInfo(primaryChanged, ui, shouldShowCallSubject(mPrimary))) { // primary call has changed if (previousPrimary != null) { //clear progess spinner (if any) related to previous primary call @@ -402,6 +400,16 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> updatePrimaryDisplayInfo(); } + private boolean shouldRefreshPrimaryInfo(boolean primaryChanged, CallCardUi ui, + boolean shouldShowCallSubject) { + if (mPrimary == null) { + return false; + } + return primaryChanged || + ui.isManageConferenceVisible() != shouldShowManageConference() || + ui.isCallSubjectVisible() != shouldShowCallSubject; + } + private String getSubscriptionNumber() { // If it's an emergency call, and they're not populating the callback number, // then try to fall back to the phone sub info (to hopefully get the SIM's |