diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index b81447816aece..15023dae161ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.policy;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.app.ActivityManager;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.RemoteInput;
@@ -28,11 +29,13 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.text.Editable;
 import android.text.SpannedString;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.ActionMode;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -45,6 +48,7 @@ import android.view.inputmethod.CompletionInfo;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import android.view.textclassifier.TextClassifier;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -189,9 +193,32 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
         v.mEntry = entry;
         v.setTag(VIEW_TAG);
 
+        // Disable the TextClassifier to avoid cross user interactions.
+        v.mEditText.setTextClassifier(TextClassifier.NO_OP);
+
         return v;
     }
 
+    @Override
+    public ActionMode startActionMode(ActionMode.Callback callback, int type) {
+        try {
+            UserHandle notificationUser = mEntry.notification.getUser();
+            UserHandle currentUser = UserHandle.of(ActivityManager.getCurrentUser());
+            if (!UserHandle.ALL.equals(notificationUser)
+                    && !currentUser.equals(notificationUser)) {
+                // If this happens to be a selection action mode, a non-NO_OP TextClassifier could
+                // leak data across users. This widget uses TextClassifier.NO_OP so this is fine.
+                // Log the security fix.
+                android.util.EventLog.writeEvent(0x534e4554, "123232892", -1, "");
+            }
+        } catch (Throwable t) {
+            // Avoid crashing because of this log attempt.
+            Log.i(TAG, "Error attempting to log security fix for bug 123232892", t);
+
+        }
+        return super.startActionMode(callback, type);
+    }
+
     @Override
     public void onClick(View v) {
         if (v == mSendButton) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java
index a6fa4f54067d9..aa98d4f29477b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputViewTest.java
@@ -26,6 +26,7 @@ import android.support.test.filters.SmallTest;
 import android.testing.AndroidTestingRunner;
 import android.testing.TestableLooper;
 import android.view.View;
+import android.view.textclassifier.TextClassifier;
 import android.widget.EditText;
 import android.widget.ImageButton;
 
@@ -109,4 +110,13 @@ public class RemoteInputViewTest extends SysuiTestCase {
         mView.setVisibility(View.INVISIBLE);
         mView.setVisibility(View.VISIBLE);
     }
+
+    @Test
+    public void testUsesNoOpTextClassifier() {
+        RemoteInput input = new RemoteInput.Builder(TEST_RESULT_KEY).build();
+        mView.setRemoteInput(new RemoteInput[]{input}, input);
+
+        EditText editText = mView.findViewById(R.id.remote_input_text);
+        assertEquals(TextClassifier.NO_OP, editText.getTextClassifier());
+    }
 }