API Council Feedbacks am: 9ae1afee27 am: f4ed9f5712 (194617d2) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −3

api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3746,7 +3746,7 @@ package android.telephony {
	method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);		method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
	method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);		method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);
	method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);		method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);
	method public int getEmergencyNumberDbVersion();		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getEmergencyNumberDbVersion();
	method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
	method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();		method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
	method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);		method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);

core/java/android/os/ConfigUpdate.java

+24 −7

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.os;		package android.os;

			import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;

	/**		/**
	@@ -114,20 +115,36 @@ public final class ConfigUpdate {
	= "android.os.action.UPDATE_CARRIER_ID_DB";		= "android.os.action.UPDATE_CARRIER_ID_DB";

	/**		/**
	* Broadcast intent action indicating that the updated emergency number database is available.		* Update the emergency number database into the devices.
	* <p>Extra: "VERSION" the numeric version of the new data. Devices should only install if the		* <p>Extra: {@link #EXTRA_VERSION} the numeric version of the database.
	* update version is newer than the current one.		* <p>Extra: {@link #EXTRA_REQUIRED_HASH} the hash of the database.
	* <p>Extra: "REQUIRED_HASH" the hash of the current update data.		* <p>Input: {@link android.content.Intent#getData} the URI to download emergency number
	* <p>Input: {@link android.content.Intent#getData} is URI of downloaded emergency number file.		* database.
	* Devices should pick up the downloaded file and persist to the database
	* {@code com.android.internal.telephony.emergency.EmergencyNumberTracker}.
	*		*
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
			@RequiresPermission(android.Manifest.permission.UPDATE_CONFIG)
	public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB =		public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB =
	"android.os.action.UPDATE_EMERGENCY_NUMBER_DB";		"android.os.action.UPDATE_EMERGENCY_NUMBER_DB";

			/**
			* An integer to indicate the numeric version of the new data. Devices should only install
			* if the update version is newer than the current one.
			*
			* @hide
			*/
			@SystemApi
			public static final String EXTRA_VERSION = "android.os.extra.VERSION";

			/**
			* A string to indicate the hash of the data.
			*
			* @hide
			*/
			@SystemApi
			public static final String EXTRA_REQUIRED_HASH = "android.os.extra.REQUIRED_HASH";

	private ConfigUpdate() {		private ConfigUpdate() {
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -577,7 +577,7 @@ public class MobileSignalController extends SignalController<
	}		}

	boolean isDataDisabled() {		boolean isDataDisabled() {
	return !mPhone.isDataConnectionEnabled();		return !mPhone.isDataConnectionAllowed();
	}		}

	@VisibleForTesting		@VisibleForTesting

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -207,7 +207,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
	protected void setupNetworkController() {		protected void setupNetworkController() {
	// For now just pretend to be the data sim, so we can test that too.		// For now just pretend to be the data sim, so we can test that too.
	mSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;		mSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
	when(mMockTm.isDataConnectionEnabled()).thenReturn(true);		when(mMockTm.isDataConnectionAllowed()).thenReturn(true);
	setDefaultSubId(mSubId);		setDefaultSubId(mSubId);
	setSubscriptions(mSubId);		setSubscriptions(mSubId);
	mMobileSignalController = mNetworkController.mMobileSignalControllers.get(mSubId);		mMobileSignalController = mNetworkController.mMobileSignalControllers.get(mSubId);