PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against the NPE in getTransitionType()" into tm-dev

Browse Source
This commit is contained in:
Yi-Ling Chuang
2022-05-19 08:19:50 +00:00
committed by Android (Google) Code Review
parent 72642fa03d b64d3589c1
commit 3bf578c73e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -260,6 +260,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
} }
private int getTransitionType(Intent intent) { private int getTransitionType(Intent intent) {
if (intent == null) {
return TransitionType.TRANSITION_NONE;
}
return intent.getIntExtra(EXTRA_PAGE_TRANSITION_TYPE, TransitionType.TRANSITION_NONE); return intent.getIntExtra(EXTRA_PAGE_TRANSITION_TYPE, TransitionType.TRANSITION_NONE);
} }
} }