diff options
| author | John Pan <johnpan@google.com> | 2022-03-28 01:11:40 +0800 |
|---|---|---|
| committer | John Pan <johnpan@google.com> | 2022-03-28 12:32:28 +0800 |
| commit | 48ec0bad4cb7a2d7d021867cfb5386bdafa6685b (patch) | |
| tree | 96127d88989234a11117e739431a7606623eaec0 /src/com/android | |
| parent | 896011b225e18c12559bd5d41cc9712bd8b480a2 (diff) | |
| download | ThemePicker-48ec0bad4cb7a2d7d021867cfb5386bdafa6685b.tar.gz | |
Fix GridOptionsManager isAvailable NullPointerException
Bug: 226872734
Test: Manual
Change-Id: Ibdbc9a478a0d6d00ff8aa8ebe96c3c7313877ee5
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/customization/model/grid/GridOptionsManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/customization/model/grid/GridOptionsManager.java b/src/com/android/customization/model/grid/GridOptionsManager.java index c19a8728..7f15d836 100644 --- a/src/com/android/customization/model/grid/GridOptionsManager.java +++ b/src/com/android/customization/model/grid/GridOptionsManager.java @@ -75,8 +75,8 @@ public class GridOptionsManager implements CustomizationManager<GridOption> { try { gridOptionSize = sExecutorService.submit(() -> { List<GridOption> gridOptions = mProvider.fetch(/* reload= */true); - return gridOptions; - }).get().size(); + return gridOptions == null ? 0 : gridOptions.size(); + }).get(); } catch (InterruptedException | ExecutionException e) { Log.w(TAG, "could not get gridOptionSize", e); } |