Snap for 12385180 from cc431eac2179c5ad75f29f58adb15bff890c7304 to 24Q4-release (eb084db4) · Commits · e / os / android_frameworks_base

core/api/current.txt

+9 −1

Original line number	Diff line number	Diff line
		@@ -33228,6 +33228,7 @@ package android.os {
		}

		public interface IBinder {
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") public default void addFrozenStateChangeCallback(@NonNull android.os.IBinder.FrozenStateChangeCallback) throws android.os.RemoteException;
		method public void dump(@NonNull java.io.FileDescriptor, @Nullable String[]) throws android.os.RemoteException;
		method public void dumpAsync(@NonNull java.io.FileDescriptor, @Nullable String[]) throws android.os.RemoteException;
		method @Nullable public String getInterfaceDescriptor() throws android.os.RemoteException;
		@@ -33236,6 +33237,7 @@ package android.os {
		method public void linkToDeath(@NonNull android.os.IBinder.DeathRecipient, int) throws android.os.RemoteException;
		method public boolean pingBinder();
		method @Nullable public android.os.IInterface queryLocalInterface(@NonNull String);
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") public default boolean removeFrozenStateChangeCallback(@NonNull android.os.IBinder.FrozenStateChangeCallback);
		method public boolean transact(int, @NonNull android.os.Parcel, @Nullable android.os.Parcel, int) throws android.os.RemoteException;
		method public boolean unlinkToDeath(@NonNull android.os.IBinder.DeathRecipient, int);
		field public static final int DUMP_TRANSACTION = 1598311760; // 0x5f444d50
		@@ -33253,6 +33255,12 @@ package android.os {
		method public default void binderDied(@NonNull android.os.IBinder);
		}

		@FlaggedApi("android.os.binder_frozen_state_change_callback") public static interface IBinder.FrozenStateChangeCallback {
		method public void onFrozenStateChanged(@NonNull android.os.IBinder, int);
		field public static final int STATE_FROZEN = 0; // 0x0
		field public static final int STATE_UNFROZEN = 1; // 0x1
		}

		public interface IInterface {
		method public android.os.IBinder asBinder();
		}
		@@ -44070,7 +44078,7 @@ package android.telephony {
		}

		public static final class CarrierConfigManager.Gps {
		field @FlaggedApi("android.location.flags.enable_ni_supl_message_injection_by_carrier_config") public static final String KEY_ENABLE_NI_SUPL_MESSAGE_INJECTION_BOOL = "gps.enable_ni_supl_message_injection_bool";
		field @FlaggedApi("android.location.flags.enable_ni_supl_message_injection_by_carrier_config_bugfix") public static final String KEY_ENABLE_NI_SUPL_MESSAGE_INJECTION_BOOL = "gps.enable_ni_supl_message_injection_bool";
		field public static final String KEY_PERSIST_LPP_MODE_BOOL = "gps.persist_lpp_mode_bool";
		field public static final String KEY_PREFIX = "gps.";
		}

core/java/android/app/ActivityThread.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -8288,12 +8288,12 @@ public final class ActivityThread extends ClientTransactionHandler
		}
		Context c = null;
		ApplicationInfo ai = info.applicationInfo;
		if (context.getPackageName().equals(ai.packageName)) {
		if (context != null && context.getPackageName().equals(ai.packageName)) {
		c = context;
		} else if (mInitialApplication != null &&
		mInitialApplication.getPackageName().equals(ai.packageName)) {
		c = mInitialApplication;
		} else {
		} else if (context != null) {
		try {
		c = context.createPackageContext(ai.packageName,
		Context.CONTEXT_INCLUDE_CODE);

core/java/android/app/notification.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -237,3 +237,11 @@ flag {
		description: "Guards new android.app.richongoingnotification api"
		bug: "337261753"
		}

		flag {
		name: "ui_rich_ongoing"
		is_exported: true
		namespace: "systemui"
		description: "Guards new android.app.richongoingnotification promotion and new uis"
		bug: "337261753"
		}
		No newline at end of file

core/java/android/content/pm/LauncherApps.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -778,8 +778,18 @@ public class LauncherApps {
		public List<LauncherActivityInfo> getActivityList(String packageName, UserHandle user) {
		logErrorForInvalidProfileAccess(user);
		try {
		return convertToActivityList(mService.getLauncherActivities(mContext.getPackageName(),
		packageName, user), user);
		final List<LauncherActivityInfo> activityList = convertToActivityList(
		mService.getLauncherActivities(
		mContext.getPackageName(),
		packageName,
		user
		), user);
		if (activityList.isEmpty()) {
		// b/350144057
		Log.d(TAG, "getActivityList: No launchable activities found for"
		+ "packageName=" + packageName + ", user=" + user);
		}
		return activityList;
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}

core/java/android/os/BinderProxy.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -650,13 +650,13 @@ public final class BinderProxy implements IBinder {
		* weakly referenced by JNI so the strong references here are needed to keep the callbacks
		* around until the proxy is GC'ed.
		*/
		private List<IFrozenStateChangeCallback> mFrozenStateChangeCallbacks =
		private List<FrozenStateChangeCallback> mFrozenStateChangeCallbacks =
		Collections.synchronizedList(new ArrayList<>());

		/**
		* See {@link IBinder#addFrozenStateChangeCallback(IFrozenStateChangeCallback)}
		* See {@link IBinder#addFrozenStateChangeCallback(FrozenStateChangeCallback)}
		*/
		public void addFrozenStateChangeCallback(IFrozenStateChangeCallback callback)
		public void addFrozenStateChangeCallback(FrozenStateChangeCallback callback)
		throws RemoteException {
		addFrozenStateChangeCallbackNative(callback);
		mFrozenStateChangeCallbacks.add(callback);
		@@ -665,16 +665,16 @@ public final class BinderProxy implements IBinder {
		/**
		* See {@link IBinder#removeFrozenStateChangeCallback}
		*/
		public boolean removeFrozenStateChangeCallback(IFrozenStateChangeCallback callback) {
		public boolean removeFrozenStateChangeCallback(FrozenStateChangeCallback callback) {
		mFrozenStateChangeCallbacks.remove(callback);
		return removeFrozenStateChangeCallbackNative(callback);
		}

		private native void addFrozenStateChangeCallbackNative(IFrozenStateChangeCallback callback)
		private native void addFrozenStateChangeCallbackNative(FrozenStateChangeCallback callback)
		throws RemoteException;

		private native boolean removeFrozenStateChangeCallbackNative(
		IFrozenStateChangeCallback callback);
		FrozenStateChangeCallback callback);

		/**
		* Perform a dump on the remote object
		@@ -762,10 +762,9 @@ public final class BinderProxy implements IBinder {
		}

		private static void invokeFrozenStateChangeCallback(
		IFrozenStateChangeCallback callback, IBinder binderProxy, int stateIndex) {
		FrozenStateChangeCallback callback, IBinder binderProxy, int stateIndex) {
		try {
		callback.onFrozenStateChanged(binderProxy,
		IFrozenStateChangeCallback.State.values()[stateIndex]);
		callback.onFrozenStateChanged(binderProxy, stateIndex);
		} catch (RuntimeException exc) {
		Log.w("BinderNative", "Uncaught exception from frozen state change callback",
		exc);