Snap for 12864127 from 579be20a7e183e32f14f3b1b7c2478e0d1f098a6 to 25Q2-release (690ff99a) · Commits · e / os / android_frameworks_base

core/java/android/telephony/TelephonyCallback.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1009,7 +1009,7 @@ public class TelephonyCallback {
		*/
		public interface CellInfoListener {
		/**
		* Callback invoked when a observed cell info has changed or new cells have been added
		* Callback invoked when an observed cell info has changed or new cells have been added
		* or removed on the registered subscription.
		* Note, the registration subscription ID s from {@link TelephonyManager} object
		* which registers TelephonyCallback by

+0 −14

Original line number	Diff line number	Diff line
		@@ -281,20 +281,6 @@ public final class BackNavigationInfo implements Parcelable {
		}
		}

		/**
		* Callback to be called when the back gesture is finished in order to notify the server that
		* it can ask app to start rendering.
		* @hide
		* @param triggerBack Boolean indicating if back gesture has been triggered.
		*/
		public void onBackGestureFinished(boolean triggerBack) {
		if (mOnBackNavigationDone != null) {
		Bundle result = new Bundle();
		result.putBoolean(KEY_GESTURE_FINISHED, triggerBack);
		mOnBackNavigationDone.sendResult(result);
		}
		}

		/**
		* Get customize animation info.
		* @hide

+0 −11

Original line number	Diff line number	Diff line
		@@ -291,17 +291,6 @@ flag {
		}
		}

		flag {
		name: "migrate_predictive_back_transition"
		namespace: "windowing_frontend"
		description: "Create transition when visibility change from predictive back"
		bug: "347168362"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "always_capture_activity_snapshot"
		namespace: "windowing_frontend"

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.widget.SearchView;

		import com.android.internal.R;

		import java.util.HashSet;
		import java.util.Locale;
		import java.util.Set;

		@@ -273,8 +272,9 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
		\|\| mIsNumberingSystem) {
		if (mListener != null) {
		mListener.onLocaleSelected(locale);
		}
		} else {
		returnToParentFrame();
		}
		} else {
		LocalePickerWithRegion selector;
		if (mayHaveDifferentNumberingSystem) {

+3 −2

Original line number	Diff line number	Diff line
		@@ -314,8 +314,9 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip
		when, uncompLen, crc);
		}

		ALOGE("Library '%s' is not PAGE(%zu)-aligned - will not be able to open it directly "
		"from apk.\n",
		ALOGE("extractNativeLibs=false library '%s' is not PAGE(%zu)-"
		"aligned within apk (APK alignment, not ELF alignment) -"
		"will not be able to open it directly from apk.\n",
		fileName, kPageSize);
		return INSTALL_FAILED_INVALID_APK;
		}