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

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

Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()." am: 645a9d12

am: a2cc0fbe

Change-Id: Idd0c12ea791db459dbba39115c38eae843634bb9
parents 6abf8736 a2cc0fbe
Loading
Loading
Loading
Loading
+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;
    }