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

Commit 141a23b5 authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "Fix a NPE when putting a null-Bundle in an Intent" into cm-11.0

parents 454492ad d4e92779

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

        }