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

Commit 33cad52a authored by Yi-Ling Chuang's avatar Yi-Ling Chuang Committed by Automerger Merge Worker
Browse files

Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100



Change-Id: I7eec8329791de225cd9ed236c1aa9f95a93079fc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e3963a7 3bf578c7

src/com/android/settings/core/SettingsBaseActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 
    }



    private int getTransitionType(Intent intent) {

        if (intent == null) {

            return TransitionType.TRANSITION_NONE;

        }

        return intent.getIntExtra(EXTRA_PAGE_TRANSITION_TYPE, TransitionType.TRANSITION_NONE);

    }

}