commit 4a17c50d7b735e1ab94748684f4a7be54fe1a0ce
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 26 22:56:28 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 26 22:56:28 2019 +0000
tree 6f74c7ac8774bce96cc4db664a0cb99294e84796
parent 95eb1bfbfa614546fed8ec032b1706e350a9f8df
parent 8c07e3ac3905e69a2ce94824623a39dafa0f58f3

Merge "Prevent NPE when current clock is null" into ub-launcher3-qt-r1-dev

src/com/android/customization/picker/ClockFacePickerActivity.java

diff --git a/src/com/android/customization/picker/ClockFacePickerActivity.java b/src/com/android/customization/picker/ClockFacePickerActivity.java
index bfe2e5e..5065aef 100644
--- a/src/com/android/customization/picker/ClockFacePickerActivity.java
+++ b/src/com/android/customization/picker/ClockFacePickerActivity.java
@@ -64,12 +64,16 @@
                 return getIntent().getStringExtra(EXTRA_CLOCK_FACE_NAME);
             }
         };
-
-        final FragmentManager fm = getSupportFragmentManager();
-        final FragmentTransaction fragmentTransaction = fm.beginTransaction();
-        final ClockFragment clockFragment = ClockFragment.newInstance(getString(R.string.clock_title));
-        fragmentTransaction.replace(R.id.fragment_container, clockFragment);
-        fragmentTransaction.commitNow();
+        if (!mClockManager.isAvailable()) {
+            finish();
+        } else {
+            final FragmentManager fm = getSupportFragmentManager();
+            final FragmentTransaction fragmentTransaction = fm.beginTransaction();
+            final ClockFragment clockFragment = ClockFragment.newInstance(
+                    getString(R.string.clock_title));
+            fragmentTransaction.replace(R.id.fragment_container, clockFragment);
+            fragmentTransaction.commitNow();
+        }
     }
 
     @Override