Merge "Fix Dialer bug after pause/resume"

1 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/car/dialer/DialerFragment.java b/src/com/android/car/dialer/DialerFragment.java
index 3e7b511c..5b6ce2ba 100644
--- a/src/com/android/car/dialer/DialerFragment.java
+++ b/src/com/android/car/dialer/DialerFragment.java
@@ -63,7 +63,7 @@ public class DialerFragment extends Fragment {
     }
 
     private Context mContext;
-    private StringBuffer mNumber;
+    private final StringBuffer mNumber = new StringBuffer(MAX_DIAL_NUMBER);
     private AudioManager mAudioManager;
     private ToneGenerator mToneGenerator;
     private final Handler mHandler = new Handler();
@@ -211,7 +211,6 @@ public class DialerFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        mNumber = new StringBuffer(MAX_DIAL_NUMBER);
         synchronized (mToneGeneratorLock) {
             if (mToneGenerator == null) {
                 mToneGenerator = new ToneGenerator(AudioManager.STREAM_MUSIC, TONE_RELATIVE_VOLUME);
@@ -263,7 +262,8 @@ public class DialerFragment extends Fragment {
     }
 
     private void setDialNumberInternal(final String number) {
-        mNumber = new StringBuffer(MAX_DIAL_NUMBER);
+        // Clear existing content in mNumber.
+        mNumber.setLength(0);
         mNumber.append(number);
         mNumberView.setText(getFormattedNumber(mNumber.toString()));
     }