commit d26d26de6aa51c74aa52b807b7bc4533d5020739
author Tyler Gunn <tgunn@google.com> Wed Mar 23 02:24:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 23 02:24:22 2016 +0000
tree 289a393bf09762b023e41355a6cd6a326a1a729e
parent 51c2fbfdf624d762a7ed4bc67f09d8363f5d1a04
parent 10d518616ad55b8e8d38e54c287300ec8f39b866

Merge "Fix classCastException when Monkey test"

src/com/android/server/telecom/components/UserCallActivity.java

diff --git a/src/com/android/server/telecom/components/UserCallActivity.java b/src/com/android/server/telecom/components/UserCallActivity.java
index d88e09e..83e4449 100644
--- a/src/com/android/server/telecom/components/UserCallActivity.java
+++ b/src/com/android/server/telecom/components/UserCallActivity.java
@@ -62,7 +62,10 @@
         // accurately determine whether the calling package has the CALL_PHONE runtime permission.
         // At this point in time we trust that the ActivityManager has already performed this
         // validation before starting this activity.
-        new UserCallIntentProcessor(this, userHandle).processIntent(getIntent(),
+        // Create a new instance of intent to avoid modifying the
+        // ActivityThread.ActivityClientRecord#intent directly.
+        // Modifying directly may be a potential risk when relaunching this activity.
+        new UserCallIntentProcessor(this, userHandle).processIntent(new Intent(intent),
                 getCallingPackage(), true /* hasCallAppOp*/);
         finish();
     }