From c9afa597d53c6eef07e68525cdd935547af336a7 Mon Sep 17 00:00:00 2001 From: seven332 Date: Wed, 2 Jan 2019 20:51:48 +0800 Subject: [PATCH] Avoid NullPointerException in StageActivity.onCreate() --- app/src/main/java/com/hippo/scene/StageActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hippo/scene/StageActivity.java b/app/src/main/java/com/hippo/scene/StageActivity.java index 8fdb6ede8..7c188a54c 100644 --- a/app/src/main/java/com/hippo/scene/StageActivity.java +++ b/app/src/main/java/com/hippo/scene/StageActivity.java @@ -161,8 +161,10 @@ public abstract class StageActivity extends EhActivity { if (savedInstanceState != null) { mStageId = savedInstanceState.getInt(KEY_STAGE_ID, IntIdGenerator.INVALID_ID); ArrayList list = savedInstanceState.getStringArrayList(KEY_SCENE_TAG_LIST); - mSceneTagList.addAll(list); - mDelaySceneTagList.addAll(list); + if (list != null) { + mSceneTagList.addAll(list); + mDelaySceneTagList.addAll(list); + } mIdGenerator.lazySet(savedInstanceState.getInt(KEY_NEXT_ID)); }