1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/widget/LegacyTimePickerDelegate.java b/core/java/android/widget/LegacyTimePickerDelegate.java
index 6dd70babbb18..70db211f3bad 100644
--- a/core/java/android/widget/LegacyTimePickerDelegate.java
+++ b/core/java/android/widget/LegacyTimePickerDelegate.java
@@ -429,11 +429,14 @@ class LegacyTimePickerDelegate extends TimePicker.AbstractTimePickerDelegate {
 
     @Override
     public void setShowDoneButton(boolean showDoneButton) {
-        mShowDoneButton = showDoneButton;
-        updateDoneButton();
+        if (mDoneButton != null) {
+            mShowDoneButton = showDoneButton;
+            updateDoneButton();
+        }
     }
 
-    private boolean isShowDoneButton() {
+    @Override
+    public boolean isShowDoneButton() {
         return mShowDoneButton;
     }