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

am: a2cc0fbeec Change-Id: Idd0c12ea791db459dbba39115c38eae843634bb9
2019-01-02 15:16:07 -08:00
parent 6abf873683 a2cc0fbeec
commit 4c6f437438
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;
    }