Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: a77a04e330 (aceba5cc) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+11 −4

telephony/java/android/telephony/TelephonyManager.java

+89 −0

Original line number	Original line	Diff line number	Diff line
	@@ -140,6 +140,7 @@ import java.util.List;
	import java.util.Locale;		import java.util.Locale;
	import java.util.Map;		import java.util.Map;
	import java.util.Objects;		import java.util.Objects;
			import java.util.Set;
	import java.util.UUID;		import java.util.UUID;
	import java.util.concurrent.Executor;		import java.util.concurrent.Executor;
	import java.util.concurrent.RejectedExecutionException;		import java.util.concurrent.RejectedExecutionException;
	@@ -16228,6 +16229,8 @@ public class TelephonyManager {
	* Callback to listen for when the set of packages with carrier privileges for a SIM changes.		* Callback to listen for when the set of packages with carrier privileges for a SIM changes.
	*		*
	* @hide		* @hide
			* @deprecated Use {@link CarrierPrivilegesCallback} instead. This API will be removed soon
			* prior to API finalization.
	*/		*/
	@SystemApi		@SystemApi
	public interface CarrierPrivilegesListener {		public interface CarrierPrivilegesListener {
	@@ -16247,6 +16250,54 @@ public class TelephonyManager {
	@NonNull List<String> privilegedPackageNames, @NonNull int[] privilegedUids);		@NonNull List<String> privilegedPackageNames, @NonNull int[] privilegedUids);
	}		}

			/**
			* Callbacks to listen for when the set of packages with carrier privileges for a SIM changes.
			*
			* <p>Of note, when multiple callbacks are registered, they may be triggered one after another.
			* The ordering of them is not guaranteed and thus should not be depend on.
			*
			* @hide
			*/
			@SystemApi
			public interface CarrierPrivilegesCallback {
			/**
			* Called when the set of packages with carrier privileges has changed.
			*
			* <p>Of note, this callback will <b>not</b> be fired if a carrier triggers a SIM profile
			* switch and the same set of packages remains privileged after the switch.
			*
			* <p>At registration, the callback will receive the current set of privileged packages.
			*
			* @param privilegedPackageNames The updated set of package names that have carrier
			* privileges
			* @param privilegedUids The updated set of UIDs that have carrier privileges
			*/
			void onCarrierPrivilegesChanged(
			@NonNull Set<String> privilegedPackageNames, @NonNull Set<Integer> privilegedUids);

			/**
			* Called when the {@link CarrierService} for the current user profile has changed.
			*
			* <p>This method does nothing by default. Clients that are interested in the carrier
			* service change should override this method to get package name and UID info.
			*
			* <p>At registration, the callback will receive the current carrier service info.
			*
			* <p>Of note, this callback will <b>not</b> be fired if a carrier triggers a SIM profile
			* switch and the same carrier service remains after switch.
			*
			* @param carrierServicePackageName package name of the {@link CarrierService}. May be
			* {@code null} when no carrier service is detected.
			* @param carrierServiceUid UID of the {@link CarrierService}. May be
			* {@link android.os.Process#INVALID_UID} if no carrier
			* service is detected.
			*/
			default void onCarrierServiceChanged(
			@Nullable String carrierServicePackageName, int carrierServiceUid) {
			// do nothing by default
			}
			}

	/**		/**
	* Registers a {@link CarrierPrivilegesListener} on the given {@code logicalSlotIndex} to		* Registers a {@link CarrierPrivilegesListener} on the given {@code logicalSlotIndex} to
	* receive callbacks when the set of packages with carrier privileges changes. The callback will		* receive callbacks when the set of packages with carrier privileges changes. The callback will
	@@ -16256,7 +16307,10 @@ public class TelephonyManager {
	* @param executor The executor where {@code listener} will be invoked		* @param executor The executor where {@code listener} will be invoked
	* @param listener The callback to register		* @param listener The callback to register
	* @hide		* @hide
			* @deprecated Use {@link #registerCarrierPrivilegesCallback} instead. This API will be
			* removed prior to API finalization.
	*/		*/
			@Deprecated
	@SystemApi		@SystemApi
	@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
	public void addCarrierPrivilegesListener(		public void addCarrierPrivilegesListener(
	@@ -16280,7 +16334,10 @@ public class TelephonyManager {
	* Unregisters an existing {@link CarrierPrivilegesListener}.		* Unregisters an existing {@link CarrierPrivilegesListener}.
	*		*
	* @hide		* @hide
			* @deprecated Use {@link #unregisterCarrierPrivilegesCallback} instead. This API will be
			* removed prior to API finalization.
	*/		*/
			@Deprecated
	@SystemApi		@SystemApi
	@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
	public void removeCarrierPrivilegesListener(@NonNull CarrierPrivilegesListener listener) {		public void removeCarrierPrivilegesListener(@NonNull CarrierPrivilegesListener listener) {
	@@ -16295,4 +16352,36 @@ public class TelephonyManager {
	}		}
	mTelephonyRegistryMgr.removeCarrierPrivilegesListener(listener);		mTelephonyRegistryMgr.removeCarrierPrivilegesListener(listener);
	}		}

			/**
			* Registers a {@link CarrierPrivilegesCallback} on the given {@code logicalSlotIndex} to
			* receive callbacks when the set of packages with carrier privileges changes. The callback will
			* immediately be called with the latest state.
			*
			* @param logicalSlotIndex The SIM slot to listen on
			* @param executor The executor where {@code callback} will be invoked
			* @param callback The callback to register
			* @hide
			*/
			@SystemApi
			@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
			public void registerCarrierPrivilegesCallback(
			int logicalSlotIndex,
			@NonNull @CallbackExecutor Executor executor,
			@NonNull CarrierPrivilegesCallback callback) {
			// TODO(b/216549778): cherry-pick implementation once merge conflict is resolved
			throw new UnsupportedOperationException("Not implemented, yet");
			}

			/**
			* Unregisters an existing {@link CarrierPrivilegesCallback}.
			*
			* @hide
			*/
			@SystemApi
			@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
			public void unregisterCarrierPrivilegesCallback(@NonNull CarrierPrivilegesCallback callback) {
			// TODO(b/216549778): cherry-pick implementation once merge conflict is resolved
			throw new UnsupportedOperationException("Not implemented, yet");
			}
	}		}