diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/Android.bp | 38 | ||||
| -rw-r--r-- | api/current.txt | 9 | ||||
| -rw-r--r-- | api/module-lib-current.txt | 93 | ||||
| -rw-r--r-- | api/module-lib-lint-baseline.txt | 29 | ||||
| -rw-r--r-- | api/module-lib-removed.txt | 1 | ||||
| -rwxr-xr-x | api/system-current.txt | 4 |
6 files changed, 21 insertions, 153 deletions
diff --git a/api/Android.bp b/api/Android.bp index 9f99b78c11c4..4d7f58edd870 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -16,25 +16,6 @@ package { default_visibility: ["//visibility:private"], } -// *-current.txt files for use by modules in other directories like cts -filegroup { - name: "frameworks-base-api-current.txt", - srcs: ["current.txt"], - visibility: ["//visibility:public"], -} - -filegroup { - name: "frameworks-base-api-system-current.txt", - srcs: ["system-current.txt"], - visibility: ["//visibility:public"], -} - -filegroup { - name: "frameworks-base-api-system-removed.txt", - srcs: ["system-removed.txt"], - visibility: ["//visibility:public"], -} - genrule { name: "current-api-xml", tools: ["metalava"], @@ -45,7 +26,7 @@ genrule { } genrule { - name: "frameworks-base-api-current-merged.txt", + name: "frameworks-base-api-current.txt", srcs: [ ":conscrypt.module.public.api{.public.api.txt}", ":framework-media{.public.api.txt}", @@ -72,10 +53,11 @@ genrule { dest: "android.txt", }, ], + visibility: ["//visibility:public"], } genrule { - name: "frameworks-base-api-removed-merged.txt", + name: "frameworks-base-api-removed.txt", srcs: [ ":conscrypt.module.public.api{.public.removed-api.txt}", ":framework-media{.public.removed-api.txt}", @@ -100,7 +82,7 @@ genrule { } genrule { - name: "frameworks-base-api-system-current-merged.txt", + name: "frameworks-base-api-system-current.txt", srcs: [ ":framework-media{.system.api.txt}", ":framework-mediaprovider{.system.api.txt}", @@ -126,10 +108,11 @@ genrule { dest: "android.txt", }, ], + visibility: ["//visibility:public"], } genrule { - name: "frameworks-base-api-system-removed-merged.txt", + name: "frameworks-base-api-system-removed.txt", srcs: [ ":framework-media{.system.removed-api.txt}", ":framework-mediaprovider{.system.removed-api.txt}", @@ -150,10 +133,11 @@ genrule { dest: "system-removed.txt", }, ], + visibility: ["//visibility:public"], } genrule { - name: "frameworks-base-api-module-lib-current-merged.txt", + name: "frameworks-base-api-module-lib-current.txt", srcs: [ ":framework-media{.module-lib.api.txt}", ":framework-mediaprovider{.module-lib.api.txt}", @@ -182,7 +166,7 @@ genrule { } genrule { - name: "frameworks-base-api-module-lib-removed-merged.txt", + name: "frameworks-base-api-module-lib-removed.txt", srcs: [ ":framework-media{.module-lib.removed-api.txt}", ":framework-mediaprovider{.module-lib.removed-api.txt}", @@ -208,8 +192,8 @@ genrule { genrule { name: "combined-removed-dex", srcs: [ - ":frameworks-base-api-removed-merged.txt", - ":frameworks-base-api-system-removed-merged.txt", + ":frameworks-base-api-removed.txt", + ":frameworks-base-api-system-removed.txt", ":android.car-stubs-docs{.removed-api.txt}", ":android.car-system-stubs-docs{.removed-api.txt}", ], diff --git a/api/current.txt b/api/current.txt index 19c31380a935..c2e75cd14968 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48321,7 +48321,9 @@ package android.telephony { method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String); method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String); method public boolean isConcurrentVoiceAndDataSupported(); + method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isDataConnectionAllowed(); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean isDataEnabled(); + method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled(); method public boolean isEmergencyNumber(@NonNull String); method public boolean isHearingAidCompatibilitySupported(); @@ -48342,7 +48344,8 @@ package android.telephony { method @Deprecated public String sendEnvelopeWithStatus(String); method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler); method public void sendVisualVoicemailSms(String, int, String, android.app.PendingIntent); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(boolean); + method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(boolean); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabledForReason(int, boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setForbiddenPlmns(@NonNull java.util.List<java.lang.String>); method public boolean setLine1NumberForDisplay(String, String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setNetworkSelectionModeAutomatic(); @@ -48390,6 +48393,10 @@ package android.telephony { field public static final int DATA_CONNECTING = 1; // 0x1 field public static final int DATA_DISCONNECTED = 0; // 0x0 field public static final int DATA_DISCONNECTING = 4; // 0x4 + field public static final int DATA_ENABLED_REASON_CARRIER = 2; // 0x2 + field public static final int DATA_ENABLED_REASON_POLICY = 1; // 0x1 + field public static final int DATA_ENABLED_REASON_THERMAL = 3; // 0x3 + field public static final int DATA_ENABLED_REASON_USER = 0; // 0x0 field public static final int DATA_SUSPENDED = 3; // 0x3 field public static final int DATA_UNKNOWN = -1; // 0xffffffff field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT"; diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt deleted file mode 100644 index 3b32b535f0bc..000000000000 --- a/api/module-lib-current.txt +++ /dev/null @@ -1,93 +0,0 @@ -// Signature format: 2.0 -package android.net { - - public final class TetheringConstants { - field public static final String EXTRA_ADD_TETHER_TYPE = "extraAddTetherType"; - field public static final String EXTRA_PROVISION_CALLBACK = "extraProvisionCallback"; - field public static final String EXTRA_REM_TETHER_TYPE = "extraRemTetherType"; - field public static final String EXTRA_RUN_PROVISION = "extraRunProvision"; - field public static final String EXTRA_SET_ALARM = "extraSetAlarm"; - } - - public class TetheringManager { - ctor public TetheringManager(@NonNull android.content.Context, @NonNull java.util.function.Supplier<android.os.IBinder>); - method public int getLastTetherError(@NonNull String); - method @NonNull public String[] getTetherableBluetoothRegexs(); - method @NonNull public String[] getTetherableIfaces(); - method @NonNull public String[] getTetherableUsbRegexs(); - method @NonNull public String[] getTetherableWifiRegexs(); - method @NonNull public String[] getTetheredIfaces(); - method @NonNull public String[] getTetheringErroredIfaces(); - method public boolean isTetheringSupported(); - method public boolean isTetheringSupported(@NonNull String); - method public void requestLatestTetheringEntitlementResult(int, @NonNull android.os.ResultReceiver, boolean); - method @Deprecated public int setUsbTethering(boolean); - method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public void startTethering(int, @NonNull java.util.concurrent.Executor, @NonNull android.net.TetheringManager.StartTetheringCallback); - method @Deprecated public int tether(@NonNull String); - method @Deprecated public int untether(@NonNull String); - } - - public static interface TetheringManager.TetheringEventCallback { - method public default void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps); - } - - public static class TetheringManager.TetheringInterfaceRegexps { - method @NonNull public java.util.List<java.lang.String> getTetherableBluetoothRegexs(); - method @NonNull public java.util.List<java.lang.String> getTetherableUsbRegexs(); - method @NonNull public java.util.List<java.lang.String> getTetherableWifiRegexs(); - } - -} - -package android.os { - - public class Binder implements android.os.IBinder { - method public final void markVintfStability(); - } - - public interface Parcelable { - method public default int getStability(); - } - - public class StatsFrameworkInitializer { - method public static void registerServiceWrappers(); - method public static void setStatsServiceManager(@NonNull android.os.StatsServiceManager); - } - - public class StatsServiceManager { - method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer(); - method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer(); - method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsdServiceRegisterer(); - } - - public static class StatsServiceManager.ServiceNotFoundException extends java.lang.Exception { - ctor public StatsServiceManager.ServiceNotFoundException(@NonNull String); - } - - public static final class StatsServiceManager.ServiceRegisterer { - method @Nullable public android.os.IBinder get(); - method @Nullable public android.os.IBinder getOrThrow() throws android.os.StatsServiceManager.ServiceNotFoundException; - } - -} - -package android.telephony { - - public abstract class CellSignalStrength { - method public static int getNumSignalStrengthLevels(); - } - - public class TelephonyManager { - method @NonNull public static int[] getAllNetworkTypes(); - } - -} - -package android.util { - - public final class Log { - method public static int logToRadioBuffer(int, @Nullable String, @Nullable String); - } - -} - diff --git a/api/module-lib-lint-baseline.txt b/api/module-lib-lint-baseline.txt deleted file mode 100644 index 56f7a02260a7..000000000000 --- a/api/module-lib-lint-baseline.txt +++ /dev/null @@ -1,29 +0,0 @@ -// Baseline format: 1.0 -ActionValue: android.net.TetheringConstants#EXTRA_ADD_TETHER_TYPE: - Inconsistent extra value; expected `android.net.extra.ADD_TETHER_TYPE`, was `extraAddTetherType` -ActionValue: android.net.TetheringConstants#EXTRA_PROVISION_CALLBACK: - Inconsistent extra value; expected `android.net.extra.PROVISION_CALLBACK`, was `extraProvisionCallback` -ActionValue: android.net.TetheringConstants#EXTRA_REM_TETHER_TYPE: - Inconsistent extra value; expected `android.net.extra.REM_TETHER_TYPE`, was `extraRemTetherType` -ActionValue: android.net.TetheringConstants#EXTRA_RUN_PROVISION: - Inconsistent extra value; expected `android.net.extra.RUN_PROVISION`, was `extraRunProvision` -ActionValue: android.net.TetheringConstants#EXTRA_SET_ALARM: - Inconsistent extra value; expected `android.net.extra.SET_ALARM`, was `extraSetAlarm` -ActionValue: android.net.TetheringManager#ACTION_TETHER_STATE_CHANGED: - Inconsistent action value; expected `android.net.action.TETHER_STATE_CHANGED`, was `android.net.conn.TETHER_STATE_CHANGED` -ActionValue: android.net.TetheringManager#EXTRA_ACTIVE_TETHER: - Inconsistent extra value; expected `android.net.extra.ACTIVE_TETHER`, was `tetherArray` -ActionValue: android.net.TetheringManager#EXTRA_AVAILABLE_TETHER: - Inconsistent extra value; expected `android.net.extra.AVAILABLE_TETHER`, was `availableArray` -ActionValue: android.net.TetheringManager#EXTRA_ERRORED_TETHER: - Inconsistent extra value; expected `android.net.extra.ERRORED_TETHER`, was `erroredArray` - - -ManagerConstructor: android.net.TetheringManager#TetheringManager(android.content.Context, java.util.function.Supplier<android.os.IBinder>): - Managers must always be obtained from Context; no direct constructors - - -PrivateSuperclass: android.location.GnssAntennaInfo.PhaseCenterVariationCorrections: - Public class android.location.GnssAntennaInfo.PhaseCenterVariationCorrections extends private class android.location.GnssAntennaInfo.SphericalCorrections -PrivateSuperclass: android.location.GnssAntennaInfo.SignalGainCorrections: - Public class android.location.GnssAntennaInfo.SignalGainCorrections extends private class android.location.GnssAntennaInfo.SphericalCorrections diff --git a/api/module-lib-removed.txt b/api/module-lib-removed.txt deleted file mode 100644 index d802177e249b..000000000000 --- a/api/module-lib-removed.txt +++ /dev/null @@ -1 +0,0 @@ -// Signature format: 2.0 diff --git a/api/system-current.txt b/api/system-current.txt index 0a3d67a05f1f..dc90877569d5 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8992,6 +8992,7 @@ package android.provider { field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; + field public static final String NAMESPACE_PROFCOLLECT_NATIVE_BOOT = "profcollect_native_boot"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; field public static final String NAMESPACE_RUNTIME = "runtime"; @@ -11247,7 +11248,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAnyRadioPoweredOn(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApnMetered(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataConnectionAllowed(); method public boolean isDataConnectivityPossible(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled(); @@ -11280,7 +11280,7 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallForwarding(@NonNull android.telephony.CallForwardingInfo, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallWaitingEnabled(boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean); + method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int); method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean); |