Merge tag 'android-6.0.1_r72' into HEAD (b3616bc6) · Commits · e / os / android_frameworks_base

core/java/android/hardware/fingerprint/FingerprintManager.java

+15 −6

Original line number	Diff line number	Diff line
		@@ -258,6 +258,7 @@ public class FingerprintManager {
		public static class AuthenticationResult {
		private Fingerprint mFingerprint;
		private CryptoObject mCryptoObject;
		private int mUserId;

		/**
		* Authentication result
		@@ -266,9 +267,10 @@ public class FingerprintManager {
		* @param fingerprint the recognized fingerprint data, if allowed.
		* @hide
		*/
		public AuthenticationResult(CryptoObject crypto, Fingerprint fingerprint) {
		public AuthenticationResult(CryptoObject crypto, Fingerprint fingerprint, int userId) {
		mCryptoObject = crypto;
		mFingerprint = fingerprint;
		mUserId = userId;
		}

		/**
		@@ -285,6 +287,12 @@ public class FingerprintManager {
		* @hide
		*/
		public Fingerprint getFingerprint() { return mFingerprint; }

		/**
		* Obtain the userId for which this fingerprint was authenticated.
		* @hide
		*/
		public int getUserId() { return mUserId; }
		};

		/**
		@@ -754,7 +762,7 @@ public class FingerprintManager {
		sendAcquiredResult((Long) msg.obj /* deviceId /, msg.arg1 / acquire info */);
		break;
		case MSG_AUTHENTICATION_SUCCEEDED:
		sendAuthenticatedSucceeded((Fingerprint) msg.obj);
		sendAuthenticatedSucceeded((Fingerprint) msg.obj, msg.arg1 /* userId */);
		break;
		case MSG_AUTHENTICATION_FAILED:
		sendAuthenticatedFailed();
		@@ -799,9 +807,10 @@ public class FingerprintManager {
		}
		}

		private void sendAuthenticatedSucceeded(Fingerprint fp) {
		private void sendAuthenticatedSucceeded(Fingerprint fp, int userId) {
		if (mAuthenticationCallback != null) {
		final AuthenticationResult result = new AuthenticationResult(mCryptoObject, fp);
		final AuthenticationResult result =
		new AuthenticationResult(mCryptoObject, fp, userId);
		mAuthenticationCallback.onAuthenticationSucceeded(result);
		}
		}
		@@ -941,8 +950,8 @@ public class FingerprintManager {
		}

		@Override // binder call
		public void onAuthenticationSucceeded(long deviceId, Fingerprint fp) {
		mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, fp).sendToTarget();
		public void onAuthenticationSucceeded(long deviceId, Fingerprint fp, int userId) {
		mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, userId, 0, fp).sendToTarget();
		}

		@Override // binder call

core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.os.UserHandle;
		oneway interface IFingerprintServiceReceiver {
		void onEnrollResult(long deviceId, int fingerId, int groupId, int remaining);
		void onAcquired(long deviceId, int acquiredInfo);
		void onAuthenticationSucceeded(long deviceId, in Fingerprint fp);
		void onAuthenticationSucceeded(long deviceId, in Fingerprint fp, int userId);
		void onAuthenticationFailed(long deviceId);
		void onError(long deviceId, int error);
		void onRemoved(long deviceId, int fingerId, int groupId);

core/java/android/os/Process.java

+15 −6

Original line number	Diff line number	Diff line
		@@ -539,6 +539,15 @@ public class Process {
		ZygoteState zygoteState, ArrayList<String> args)
		throws ZygoteStartFailedEx {
		try {
		// Throw early if any of the arguments are malformed. This means we can
		// avoid writing a partial response to the zygote.
		int sz = args.size();
		for (int i = 0; i < sz; i++) {
		if (args.get(i).indexOf('\n') >= 0) {
		throw new ZygoteStartFailedEx("embedded newlines not allowed");
		}
		}

		/**
		* See com.android.internal.os.ZygoteInit.readArgumentList()
		* Presently the wire format to the zygote process is:
		@@ -555,13 +564,8 @@ public class Process {
		writer.write(Integer.toString(args.size()));
		writer.newLine();

		int sz = args.size();
		for (int i = 0; i < sz; i++) {
		String arg = args.get(i);
		if (arg.indexOf('\n') >= 0) {
		throw new ZygoteStartFailedEx(
		"embedded newlines not allowed");
		}
		writer.write(arg);
		writer.newLine();
		}
		@@ -570,11 +574,16 @@ public class Process {

		// Should there be a timeout on this?
		ProcessStartResult result = new ProcessStartResult();

		// Always read the entire result from the input stream to avoid leaving
		// bytes in the stream for future process starts to accidentally stumble
		// upon.
		result.pid = inputStream.readInt();
		result.usingWrapper = inputStream.readBoolean();

		if (result.pid < 0) {
		throw new ZygoteStartFailedEx("fork() failed");
		}
		result.usingWrapper = inputStream.readBoolean();
		return result;
		} catch (IOException ex) {
		zygoteState.close();

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ public class LockPatternUtils {
		return false;
		}
		} catch (RemoteException re) {
		return true;
		return false;
		}
		}

		@@ -350,7 +350,7 @@ public class LockPatternUtils {
		return false;
		}
		} catch (RemoteException re) {
		return true;
		return false;
		}
		}

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -462,7 +462,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}
		}

		private void handleFingerprintAuthenticated() {

		private void handleFingerprintAuthenticated(int authUserId) {
		try {
		final int userId;
		try {
		@@ -471,6 +472,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		Log.e(TAG, "Failed to get current user id: ", e);
		return;
		}
		if (userId != authUserId) {
		Log.d(TAG, "Fingerprint authenticated for wrong user: " + authUserId);
		return;
		}
		if (isFingerprintDisabled(userId)) {
		Log.d(TAG, "Fingerprint disabled by DPM for userId: " + userId);
		return;
		@@ -737,7 +742,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {

		@Override
		public void onAuthenticationSucceeded(AuthenticationResult result) {
		handleFingerprintAuthenticated();
		handleFingerprintAuthenticated(result.getUserId());
		}

		@Override