diff options
| author | Zoey Chen <zoeychen@google.com> | 2021-03-17 06:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-17 06:46:27 +0000 |
| commit | dd68ace7e0f082394e10997cfb2e42fb0361e1f1 (patch) | |
| tree | 0ed82a76946564db4ae3a288f1bd9f8b43197cbc /core | |
| parent | 0aa487570c7dde6ad1e66c31d98af2fb82a815ef (diff) | |
| parent | 943a0c590b4481ef11fedbd63500ef243d1ce632 (diff) | |
Merge "[Telephony] Exposed PhysicalChannelConfigListener as public API instead of system"
Diffstat (limited to 'core')
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/telephony/TelephonyCallback.java | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 08672f517038..4d55bf90ad40 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40907,6 +40907,10 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onMessageWaitingIndicatorChanged(boolean); } + public static interface TelephonyCallback.PhysicalChannelConfigListener { + method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPhysicalChannelConfigChanged(@NonNull java.util.List<android.telephony.PhysicalChannelConfig>); + } + public static interface TelephonyCallback.PreciseDataConnectionStateListener { method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index da56f45e9d6e..68be0bfa1f24 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10025,10 +10025,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability); } - public static interface TelephonyCallback.PhysicalChannelConfigListener { - method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPhysicalChannelConfigChanged(@NonNull java.util.List<android.telephony.PhysicalChannelConfig>); - } - public static interface TelephonyCallback.PreciseCallStateListener { method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPreciseCallStateChanged(@NonNull android.telephony.PreciseCallState); } diff --git a/core/java/android/telephony/TelephonyCallback.java b/core/java/android/telephony/TelephonyCallback.java index a2584cae1b9c..73ba003bcfe4 100644 --- a/core/java/android/telephony/TelephonyCallback.java +++ b/core/java/android/telephony/TelephonyCallback.java @@ -1330,10 +1330,7 @@ public class TelephonyCallback { /** * Interface for current physical channel configuration listener. - * - * @hide */ - @SystemApi public interface PhysicalChannelConfigListener { /** * Callback invoked when the current physical channel configuration has changed |