Merge "Hide APIs exposed for Telephony mainline which is no longer needed in... (ef4fc7bc) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −19

Original line number	Diff line number	Diff line
		@@ -341,12 +341,10 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int);
		method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void killProcessesWhenImperceptible(@NonNull int[], @NonNull String);
		method @RequiresPermission(android.Manifest.permission.KILL_UID) public void killUid(int, String);
		method public void registerHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
		method public void setDeviceLocales(@NonNull android.os.LocaleList);
		method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public static void setPersistentVrThread(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull android.os.UserHandle);
		method public void unregisterHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver);
		}

		public static interface ActivityManager.OnUidImportanceListener {
		@@ -599,11 +597,6 @@ package android.app {
		field public static final String ACTION_DOWNLOAD_COMPLETED = "android.intent.action.DOWNLOAD_COMPLETED";
		}

		public abstract class HomeVisibilityObserver {
		ctor public HomeVisibilityObserver();
		method public abstract void onHomeVisibilityChanged(boolean);
		}

		public abstract class InstantAppResolverService extends android.app.Service {
		ctor public InstantAppResolverService();
		method public final void attachBaseContext(android.content.Context);
		@@ -11453,7 +11446,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method public void requestModemActivityInfo(@NonNull android.os.ResultReceiver);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestNumberVerification(@NonNull android.telephony.PhoneNumberRange, long, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.NumberVerificationCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetAllCarrierActions();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetCarrierKeysForImsiEncryption();
		@@ -11516,29 +11508,18 @@ package android.telephony {
		field @Deprecated public static final String EXTRA_APN_TYPE = "apnType";
		field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";
		field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";
		field public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE = "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4; // 0x4
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1; // 0x1
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0; // 0x0
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3; // 0x3
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2; // 0x2
		field public static final String EXTRA_ERROR_CODE = "errorCode";
		field public static final String EXTRA_PCO_ID = "pcoId";
		field public static final String EXTRA_PCO_VALUE = "pcoValue";
		field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";
		field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";
		field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";
		field public static final String EXTRA_SIM_COMBINATION_NAMES = "android.telephony.extra.SIM_COMBINATION_NAMES";
		field public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE = "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";
		field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1; // 0x1
		field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0; // 0x0
		field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";
		field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";
		field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";
		field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff
		field public static final int KEY_TYPE_EPDG = 1; // 0x1
		field public static final int KEY_TYPE_WLAN = 2; // 0x2
		field public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";
		field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
		field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
		field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

core/java/android/app/ActivityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -4821,9 +4821,9 @@ public class ActivityManager {

		/**
		* Register with {@link HomeVisibilityObserver} with ActivityManager.
		* TODO: b/144351078 expose as SystemApi
		* @hide
		*/
		@SystemApi
		public void registerHomeVisibilityObserver(@NonNull HomeVisibilityObserver observer) {
		Preconditions.checkNotNull(observer);
		try {
		@@ -4838,9 +4838,9 @@ public class ActivityManager {

		/**
		* Unregister with {@link HomeVisibilityObserver} with ActivityManager.
		* TODO: b/144351078 expose as SystemApi
		* @hide
		*/
		@SystemApi
		public void unregisterHomeVisibilityObserver(@NonNull HomeVisibilityObserver observer) {
		Preconditions.checkNotNull(observer);
		try {

core/java/android/app/HomeVisibilityObserver.java

+1 −2

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

		package android.app;

		import android.annotation.SystemApi;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		@@ -28,9 +27,9 @@ import java.util.List;
		* An observer / callback to create and register by
		* {@link ActivityManager#registerHomeVisibilityObserver} so that it's triggered when
		* visibility of home page changes.
		* TODO: b/144351078 expose as SystemApi
		* @hide
		*/
		@SystemApi
		public abstract class HomeVisibilityObserver {
		private Context mContext;
		private ActivityManager mActivityManager;

telephony/api/system-current.txt

+0 −12

Original line number	Diff line number	Diff line
		@@ -822,7 +822,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method public void requestModemActivityInfo(@NonNull android.os.ResultReceiver);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestNumberVerification(@NonNull android.telephony.PhoneNumberRange, long, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.NumberVerificationCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetAllCarrierActions();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetCarrierKeysForImsiEncryption();
		@@ -885,29 +884,18 @@ package android.telephony {
		field @Deprecated public static final String EXTRA_APN_TYPE = "apnType";
		field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";
		field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";
		field public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE = "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4; // 0x4
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1; // 0x1
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0; // 0x0
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3; // 0x3
		field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2; // 0x2
		field public static final String EXTRA_ERROR_CODE = "errorCode";
		field public static final String EXTRA_PCO_ID = "pcoId";
		field public static final String EXTRA_PCO_VALUE = "pcoValue";
		field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";
		field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";
		field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";
		field public static final String EXTRA_SIM_COMBINATION_NAMES = "android.telephony.extra.SIM_COMBINATION_NAMES";
		field public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE = "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";
		field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1; // 0x1
		field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0; // 0x0
		field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";
		field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";
		field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";
		field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff
		field public static final int KEY_TYPE_EPDG = 1; // 0x1
		field public static final int KEY_TYPE_WLAN = 2; // 0x2
		field public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";
		field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
		field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
		field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

telephony/java/android/telephony/TelephonyManager.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -165,7 +165,6 @@ public class TelephonyManager {
		* into the ResultReceiver Bundle.
		* @hide
		*/
		@SystemApi
		public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";

		/**
		@@ -1438,7 +1437,6 @@ public class TelephonyManager {
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE =
		"android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";

		@@ -1458,7 +1456,6 @@ public class TelephonyManager {
		* to indicate there's no need to re-select any default subscription.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0;

		/**
		@@ -1466,7 +1463,6 @@ public class TelephonyManager {
		* to indicate there's a need to select default data subscription.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1;

		/**
		@@ -1474,7 +1470,6 @@ public class TelephonyManager {
		* to indicate there's a need to select default voice call subscription.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2;

		/**
		@@ -1482,7 +1477,6 @@ public class TelephonyManager {
		* to indicate there's a need to select default sms subscription.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3;

		/**
		@@ -1492,7 +1486,6 @@ public class TelephonyManager {
		* which subscription should be the default subscription.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4;

		/**
		@@ -1502,7 +1495,6 @@ public class TelephonyManager {
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE =
		"android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";

		@@ -1519,7 +1511,6 @@ public class TelephonyManager {
		* to indicate there's no SIM combination warning.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0;

		/**
		@@ -1527,7 +1518,6 @@ public class TelephonyManager {
		* to indicate two active SIMs are both CDMA hence there might be functional limitation.
		* @hide
		*/
		@SystemApi
		public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1;

		/**
		@@ -1538,7 +1528,6 @@ public class TelephonyManager {
		*
		* @hide
		*/
		@SystemApi
		public static final String EXTRA_SIM_COMBINATION_NAMES =
		"android.telephony.extra.SIM_COMBINATION_NAMES";

		@@ -10278,7 +10267,6 @@ public class TelephonyManager {
		* {@link #MODEM_ACTIVITY_RESULT_KEY}.
		* @hide
		*/
		@SystemApi
		public void requestModemActivityInfo(@NonNull ResultReceiver result) {
		try {
		ITelephony service = getITelephony();