Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (331566ce) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+53 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.widget;

		import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;

		import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;

		import android.R;
		@@ -24,11 +26,13 @@ import android.annotation.DrawableRes;
		import android.annotation.FloatRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.Size;
		import android.annotation.StringRes;
		import android.annotation.StyleRes;
		import android.annotation.XmlRes;
		import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.assist.AssistStructure;
		import android.content.ClipData;
		import android.content.ClipboardManager;
		@@ -620,6 +624,19 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		private InputFilter[] mFilters = NO_FILTERS;

		/**
		* To keep the information to indicate if there is necessary to restrict the power of
		* INTERACT_ACROSS_USERS_FULL.
		* <p>
		* SystemUI always run as user 0 to process all of direct reply. SystemUI has the poer of
		* INTERACT_ACROSS_USERS_FULL. However, all of the notifications not only belong to user 0 but
		* also to the other users in multiple user environment.
		* </p>
		*
		* @see #setRestrictedAcrossUser(boolean)
		*/
		private boolean mIsRestrictedAcrossUser;

		private volatile Locale mCurrentSpellCheckerLocaleCache;

		// It is possible to have a selection even when mEditor is null (programmatically set, like when
		@@ -8826,6 +8843,24 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		: mCurrentSpellCheckerLocaleCache;
		}

		/**
		* To notify the TextView to restricted the power of the app granted INTERACT_ACROSS_USERS_FULL
		* permission.
		* <p>
		* Most of applications should not granted the INTERACT_ACROSS_USERS_FULL permssion.
		* SystemUI is the special one that run in user 0 process to handle multiple user notification.
		* Unforunately, the power of INTERACT_ACROSS_USERS_FULL should be limited or restricted for
		* preventing from information leak.</p>
		* <p>This function call is called for SystemUI Keyguard and Notification.</p>
		*
		* @param isRestricted is true if the power of INTERACT_ACROSS_USERS_FULL should be limited.
		* @hide
		*/
		@RequiresPermission(INTERACT_ACROSS_USERS_FULL)
		public final void setRestrictedAcrossUser(boolean isRestricted) {
		mIsRestrictedAcrossUser = isRestricted;
		}

		/**
		* This is a temporary method. Future versions may support multi-locale text.
		* Caveat: This method may not return the latest text services locale, but this should be
		@@ -9569,6 +9604,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		boolean canCut() {
		if (mIsRestrictedAcrossUser
		&& UserHandle.myUserId() != ActivityManager.getCurrentUser()) {
		// When it's restricted, and the curren user is not the process user. It can't cut
		// because it may cut the text of the user 10 into the clipboard of user 0.
		return false;
		}
		if (hasPasswordTransformationMethod()) {
		return false;
		}
		@@ -9582,6 +9623,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		boolean canCopy() {
		if (mIsRestrictedAcrossUser
		&& UserHandle.myUserId() != ActivityManager.getCurrentUser()) {
		// When it's restricted, and the curren user is not the process user. It can't copy
		// because it may copy the text of the user 10 to the clipboard of user 0.
		return false;
		}
		if (hasPasswordTransformationMethod()) {
		return false;
		}
		@@ -9611,6 +9658,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		boolean canPaste() {
		if (mIsRestrictedAcrossUser
		&& UserHandle.myUserId() != ActivityManager.getCurrentUser()) {
		// When it's restricted, and the curren user is not the process user. It can't paste
		// because it may copy the text from the user 0 clipboard in current user is 10.
		return false;
		}
		return (mText instanceof Editable &&
		mEditor != null && mEditor.mKeyListener != null &&
		getSelectionStart() >= 0 &&

packages/Keyguard/src/com/android/keyguard/KeyguardPasswordView.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView

		@Override
		protected void resetState() {
		mPasswordEntry.setRestrictedAcrossUser(true);
		mSecurityMessageDisplay.setMessage(getMessageWithCount(R.string.kg_password_instructions), false);
		final boolean wasDisabled = mPasswordEntry.isEnabled();
		setPasswordEntryEnabled(true);
		@@ -175,6 +176,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
		Context.INPUT_METHOD_SERVICE);

		mPasswordEntry = (TextView) findViewById(getPasswordTextViewId());
		mPasswordEntry.setRestrictedAcrossUser(true);
		mPasswordEntryDisabler = new TextViewInputDisabler(mPasswordEntry);
		mPasswordEntry.setKeyListener(TextKeyListener.getInstance());
		mPasswordEntry.setInputType(InputType.TYPE_CLASS_TEXT

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -27,7 +28,9 @@ import android.content.pm.ShortcutManager;
		import android.graphics.Rect;
		import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.text.Editable;
		import android.text.InputType;
		import android.text.TextWatcher;
		import android.util.AttributeSet;
		import android.util.Log;
		@@ -174,6 +177,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
		LayoutInflater.from(context).inflate(R.layout.remote_input, root, false);
		v.mController = controller;
		v.mEntry = entry;
		v.mEditText.setRestrictedAcrossUser(true);
		v.setTag(VIEW_TAG);

		return v;
		@@ -268,6 +272,16 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene

		setVisibility(VISIBLE);
		mController.addRemoteInput(mEntry, mToken);

		// Disable suggestions on non-owner (secondary) user.
		// SpellCheckerService of primary user runs on secondary as well which shows
		// "Add to dictionary" dialog on the primary user. (See b/123232892)
		// Note: this doesn't affect work-profile users on P or older versions.
		if (UserHandle.myUserId() != ActivityManager.getCurrentUser()) {
		mEditText.setInputType(
		mEditText.getInputType() \| InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
		}

		mEditText.setInnerFocusable(true);
		mEditText.mShowImeOnInputConnection = true;
		mEditText.setText(mEntry.remoteInputText);

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -2863,6 +2863,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		attrs.hideTimeoutMilliseconds = TOAST_WINDOW_TIMEOUT;
		}
		attrs.windowAnimations = com.android.internal.R.style.Animation_Toast;
		// Toasts can't be clickable
		attrs.flags \|= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
		break;
		}