commit 6490e4d55160b5ed1f815cd6358531b76cd5da7e
author Julia Tuttle <juliatuttle@google.com> Wed Nov 22 17:45:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 22 17:45:30 2023 +0000
tree 5a71976596e6ec46fef7bed476f76cb33a42baa7
parent 23b6031821b8e45a7a63614a738f14a08b16e43d
parent 1885bdac01b8e0c25e2e6e4ef42ec1bfa56a0486

Merge "Fix NPE in RemoteInput.getResultsFromIntent" into main

core/java/android/app/RemoteInput.java

diff --git a/core/java/android/app/RemoteInput.java b/core/java/android/app/RemoteInput.java
index 8816109..145efa9 100644
--- a/core/java/android/app/RemoteInput.java
+++ b/core/java/android/app/RemoteInput.java
@@ -429,7 +429,7 @@
         if (clipDataIntent == null) {
             return null;
         }
-        return clipDataIntent.getExtras().getParcelable(EXTRA_RESULTS_DATA, android.os.Bundle.class);
+        return clipDataIntent.getParcelableExtra(EXTRA_RESULTS_DATA, android.os.Bundle.class);
     }
 
     /**