Merge "Guard against the NPE in getTransitionType()" into tm-dev (3bf578c7) · Commits · e / os / android_packages_apps_Settings

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);
		}
		}