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

Commit cf184b00 authored by Jason Noguchi's avatar Jason Noguchi
Browse files

Add checks for NPE in video pie menu.

Bug: 8536361

Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
parent 1f60d9cd
Loading
Loading
Loading
Loading
+31 −22
Original line number Diff line number Diff line
@@ -59,12 +59,19 @@ public class VideoMenu extends PieController
        super.initialize(group);
        mPopup = null;
        mPopupStatus = POPUP_NONE;

        PieItem item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5);
        PieItem item = null;
        // flash
        if (group.findPreference(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE) != null) {
            item = makeItem(CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, POS_FLASH, 5);
            mRenderer.addItem(item);
        }
        // white balance
        if (group.findPreference(CameraSettings.KEY_WHITE_BALANCE) != null) {
            item = makeItem(CameraSettings.KEY_WHITE_BALANCE, POS_WB, 5);
            mRenderer.addItem(item);
        }
        // camera switcher
        if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
            item = makeItem(R.drawable.ic_switch_video_facing_holo_light);
            item.setPosition(POS_SWITCH, 5);
            item.setOnClickListener(new OnClickListener() {
@@ -72,7 +79,8 @@ public class VideoMenu extends PieController
                @Override
                public void onClick(PieItem item) {
                    // Find the index of next camera.
                ListPreference pref = mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID);
                    ListPreference pref =
                            mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_ID);
                    if (pref != null) {
                        int index = pref.findIndexOfValue(pref.getValue());
                        CharSequence[] values = pref.getEntryValues();
@@ -83,6 +91,7 @@ public class VideoMenu extends PieController
                }
            });
            mRenderer.addItem(item);
        }
        // settings popup
        mOtherKeys = new String[] {
                CameraSettings.KEY_VIDEO_EFFECT,