commit 4aaed145f8331b73f39617bd1fee73664cb0c90b
author Adam Skory <skory@google.com> Wed Apr 22 11:29:31 2015 -0600
committer Adam Skory <skory@google.com> Wed Apr 22 11:29:31 2015 -0600
tree 15a03eb187b9de894c87603e46ae7870566ffdb4
parent ce510d5f62a0e4dc46d3d3c05fafe9b08eb5b497

nullcheck Activity.getIntent() for AssistContent

Nothing stopping an Activity from giving us a
null Intent, and the Intent copy constructor
requires a non-null arg.

Bug: 20419159
Change-Id: I8b12a127431869394697e947e2298d4dbbe08604

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 10d6d01..ab5f811 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2541,11 +2541,16 @@
             if (cmd.requestType == ActivityManager.ASSIST_CONTEXT_FULL) {
                 data.putParcelable(AssistStructure.ASSIST_KEY, new AssistStructure(r.activity));
                 AssistContent content = new AssistContent();
-                Intent intent = new Intent(r.activity.getIntent());
-                intent.setFlags(intent.getFlags() & ~(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                        | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION));
-                intent.removeUnsafeExtras();
-                content.setIntent(intent);
+                Intent activityIntent = r.activity.getIntent();
+                if (activityIntent != null) {
+                    Intent intent = new Intent(activityIntent);
+                    intent.setFlags(intent.getFlags() & ~(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                            | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION));
+                    intent.removeUnsafeExtras();
+                    content.setIntent(intent);
+                } else {
+                    content.setIntent(new Intent());
+                }
                 r.activity.onProvideAssistContent(content);
                 data.putParcelable(AssistContent.ASSIST_KEY, content);
             }