Snap for 5706813 from 9917209b15696c37251bc8b10d692eafbe803ba9 to qt-qpr1-release (78e3ec85) · Commits · e / os / android_frameworks_base

core/java/android/app/servertransaction/NewIntentItem.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.app.servertransaction;

		import static android.app.servertransaction.ActivityLifecycleItem.ON_RESUME;
		import static android.app.servertransaction.ActivityLifecycleItem.UNDEFINED;

		import android.annotation.UnsupportedAppUsage;
		import android.app.ClientTransactionHandler;
		@@ -38,10 +39,11 @@ public class NewIntentItem extends ClientTransactionItem {

		@UnsupportedAppUsage
		private List<ReferrerIntent> mIntents;
		private boolean mResume;

		@Override
		public int getPostExecutionState() {
		return ON_RESUME;
		return mResume ? ON_RESUME : UNDEFINED;
		}

		@Override
		@@ -58,12 +60,13 @@ public class NewIntentItem extends ClientTransactionItem {
		private NewIntentItem() {}

		/** Obtain an instance initialized with provided params. */
		public static NewIntentItem obtain(List<ReferrerIntent> intents) {
		public static NewIntentItem obtain(List<ReferrerIntent> intents, boolean resume) {
		NewIntentItem instance = ObjectPool.obtain(NewIntentItem.class);
		if (instance == null) {
		instance = new NewIntentItem();
		}
		instance.mIntents = intents;
		instance.mResume = resume;

		return instance;
		}
		@@ -71,6 +74,7 @@ public class NewIntentItem extends ClientTransactionItem {
		@Override
		public void recycle() {
		mIntents = null;
		mResume = false;
		ObjectPool.recycle(this);
		}

		@@ -80,11 +84,13 @@ public class NewIntentItem extends ClientTransactionItem {
		/** Write to Parcel. */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeBoolean(mResume);
		dest.writeTypedList(mIntents, flags);
		}

		/** Read from Parcel. */
		private NewIntentItem(Parcel in) {
		mResume = in.readBoolean();
		mIntents = in.createTypedArrayList(ReferrerIntent.CREATOR);
		}

		@@ -108,18 +114,19 @@ public class NewIntentItem extends ClientTransactionItem {
		return false;
		}
		final NewIntentItem other = (NewIntentItem) o;
		return Objects.equals(mIntents, other.mIntents);
		return mResume == other.mResume && Objects.equals(mIntents, other.mIntents);
		}

		@Override
		public int hashCode() {
		int result = 17;
		result = 31 * result + (mResume ? 1 : 0);
		result = 31 * result + mIntents.hashCode();
		return result;
		}

		@Override
		public String toString() {
		return "NewIntentItem{intents=" + mIntents + "}";
		return "NewIntentItem{intents=" + mIntents + ",resume=" + mResume + "}";
		}
		}

core/java/android/hardware/face/FaceManager.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		* @hide
		*/
		@RequiresPermission(MANAGE_BIOMETRIC)
		public void enroll(byte[] token, CancellationSignal cancel,
		public void enroll(int userId, byte[] token, CancellationSignal cancel,
		EnrollmentCallback callback, int[] disabledFeatures) {
		if (callback == null) {
		throw new IllegalArgumentException("Must supply an enrollment callback");
		@@ -281,7 +281,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		try {
		mEnrollmentCallback = callback;
		Trace.beginSection("FaceManager#enroll");
		mService.enroll(mToken, token, mServiceReceiver,
		mService.enroll(userId, mToken, token, mServiceReceiver,
		mContext.getOpPackageName(), disabledFeatures);
		} catch (RemoteException e) {
		Log.w(TAG, "Remote exception in enroll: ", e);
		@@ -339,12 +339,13 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		* @hide
		*/
		@RequiresPermission(MANAGE_BIOMETRIC)
		public void setFeature(int feature, boolean enabled, byte[] token,
		public void setFeature(int userId, int feature, boolean enabled, byte[] token,
		SetFeatureCallback callback) {
		if (mService != null) {
		try {
		mSetFeatureCallback = callback;
		mService.setFeature(feature, enabled, token, mServiceReceiver);
		mService.setFeature(userId, feature, enabled, token, mServiceReceiver,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -355,11 +356,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		* @hide
		*/
		@RequiresPermission(MANAGE_BIOMETRIC)
		public void getFeature(int feature, GetFeatureCallback callback) {
		public void getFeature(int userId, int feature, GetFeatureCallback callback) {
		if (mService != null) {
		try {
		mGetFeatureCallback = callback;
		mService.getFeature(feature, mServiceReceiver);
		mService.getFeature(userId, feature, mServiceReceiver, mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -414,7 +415,8 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
		try {
		mRemovalCallback = callback;
		mRemovalFace = face;
		mService.remove(mToken, face.getBiometricId(), userId, mServiceReceiver);
		mService.remove(mToken, face.getBiometricId(), userId, mServiceReceiver,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		Log.w(TAG, "Remote exception in remove: ", e);
		if (callback != null) {

core/java/android/hardware/face/IFaceService.aidl

+6 −5

Original line number	Diff line number	Diff line
		@@ -50,14 +50,15 @@ interface IFaceService {
		int callingUid, int callingPid, int callingUserId, boolean fromClient);

		// Start face enrollment
		void enroll(IBinder token, in byte [] cryptoToken, IFaceServiceReceiver receiver,
		void enroll(int userId, IBinder token, in byte [] cryptoToken, IFaceServiceReceiver receiver,
		String opPackageName, in int [] disabledFeatures);

		// Cancel enrollment in progress
		void cancelEnrollment(IBinder token);

		// Any errors resulting from this call will be returned to the listener
		void remove(IBinder token, int faceId, int userId, IFaceServiceReceiver receiver);
		void remove(IBinder token, int faceId, int userId, IFaceServiceReceiver receiver,
		String opPackageName);

		// Rename the face specified by faceId to the given name
		void rename(int faceId, String name);
		@@ -98,10 +99,10 @@ interface IFaceService {
		// Enumerate all faces
		void enumerate(IBinder token, int userId, IFaceServiceReceiver receiver);

		void setFeature(int feature, boolean enabled, in byte [] token,
		IFaceServiceReceiver receiver);
		void setFeature(int userId, int feature, boolean enabled, in byte [] token,
		IFaceServiceReceiver receiver, String opPackageName);

		void getFeature(int feature, IFaceServiceReceiver receiver);
		void getFeature(int userId, int feature, IFaceServiceReceiver receiver, String opPackageName);

		void userActivity();
		}

core/java/com/android/internal/app/ResolverActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -889,7 +889,8 @@ public class ResolverActivity extends Activity {
		: mAdapterView.getCheckedItemPosition();
		boolean hasIndexBeenFiltered = !mAdapter.hasFilteredItem();
		ResolveInfo ri = mAdapter.resolveInfoForPosition(which, hasIndexBeenFiltered);
		if (!ri.handleAllWebDataURI && id == R.id.button_always) {
		if (mUseLayoutForBrowsables
		&& !ri.handleAllWebDataURI && id == R.id.button_always) {
		showSettingsForSelected(ri);
		} else {
		startSelected(which, id == R.id.button_always, hasIndexBeenFiltered);

core/java/com/android/internal/os/ZygoteInit.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -188,13 +188,6 @@ public class ZygoteInit {
		System.loadLibrary("android");
		System.loadLibrary("compiler_rt");
		System.loadLibrary("jnigraphics");

		// tolerate missing sfplugin_ccodec which is only present on Codec 2 devices
		try {
		System.loadLibrary("sfplugin_ccodec");
		} catch (Error \| RuntimeException e) {
		Log.w(TAG, "Problem preloading sfplugin_ccodec: " + e);
		}
		}

		native private static void nativePreloadAppProcessHALs();