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

am: 645a9d1253 Change-Id: Ia09f8a945159951a2a098dc88001d9509f704335
2019-01-02 15:06:01 -08:00
parent a261d6e664 645a9d1253
commit a2cc0fbeec
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -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;
    }