Fix a NPE when putting a null-Bundle in an Intent

Happens frequently e.g. with GoogleAccountAuthenticator

Change-Id: I284bf153f40ee9cc3e70bce6efcc3b9e6706361b

parent 410ed1ea

core/java/android/content/Intent.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -6188,6 +6188,9 @@ public class Intent implements Parcelable, Cloneable {
		* @see #removeExtra
		*/
		public Intent putExtras(Bundle extras) {
		if (extras == null) {
		return this;
		}
		if (mExtras == null) {
		mExtras = new Bundle();
		}