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

Commit a2cc0fbe authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()." 

am: 645a9d12

Change-Id: Ia09f8a945159951a2a098dc88001d9509f704335
parents a261d6e6 645a9d12

core/java/android/content/Intent.java

+1 −1
Original line number Diff line number Diff line
@@ -9062,7 +9062,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @param extras The new set of extras in the Intent, or null to erase

     * all extras.

     */

    public @NonNull Intent replaceExtras(@NonNull Bundle extras) {

    public @NonNull Intent replaceExtras(@Nullable Bundle extras) {

        mExtras = extras != null ? new Bundle(extras) : null;

        return this;

    }