Merge tag 'android-7.1.1_r25' into cm-14.1 (35724322) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -2016,7 +2016,8 @@ public class DevicePolicyManager {
		* Determine whether the current password the user has set is sufficient to meet the policy
		* requirements (e.g. quality, minimum length) that have been requested by the admins of this
		* user and its participating profiles. Restrictions on profiles that have a separate challenge
		* are not taken into account.
		* are not taken into account. If the user has a password, it must have been entered in order to
		* perform this check.
		* <p>
		* The calling device admin must have requested
		* {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} to be able to call this method; if it has
		@@ -2029,6 +2030,7 @@ public class DevicePolicyManager {
		* @return Returns true if the password meets the current requirements, else false.
		* @throws SecurityException if the calling application does not own an active administrator
		* that uses {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD}
		* @throws IllegalStateException if the user has a password but has not entered it yet.
		*/
		public boolean isActivePasswordSufficient() {
		if (mService != null) {
		@@ -3538,6 +3540,19 @@ public class DevicePolicyManager {
		}
		}

		/**
		* @hide
		*/
		public void reportPasswordChanged(int userId) {
		if (mService != null) {
		try {
		mService.reportPasswordChanged(userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

		/**
		* @hide
		*/

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@ interface IDevicePolicyManager {

		void setActivePasswordState(int quality, int length, int letters, int uppercase, int lowercase,
		int numbers, int symbols, int nonletter, int userHandle);
		void reportPasswordChanged(int userId);
		void reportFailedPasswordAttempt(int userHandle);
		void reportSuccessfulPasswordAttempt(int userHandle);
		void reportFailedFingerprintAttempt(int userHandle);

core/java/android/service/persistentdata/PersistentDataBlockManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,9 @@ public class PersistentDataBlockManager {
		* Returns the number of bytes written or -1 on error. If the block is too big
		* to fit on the partition, returns -MAX_BLOCK_SIZE.
		*
		* {@link #wipe} will block any further {@link #write} operation until reboot,
		* in which case -1 will be returned.
		*
		* @param data the data to write
		*/
		public int write(byte[] data) {
		@@ -129,6 +132,8 @@ public class PersistentDataBlockManager {
		/**
		* Zeroes the previously written block in its entirety. Calling this method
		* will erase all data written to the persistent data partition.
		* It will also prevent any further {@link #write} operation until reboot,
		* in order to prevent a potential race condition. See b/30352311.
		*/
		public void wipe() {
		try {

core/java/android/widget/Toast.java

+43 −18

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public class Toast {
		*/
		public Toast(Context context) {
		mContext = context;
		mTN = new TN();
		mTN = new TN(context.getPackageName());
		mTN.mY = context.getResources().getDimensionPixelSize(
		com.android.internal.R.dimen.toast_y_offset);
		mTN.mGravity = context.getResources().getInteger(
		@@ -133,13 +133,7 @@ public class Toast {
		* after the appropriate duration.
		*/
		public void cancel() {
		mTN.hide();

		try {
		getService().cancelToast(mContext.getPackageName(), mTN);
		} catch (RemoteException e) {
		// Empty
		}
		mTN.cancel();
		}

		/**
		@@ -331,18 +325,40 @@ public class Toast {
		final Runnable mHide = new Runnable() {
		@Override
		public void run() {
		handleHide();
		// Don't do this in handleHide() because it is also invoked by handleShow()
		mNextView = null;
		}
		};

		private final WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();

		private static final int SHOW = 0;
		private static final int HIDE = 1;
		private static final int CANCEL = 2;
		final Handler mHandler = new Handler() {
		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case SHOW: {
		IBinder token = (IBinder) msg.obj;
		handleShow(token);
		break;
		}
		case HIDE: {
		handleHide();
		// Don't do this in handleHide() because it is also invoked by handleShow()
		mNextView = null;
		break;
		}
		case CANCEL: {
		handleHide();
		// Don't do this in handleHide() because it is also invoked by handleShow()
		mNextView = null;
		try {
		getService().cancelToast(mPackageName, TN.this);
		} catch (RemoteException e) {
		}
		break;
		}
		}
		}
		};

		@@ -358,10 +374,12 @@ public class Toast {

		WindowManager mWM;

		String mPackageName;

		static final long SHORT_DURATION_TIMEOUT = 5000;
		static final long LONG_DURATION_TIMEOUT = 1000;

		TN() {
		TN(String packageName) {
		// XXX This should be changed to use a Dialog, with a Theme.Toast
		// defined that sets up the layout params appropriately.
		final WindowManager.LayoutParams params = mParams;
		@@ -374,6 +392,8 @@ public class Toast {
		params.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
		\| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
		\| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;

		mPackageName = packageName;
		}

		/**
		@@ -382,7 +402,7 @@ public class Toast {
		@Override
		public void show(IBinder windowToken) {
		if (localLOGV) Log.v(TAG, "SHOW: " + this);
		mHandler.obtainMessage(0, windowToken).sendToTarget();
		mHandler.obtainMessage(SHOW, windowToken).sendToTarget();
		}

		/**
		@@ -391,7 +411,12 @@ public class Toast {
		@Override
		public void hide() {
		if (localLOGV) Log.v(TAG, "HIDE: " + this);
		mHandler.post(mHide);
		mHandler.obtainMessage(HIDE).sendToTarget();
		}

		public void cancel() {
		if (localLOGV) Log.v(TAG, "CANCEL: " + this);
		mHandler.obtainMessage(CANCEL).sendToTarget();
		}

		public void handleShow(IBinder windowToken) {

core/java/com/android/internal/widget/LockPatternUtils.java

+3 −42

Original line number	Diff line number	Diff line
		@@ -598,9 +598,6 @@ public class LockPatternUtils {
		setCredentialRequiredToDecrypt(false);
		}

		getDevicePolicyManager().setActivePasswordState(
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0, 0, 0, 0, 0, 0, userHandle);

		onAfterChangingPassword(userHandle);
		}

		@@ -647,6 +644,7 @@ public class LockPatternUtils {
		+ MIN_LOCK_PATTERN_SIZE + " dots long.");
		}

		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, userId);
		getLockSettings().setLockPattern(patternToString(pattern, userId), savedPattern, userId);
		DevicePolicyManager dpm = getDevicePolicyManager();

		@@ -664,9 +662,6 @@ public class LockPatternUtils {

		setBoolean(PATTERN_EVER_CHOSEN_KEY, true, userId);

		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, userId);
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
		pattern.size(), 0, 0, 0, 0, 0, 0, userId);
		onAfterChangingPassword(userId);
		} catch (RemoteException re) {
		Log.e(TAG, "Couldn't save lock pattern " + re);
		@@ -880,9 +875,9 @@ public class LockPatternUtils {
		+ "of length " + MIN_LOCK_PASSWORD_SIZE);
		}

		final int computedQuality = computePasswordQuality(password);
		setLong(PASSWORD_TYPE_KEY, Math.max(quality, computedQuality), userHandle);
		getLockSettings().setLockPassword(password, savedPassword, userHandle);
		getLockSettings().setSeparateProfileChallengeEnabled(userHandle, true, null);
		int computedQuality = computePasswordQuality(password);

		// Update the device encryption password.
		if (userHandle == UserHandle.USER_SYSTEM
		@@ -901,40 +896,6 @@ public class LockPatternUtils {
		}
		}

		setLong(PASSWORD_TYPE_KEY, Math.max(quality, computedQuality), userHandle);
		if (computedQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
		int letters = 0;
		int uppercase = 0;
		int lowercase = 0;
		int numbers = 0;
		int symbols = 0;
		int nonletter = 0;
		for (int i = 0; i < password.length(); i++) {
		char c = password.charAt(i);
		if (c >= 'A' && c <= 'Z') {
		letters++;
		uppercase++;
		} else if (c >= 'a' && c <= 'z') {
		letters++;
		lowercase++;
		} else if (c >= '0' && c <= '9') {
		numbers++;
		nonletter++;
		} else {
		symbols++;
		nonletter++;
		}
		}
		dpm.setActivePasswordState(Math.max(quality, computedQuality),
		password.length(), letters, uppercase, lowercase,
		numbers, symbols, nonletter, userHandle);
		} else {
		// The password is not anything.
		dpm.setActivePasswordState(
		DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
		0, 0, 0, 0, 0, 0, 0, userHandle);
		}

		// Add the password to the password history. We assume all
		// password hashes have the same length for simplicity of implementation.
		String passwordHistory = getString(PASSWORD_HISTORY_KEY, userHandle);