Merge "DataNetwork: replace deprecated carrier privileges listener with public API" (2932295d) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -847,20 +847,20 @@ public class CarrierPrivilegesTracker extends Handler {
		* <p>After being registered, the Registrant will be notified with the current Carrier
		* Privileged UIDs for this Phone.
		*
		* @deprecated Use {@link TelephonyManager#addCarrierPrivilegesListener} instead, which also
		* provides package names
		* @deprecated Use {@link TelephonyManager#registerCarrierPrivilegesCallback} instead, which
		* also provides package names
		* <p>TODO(b/211658797) migrate callers, then delete all Registrant logic from CPT
		*/
		@Deprecated
		public void registerCarrierPrivilegesListener(@NonNull Handler h, int what,
		@Nullable Object obj) {
		public void registerCarrierPrivilegesListener(
		@NonNull Handler h, int what, @Nullable Object obj) {
		sendMessage(obtainMessage(ACTION_REGISTER_LISTENER, new Registrant(h, what, obj)));
		}

		/**
		* Unregisters the given listener with this tracker.
		*
		* @deprecated Use {@link TelephonyManager#removeCarrierPrivilegesListener} instead
		* @deprecated Use {@link TelephonyManager#unregisterCarrierPrivilegesCallback} instead
		* <p>TODO(b/211658797) migrate callers, then delete all Registrant logic from CPT
		*/
		@Deprecated

src/java/com/android/internal/telephony/data/DataNetwork.java

+23 −3

Original line number	Diff line number	Diff line
		@@ -680,6 +680,9 @@ public class DataNetwork extends StateMachine {
		*/
		private @NonNull int[] mAdministratorUids = new int[0];

		/** Carrier privileges callback to monitor administrator UID change. */
		private @Nullable TelephonyManager.CarrierPrivilegesCallback mCarrierPrivilegesCallback;

		/**
		* Carrier service package uid. This UID will not change through the life cycle of data network.
		*/
		@@ -1048,8 +1051,22 @@ public class DataNetwork extends StateMachine {
		mDataServiceManagers.get(transport)
		.registerForDataCallListChanged(getHandler(), EVENT_DATA_STATE_CHANGED);
		}
		mPhone.getCarrierPrivilegesTracker().registerCarrierPrivilegesListener(getHandler(),
		EVENT_CARRIER_PRIVILEGED_UIDS_CHANGED, null);

		mCarrierPrivilegesCallback =
		(Set<String> privilegedPackageNames, Set<Integer> privilegedUids) -> {
		log("onCarrierPrivilegesChanged, Uids=" + privilegedUids.toString());
		Message message = obtainMessage(EVENT_CARRIER_PRIVILEGED_UIDS_CHANGED);
		AsyncResult.forMessage(
		message,
		privilegedUids.stream().mapToInt(i -> i).toArray(),
		null /* ex */);
		message.sendToTarget();
		};
		TelephonyManager tm = mPhone.getContext().getSystemService(TelephonyManager.class);
		if (tm != null) {
		tm.registerCarrierPrivilegesCallback(
		mPhone.getPhoneId(), getHandler()::post, mCarrierPrivilegesCallback);
		}

		mPhone.getServiceStateTracker().registerForCssIndicatorChanged(
		getHandler(), EVENT_CSS_INDICATOR_CHANGED, null);
		@@ -1083,7 +1100,10 @@ public class DataNetwork extends StateMachine {
		mPhone.getCallTracker().unregisterForVoiceCallEnded(getHandler());

		mPhone.getServiceStateTracker().unregisterForCssIndicatorChanged(getHandler());
		mPhone.getCarrierPrivilegesTracker().unregisterCarrierPrivilegesListener(getHandler());
		TelephonyManager tm = mPhone.getContext().getSystemService(TelephonyManager.class);
		if (tm != null && mCarrierPrivilegesCallback != null) {
		tm.unregisterCarrierPrivilegesCallback(mCarrierPrivilegesCallback);
		}
		for (int transport : mAccessNetworksManager.getAvailableTransports()) {
		mDataServiceManagers.get(transport)
		.unregisterForDataCallListChanged(getHandler());

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -1130,8 +1130,7 @@ public class DataNetworkTest extends TelephonyTest {
		any(Handler.class), anyInt());
		verify(mMockedWlanDataServiceManager).registerForDataCallListChanged(
		any(Handler.class), anyInt());
		verify(mCarrierPrivilegesTracker).registerCarrierPrivilegesListener(any(Handler.class),
		anyInt(), eq(null));
		verify(mTelephonyManager).registerCarrierPrivilegesCallback(anyInt(), any(), any());
		verify(mLinkBandwidthEstimator).registerCallback(
		any(LinkBandwidthEstimatorCallback.class));
		verify(mSimulatedCommandsVerifier).registerForNattKeepaliveStatus(any(Handler.class),
		@@ -1154,7 +1153,7 @@ public class DataNetworkTest extends TelephonyTest {
		verify(mDisplayInfoController).unregisterForTelephonyDisplayInfoChanged(any(Handler.class));
		verify(mMockedWwanDataServiceManager).unregisterForDataCallListChanged(any(Handler.class));
		verify(mMockedWlanDataServiceManager).unregisterForDataCallListChanged(any(Handler.class));
		verify(mCarrierPrivilegesTracker).unregisterCarrierPrivilegesListener(any(Handler.class));
		verify(mTelephonyManager).unregisterCarrierPrivilegesCallback(any());
		verify(mLinkBandwidthEstimator).unregisterCallback(
		any(LinkBandwidthEstimatorCallback.class));
		verify(mSimulatedCommandsVerifier).unregisterForNattKeepaliveStatus(any(Handler.class));