Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7c6d21 authored by Chuck Liao's avatar Chuck Liao
Browse files

Fix NullPointerException when switching from customization... 

Fix NullPointerException when switching from customization picker(CustomizationPickerActivity) to wallpaper picker(TopLevelPickerActivity).

Should not access any views in CustomizationPickerActivity after switching to TopLevelPickerActivity since the views are null.

Bug: 155355476
Change-Id: Id4f3177215fac8766c5bb33f0337bc7a591ec3fd
parent d920969c

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

+19 −18
Original line number Diff line number Diff line
@@ -120,7 +120,9 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal 
        if (!supportsCustomization()) {

            Log.w(TAG, "Themes not supported, reverting to Wallpaper Picker");

            skipToWallpaperPicker();

        } else {

            return;

        }



        setContentView(R.layout.activity_customization_picker_main);

        setUpBottomNavView();
@@ -138,7 +140,6 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal 
                    WALLPAPER_FOCUS.equals(getIntent().getStringExtra(WALLPAPER_FLAVOR_EXTRA))

                            ? R.id.nav_wallpaper : R.id.nav_theme);

        }

        }



        mBottomActionBar = findViewById(R.id.bottom_actionbar);

        mBottomActionBar.getViewTreeObserver().addOnGlobalLayoutListener(() -> {