Snap for 11498394 from 3b0ac192c6965d6e0dbbe00c0a6a872b8521b380 to 24Q2-release (3577cc40) · Commits · e / os / android_frameworks_base

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,7 @@ java_defaults {
		// TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
		// system propagates "required" properly.
		"gps_debug.conf",
		"protolog.conf.json.gz",
		"core.protolog.pb",
		"framework-res",
		// any install dependencies should go into framework-minus-apex-install-dependencies
		// rather than here to avoid bloating incremental build time

core/java/Android.bp

+7 −11

Original line number	Diff line number	Diff line
		@@ -528,23 +528,19 @@ filegroup {
		],
		}

		// common protolog sources without classes that rely on Android SDK
		// PackageManager common
		filegroup {
		name: "protolog-common-no-android-src",
		name: "framework-pm-common-shared-srcs",
		srcs: [
		":protolog-common-src",
		],
		exclude_srcs: [
		"com/android/internal/protolog/common/ProtoLog.java",
		"com/android/server/pm/pkg/AndroidPackage.java",
		"com/android/server/pm/pkg/AndroidPackageSplit.java",
		],
		}

		// PackageManager common
		filegroup {
		name: "framework-pm-common-shared-srcs",
		name: "protolog-impl",
		srcs: [
		"com/android/server/pm/pkg/AndroidPackage.java",
		"com/android/server/pm/pkg/AndroidPackageSplit.java",
		"com/android/internal/protolog/ProtoLogImpl.java",
		],
		}

		@@ -554,7 +550,7 @@ java_library {
		srcs: [
		"com/android/internal/protolog/ProtoLogImpl.java",
		"com/android/internal/protolog/ProtoLogViewerConfigReader.java",
		":protolog-common-src",
		":perfetto_trace_javastream_protos",
		],
		}

core/java/android/app/Activity.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1002,6 +1002,9 @@ public class Activity extends ContextThemeWrapper
		new ActivityManager.TaskDescription();
		private int mLastTaskDescriptionHashCode;

		@ActivityInfo.ScreenOrientation
		private int mLastRequestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSET;

		protected static final int[] FOCUSED_STATE_SET = {com.android.internal.R.attr.state_focused};

		@SuppressWarnings("unused")
		@@ -7530,11 +7533,15 @@ public class Activity extends ContextThemeWrapper
		* {@link ActivityInfo#screenOrientation ActivityInfo.screenOrientation}.
		*/
		public void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) {
		if (requestedOrientation == mLastRequestedOrientation) {
		return;
		}
		if (mParent == null) {
		ActivityClient.getInstance().setRequestedOrientation(mToken, requestedOrientation);
		} else {
		mParent.setRequestedOrientation(requestedOrientation);
		}
		mLastRequestedOrientation = requestedOrientation;
		}

		/**
		@@ -7548,6 +7555,9 @@ public class Activity extends ContextThemeWrapper
		*/
		@ActivityInfo.ScreenOrientation
		public int getRequestedOrientation() {
		if (mLastRequestedOrientation != ActivityInfo.SCREEN_ORIENTATION_UNSET) {
		return mLastRequestedOrientation;
		}
		if (mParent == null) {
		return ActivityClient.getInstance().getRequestedOrientation(mToken);
		} else {

core/java/android/app/ActivityThread.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -211,6 +211,7 @@ import android.view.contentcapture.IContentCaptureOptionsCallback;
		import android.view.translation.TranslationSpec;
		import android.view.translation.UiTranslationSpec;
		import android.webkit.WebView;
		import android.window.ActivityWindowInfo;
		import android.window.ITaskFragmentOrganizer;
		import android.window.SizeConfigurationBuckets;
		import android.window.SplashScreen;
		@@ -603,6 +604,9 @@ public final class ActivityThread extends ClientTransactionHandler
		boolean hideForNow;
		Configuration createdConfig;
		Configuration overrideConfig;
		@NonNull
		private ActivityWindowInfo mActivityWindowInfo;

		// Used for consolidating configs before sending on to Activity.
		private final Configuration tmpConfig = new Configuration();
		// Callback used for updating activity override config and camera compat control state.
		@@ -670,7 +674,8 @@ public final class ActivityThread extends ClientTransactionHandler
		List<ReferrerIntent> pendingNewIntents, SceneTransitionInfo sceneTransitionInfo,
		boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client,
		IBinder assistToken, IBinder shareableActivityToken, boolean launchedFromBubble,
		IBinder taskFragmentToken, IBinder initialCallerInfoAccessToken) {
		IBinder taskFragmentToken, IBinder initialCallerInfoAccessToken,
		ActivityWindowInfo activityWindowInfo) {
		this.token = token;
		this.assistToken = assistToken;
		this.shareableActivityToken = shareableActivityToken;
		@@ -691,6 +696,7 @@ public final class ActivityThread extends ClientTransactionHandler
		mSceneTransitionInfo = sceneTransitionInfo;
		mLaunchedFromBubble = launchedFromBubble;
		mTaskFragmentToken = taskFragmentToken;
		mActivityWindowInfo = activityWindowInfo;
		init();
		}

		@@ -779,6 +785,11 @@ public final class ActivityThread extends ClientTransactionHandler
		return activity != null && activity.mVisibleFromServer;
		}

		@NonNull
		public ActivityWindowInfo getActivityWindowInfo() {
		return mActivityWindowInfo;
		}

		public String toString() {
		ComponentName componentName = intent != null ? intent.getComponent() : null;
		return "ActivityRecord{"

core/java/android/app/admin/PolicySizeVerifier.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,10 @@ public class PolicySizeVerifier {
		* Throw if Parcelable contains any string that's too long to be serialized.
		*/
		public static void enforceMaxParcelableFieldsLength(Parcelable parcelable) {
		// TODO(b/326662716) rework to protect against infinite recursion.
		if (true) {
		return;
		}
		Class<?> clazz = parcelable.getClass();

		Field[] fields = clazz.getDeclaredFields();