diff options
author | Cassie Wang <cassieyw@google.com> | 2019-09-26 13:44:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-26 13:44:45 -0700 |
commit | 1019bfa5e840acf0ee1dd52db0eb820a3344808e (patch) | |
tree | a636e7c7940904e610b560e989a782d2fb0de93f | |
parent | 062884745c5022fb9411a6b95fca3e75bd88a698 (diff) | |
parent | 55e74180a727ad9cd23d503b2ec1a5f6e5f428e3 (diff) | |
download | Dialer-1019bfa5e840acf0ee1dd52db0eb820a3344808e.tar.gz |
Merge "Check callStateView for null" into pi-car-dev am: 630b40de01 am: 453cea5a70
am: 55e74180a7
Change-Id: I14fd80146714b302785a96df4383ce8ad8fe95d6
-rw-r--r-- | src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java b/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java index 77e606a5..55af3a16 100644 --- a/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java +++ b/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java @@ -27,6 +27,7 @@ import android.widget.Chronometer; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; import androidx.lifecycle.ViewModelProviders; @@ -40,6 +41,7 @@ public class InCallDialpadFragment extends AbstractDialpadFragment { private static final String TAG = "CD.InCallDialpadFragment"; private TextView mTitleView; + @Nullable private Chronometer mCallStateView; /** An active call which this fragment is serving for. */ @@ -58,6 +60,10 @@ public class InCallDialpadFragment extends AbstractDialpadFragment { InCallViewModel viewModel = ViewModelProviders.of(getActivity()).get(InCallViewModel.class); viewModel.getCallStateAndConnectTime().observe(this, (pair) -> { + if (mCallStateView == null) { + return; + } + if (pair == null) { mCallStateView.stop(); mCallStateView.setText(""); |