commit dd68ace7e0f082394e10997cfb2e42fb0361e1f1
author Zoey Chen <zoeychen@google.com> Wed Mar 17 06:46:27 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 17 06:46:27 2021 +0000
tree 0ed82a76946564db4ae3a288f1bd9f8b43197cbc
parent 0aa487570c7dde6ad1e66c31d98af2fb82a815ef
parent 943a0c590b4481ef11fedbd63500ef243d1ce632

Merge "[Telephony] Exposed PhysicalChannelConfigListener as public API instead of system"

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 08672f5..4d55bf9 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -40907,6 +40907,10 @@
     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);
   }

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index da56f45..68be0bf 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10025,10 +10025,6 @@
     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);
   }

core/java/android/telephony/TelephonyCallback.java

diff --git a/core/java/android/telephony/TelephonyCallback.java b/core/java/android/telephony/TelephonyCallback.java
index a2584cae..73ba003 100644
--- a/core/java/android/telephony/TelephonyCallback.java
+++ b/core/java/android/telephony/TelephonyCallback.java
@@ -1330,10 +1330,7 @@
 
     /**
      * Interface for current physical channel configuration listener.
-     *
-     * @hide
      */
-    @SystemApi
     public interface PhysicalChannelConfigListener {
         /**
          * Callback invoked when the current physical channel configuration has changed