Snap for 7546601 from 4de5e90844fe3895b17675afbcd3ceabfc4fe2e4 to sc-release (05157a1f) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,6 @@ interface IActivityManager {
		boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd);
		@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
		void suppressResizeConfigChanges(boolean suppress);
		boolean isAppStartModeDisabled(int uid, in String packageName);
		@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
		boolean unlockUser(int userid, in byte[] token, in byte[] secret,
		in IProgressListener listener);

+6 −0

Original line number	Diff line number	Diff line
		@@ -1158,9 +1158,15 @@ public class ResourcesManager {
		} else {
		activityResources.overrideConfig.unset();
		}

		// Update the Activity's override display id.
		activityResources.overrideDisplayId = displayId;

		// If a application info update was scheduled to occur in this process but has not
		// occurred yet, apply it now so the resources objects will have updated paths if
		// the assets sequence changed.
		applyAllPendingAppInfoUpdates();

		if (DEBUG) {
		Throwable here = new Throwable();
		here.fillInStackTrace();

+4 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,10 @@ public final class AttributionSource implements Parcelable {

		AttributionSource(@NonNull Parcel in) {
		this(AttributionSourceState.CREATOR.createFromParcel(in));

		// Since we just unpacked this object as part of it transiting a Binder
		// call, this is the perfect time to enforce that its UID can be trusted
		enforceCallingUid();
		}

		/** @hide */

+2 −12

Original line number	Diff line number	Diff line
		@@ -1382,12 +1382,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		String[] msgArray = context.getResources().getStringArray(
		com.android.internal.R.array.fingerprint_error_vendor);
		if (vendorCode < msgArray.length) {
		if (Build.IS_ENG \|\| Build.IS_USERDEBUG) {
		return msgArray[vendorCode];
		} else {
		return context.getString(
		com.android.internal.R.string.fingerprint_error_unable_to_process);
		}
		}
		}
		}
		@@ -1427,12 +1422,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		String[] msgArray = context.getResources().getStringArray(
		com.android.internal.R.array.fingerprint_acquired_vendor);
		if (vendorCode < msgArray.length) {
		if (Build.IS_ENG \|\| Build.IS_USERDEBUG) {
		return msgArray[vendorCode];
		} else {
		return context.getString(
		com.android.internal.R.string.fingerprint_error_unable_to_process);
		}
		}
		}
		break;

+1 −1

Original line number	Diff line number	Diff line
		@@ -2014,7 +2014,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		return mIndex;
		}

		/**s
		/**
		* @return the total number of activities for which the assist data is
		* being returned.
		*/