commit 61e1386b3ac290a42c6f9fd3048303db89fbe18f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Dec 01 05:53:23 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 01 05:53:23 2017 +0000
tree 94a769fd1688ae4158f0d4e014335c26cc8d198c
parent 3326b3f49de142e95dfb3a9b279af59bac0bb3de
parent 8b324799ad17dd02f26bff4678bbb942f524d0bc

Merge "Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130 am: 9afe3b1252"

core/java/android/app/assist/AssistStructure.java

diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java
index da5569d..7b549cd5 100644
--- a/core/java/android/app/assist/AssistStructure.java
+++ b/core/java/android/app/assist/AssistStructure.java
@@ -2139,6 +2139,16 @@
         return mActivityComponent;
     }
 
+    /**
+     * Called by Autofill server when app forged a different value.
+     *
+     * @hide
+     */
+    public void setActivityComponent(ComponentName componentName) {
+        ensureData();
+        mActivityComponent = componentName;
+    }
+
     /** @hide */
     public int getFlags() {
         return mFlags;

services/autofill/java/com/android/server/autofill/Session.java

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 99b92b9..e3db1b1 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -236,6 +236,11 @@
                 structure.ensureData();
 
                 // Sanitize structure before it's sent to service.
+                if (!mComponentName.equals(structure.getActivityComponent())) {
+                    Slog.w(TAG, "Activity " + mComponentName + " forged different component on "
+                            + "AssistStructure: " + structure.getActivityComponent());
+                    structure.setActivityComponent(mComponentName);
+                }
                 structure.sanitizeForParceling(true);
 
                 // Flags used to start the session.