Merge "Support subscription for CarrierService#onLoadConfig" am: 33acead6f6... (a2a526d3) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -38348,7 +38348,8 @@ package android.service.carrier {
		method @Deprecated public final void notifyCarrierNetworkChange(boolean);
		method public final void notifyCarrierNetworkChange(int, boolean);
		method @CallSuper public android.os.IBinder onBind(android.content.Intent);
		method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
		method @Deprecated public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
		method @Nullable public android.os.PersistableBundle onLoadConfig(int, @Nullable android.service.carrier.CarrierIdentifier);
		field public static final String CARRIER_SERVICE_INTERFACE = "android.service.carrier.CarrierService";
		}

telephony/java/android/service/carrier/CarrierService.java

+65 −3

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		package android.service.carrier;

		import android.annotation.CallSuper;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.app.Service;
		import android.content.Context;
		import android.content.Intent;
		@@ -22,9 +24,12 @@ import android.os.Bundle;
		import android.os.IBinder;
		import android.os.PersistableBundle;
		import android.os.ResultReceiver;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyRegistryManager;
		import android.util.Log;

		import com.android.internal.util.ArrayUtils;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		@@ -87,7 +92,7 @@ public abstract class CarrierService extends Service {
		* PersistableBundle} may be overridden by the system's default configuration service.
		* </p>
		*
		* @param id contains details about the current carrier that can be used do decide what
		* @param id contains details about the current carrier that can be used to decide what
		* configuration values to return. Instead of using details like MCCMNC to decide
		* current carrier, it also contains subscription carrier id
		* {@link android.telephony.TelephonyManager#getSimCarrierId()}, a platform-wide
		@@ -95,9 +100,60 @@ public abstract class CarrierService extends Service {
		* id as the key to look up the carrier info.
		* @return a {@link PersistableBundle} object containing the configuration or null if default
		* values should be used.
		* @deprecated use {@link #onLoadConfig(int, CarrierIdentifier)} instead.
		*/
		@Deprecated
		public abstract PersistableBundle onLoadConfig(CarrierIdentifier id);

		/**
		* Override this method to set carrier configuration on the given {@code subscriptionId}.
		* <p>
		* This method will be called by telephony services to get carrier-specific configuration
		* values. The returned config will be saved by the system until,
		* <ol>
		* <li>The carrier app package is updated, or</li>
		* <li>The carrier app requests a reload with
		* {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId
		* notifyConfigChangedForSubId}.</li>
		* </ol>
		* This method can be called after a SIM card loads, which may be before or after boot.
		* </p>
		* <p>
		* This method should not block for a long time. If expensive operations (e.g. network access)
		* are required, this method can schedule the work and return null. Then, use
		* {@link android.telephony.CarrierConfigManager#notifyConfigChangedForSubId
		* notifyConfigChangedForSubId} to trigger a reload when the config is ready.
		* </p>
		* <p>
		* Implementations should use the keys defined in {@link android.telephony.CarrierConfigManager
		* CarrierConfigManager}. Any configuration values not set in the returned {@link
		* PersistableBundle} may be overridden by the system's default configuration service.
		* </p>
		* <p>
		* By default, this method just calls {@link #onLoadConfig(CarrierIdentifier)} with specified
		* CarrierIdentifier {@code id}. Carrier app with target SDK
		* {@link android.os.Build.VERSION_CODES#TIRAMISU} and above should override this method to
		* load carrier configuration on the given {@code subscriptionId}.
		* Note that {@link #onLoadConfig(CarrierIdentifier)} is still called prior to
		* {@link android.os.Build.VERSION_CODES#TIRAMISU}.
		* </p>
		*
		* @param subscriptionId the subscription on which the carrier app should load configuration
		* @param id contains details about the current carrier that can be used to decide what
		* configuration values to return. Instead of using details like MCCMNC to decide
		* current carrier, it also contains subscription carrier id
		* {@link android.telephony.TelephonyManager#getSimCarrierId()}, a platform-wide
		* unique identifier for each carrier, CarrierConfigService can directly use carrier
		* id as the key to look up the carrier info.
		* @return a {@link PersistableBundle} object containing the configuration or null if default
		* values should be used.
		*/
		@SuppressLint("NullableCollection")
		@Nullable
		public PersistableBundle onLoadConfig(int subscriptionId, @Nullable CarrierIdentifier id) {
		return onLoadConfig(id);
		}

		/**
		* Informs the system of an intentional upcoming carrier network change by
		* a carrier app. This call is optional and is only used to allow the
		@@ -179,10 +235,16 @@ public abstract class CarrierService extends Service {
		public static final String KEY_CONFIG_BUNDLE = "config_bundle";

		@Override
		public void getCarrierConfig(CarrierIdentifier id, ResultReceiver result) {
		public void getCarrierConfig(int phoneId, CarrierIdentifier id, ResultReceiver result) {
		try {
		int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		int[] subIds = SubscriptionManager.getSubId(phoneId);
		if (!ArrayUtils.isEmpty(subIds)) {
		// There should be at most one active subscription mapping to the phoneId.
		subId = subIds[0];
		}
		Bundle data = new Bundle();
		data.putParcelable(KEY_CONFIG_BUNDLE, CarrierService.this.onLoadConfig(id));
		data.putParcelable(KEY_CONFIG_BUNDLE, CarrierService.this.onLoadConfig(subId, id));
		result.send(RESULT_OK, data);
		} catch (Exception e) {
		Log.e(LOG_TAG, "Error in onLoadConfig: " + e.getMessage(), e);

telephony/java/android/service/carrier/ICarrierService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,5 +29,5 @@ import android.service.carrier.CarrierIdentifier;
		interface ICarrierService {

		/** @see android.service.carrier.CarrierService#onLoadConfig */
		oneway void getCarrierConfig(in CarrierIdentifier id, in ResultReceiver result);
		oneway void getCarrierConfig(in int phoneId, in CarrierIdentifier id, in ResultReceiver result);
		}