Snap for 13511273 from 849bf2846823dcdf328bb97e06a7154621fa40d6 to 25Q3-release (f097f9ab) · Commits · e / os / android_frameworks_base

api/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,11 @@ combined_apis {
		"framework-ranging",
		],
		default: [],
		}) + select(release_flag("RELEASE_TELEPHONY_MODULE"), {
		true: [
		"framework-telephony",
		],
		default: [],
		}),
		system_server_classpath: [
		"service-art",

boot/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ soong_config_module_type {
		"release_crashrecovery_module",
		"release_ondevice_intelligence_module",
		"release_package_profiling_module",
		"release_telephony_module",
		],
		properties: [
		"fragments",
		@@ -195,6 +196,15 @@ custom_platform_bootclasspath {
		},
		],
		},
		release_telephony_module: {
		fragments: [
		// only used if telephony is enabled.
		{
		apex: "com.android.telephony2",
		module: "com.android.telephony-bootclasspath-fragment",
		},
		],
		},
		},

		// Additional information needed by hidden api processing.

core/api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -284,6 +284,7 @@ package android {
		field public static final String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
		field public static final String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
		field public static final String REORDER_TASKS = "android.permission.REORDER_TASKS";
		field @FlaggedApi("com.android.window.flags.enable_window_repositioning_api") public static final String REPOSITION_SELF_WINDOWS = "android.permission.REPOSITION_SELF_WINDOWS";
		field public static final String REQUEST_COMPANION_PROFILE_APP_STREAMING = "android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING";
		field public static final String REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION = "android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION";
		field public static final String REQUEST_COMPANION_PROFILE_COMPUTER = "android.permission.REQUEST_COMPANION_PROFILE_COMPUTER";
		@@ -19069,12 +19070,18 @@ package android.hardware {
		field public static final int D_FP32 = 51; // 0x33
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int RGBA_10101010 = 59; // 0x3b
		field public static final int RGBA_1010102 = 43; // 0x2b
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_12_14") public static final int RGBA_12121212 = 65; // 0x41
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_12_14") public static final int RGBA_14141414 = 66; // 0x42
		field public static final int RGBA_8888 = 1; // 0x1
		field public static final int RGBA_FP16 = 22; // 0x16
		field public static final int RGBX_8888 = 2; // 0x2
		field public static final int RGB_565 = 4; // 0x4
		field public static final int RGB_888 = 3; // 0x3
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_12_14") public static final int RG_1212 = 63; // 0x3f
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_12_14") public static final int RG_1414 = 64; // 0x40
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int RG_1616 = 58; // 0x3a
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_12_14") public static final int R_12 = 61; // 0x3d
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_12_14") public static final int R_14 = 62; // 0x3e
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int R_16 = 57; // 0x39
		field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int R_8 = 56; // 0x38
		field public static final int S_UI8 = 53; // 0x35
		@@ -35191,6 +35198,7 @@ package android.os {
		field public static final int USAGE_CLASS_MEDIA = 3; // 0x3
		field public static final int USAGE_CLASS_UNKNOWN = 0; // 0x0
		field public static final int USAGE_COMMUNICATION_REQUEST = 65; // 0x41
		field @FlaggedApi("android.os.vibrator.haptic_feedback_with_custom_usage") public static final int USAGE_GESTURE_INPUT = 98; // 0x62
		field public static final int USAGE_HARDWARE_FEEDBACK = 50; // 0x32
		field @FlaggedApi("android.os.vibrator.vibration_attribute_ime_usage_api") public static final int USAGE_IME_FEEDBACK = 82; // 0x52
		field public static final int USAGE_MEDIA = 19; // 0x13

core/java/android/app/Notification.java

+47 −41

Original line number	Diff line number	Diff line
		@@ -3248,6 +3248,52 @@ public class Notification implements Parcelable
		}
		}

		/**
		* Get profile badge to be shown in the header (e.g. the briefcase icon for work profile).
		*
		* @param context the package context used to obtain the badge
		* @hide
		*/
		public static Bitmap getProfileBadge(Context context) {
		Drawable badge = getProfileBadgeDrawable(context);
		if (badge == null) {
		return null;
		}
		final int size = context.getResources().getDimensionPixelSize(
		Flags.notificationsRedesignTemplates()
		? R.dimen.notification_2025_badge_size
		: R.dimen.notification_badge_size);
		Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
		Canvas canvas = new Canvas(bitmap);
		badge.setBounds(0, 0, size, size);
		badge.draw(canvas);
		return bitmap;
		}

		private static Drawable getProfileBadgeDrawable(Context context) {
		if (context.getUserId() == UserHandle.USER_SYSTEM) {
		// This user can never be a badged profile,
		// and also includes USER_ALL system notifications.
		return null;
		}
		// Note: This assumes that the current user can read the profile badge of the
		// originating user.
		DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
		return dpm.getResources().getDrawable(
		getUpdatableProfileBadgeId(context), SOLID_COLORED, NOTIFICATION,
		() -> getDefaultProfileBadgeDrawable(context));
		}

		private static String getUpdatableProfileBadgeId(Context context) {
		return context.getSystemService(UserManager.class).isManagedProfile()
		? WORK_PROFILE_ICON : UNDEFINED;
		}

		private static Drawable getDefaultProfileBadgeDrawable(Context context) {
		return context.getPackageManager().getUserBadgeForDensityNoBackground(
		new UserHandle(context.getUserId()), 0);
		}

		/**
		* @hide
		*/
		@@ -5954,48 +6000,8 @@ public class Notification implements Parcelable
		PorterDuff.Mode.SRC_ATOP);
		}

		private Drawable getProfileBadgeDrawable() {
		if (mContext.getUserId() == UserHandle.USER_SYSTEM) {
		// This user can never be a badged profile,
		// and also includes USER_ALL system notifications.
		return null;
		}
		// Note: This assumes that the current user can read the profile badge of the
		// originating user.
		DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
		return dpm.getResources().getDrawable(
		getUpdatableProfileBadgeId(), SOLID_COLORED, NOTIFICATION,
		this::getDefaultProfileBadgeDrawable);
		}

		private String getUpdatableProfileBadgeId() {
		return mContext.getSystemService(UserManager.class).isManagedProfile()
		? WORK_PROFILE_ICON : UNDEFINED;
		}

		private Drawable getDefaultProfileBadgeDrawable() {
		return mContext.getPackageManager().getUserBadgeForDensityNoBackground(
		new UserHandle(mContext.getUserId()), 0);
		}

		private Bitmap getProfileBadge() {
		Drawable badge = getProfileBadgeDrawable();
		if (badge == null) {
		return null;
		}
		final int size = mContext.getResources().getDimensionPixelSize(
		Flags.notificationsRedesignTemplates()
		? R.dimen.notification_2025_badge_size
		: R.dimen.notification_badge_size);
		Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
		Canvas canvas = new Canvas(bitmap);
		badge.setBounds(0, 0, size, size);
		badge.draw(canvas);
		return bitmap;
		}

		private void bindProfileBadge(RemoteViews contentView, StandardTemplateParams p) {
		Bitmap profileBadge = getProfileBadge();
		Bitmap profileBadge = Notification.getProfileBadge(mContext);

		if (profileBadge != null) {
		contentView.setImageViewBitmap(R.id.profile_badge, profileBadge);

core/java/android/app/TaskInfo.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -364,6 +364,7 @@ public class TaskInfo {
		* The last non-fullscreen bounds the task was launched in or resized to.
		* @hide
		*/
		@Nullable
		public Rect lastNonFullscreenBounds;

		/**