From d4700adcdfbfb155a9c2ae93f5cb456a04a4937e Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Tue, 20 Oct 2020 17:27:49 -0700
Subject: [PATCH] Make SignalStrength constructor public

Test: atest SignalStrengthTest
Fix: 171315098
CTS-Coverage-Bug: 171078601
Change-Id: I5eb389d0540912718c60d98b99501826c9fbbcb7
Merged-In: I5eb389d0540912718c60d98b99501826c9fbbcb7
---
 core/api/current.txt                                 | 1 +
 core/api/system-current.txt                          | 4 ----
 telephony/java/android/telephony/SignalStrength.java | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 2769c0a981e04..5829e1cfac93c 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -46095,6 +46095,7 @@ package android.telephony {
   }
 
   public class SignalStrength implements android.os.Parcelable {
+    ctor public SignalStrength(@NonNull android.telephony.SignalStrength);
     method public int describeContents();
     method @Deprecated public int getCdmaDbm();
     method @Deprecated public int getCdmaEcio();
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 0718b88a2fde0..18d10641d0cd3 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -9880,10 +9880,6 @@ package android.telephony {
     field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1
   }
 
-  public class SignalStrength implements android.os.Parcelable {
-    ctor public SignalStrength(@NonNull android.telephony.SignalStrength);
-  }
-
   public final class SmsCbCmasInfo implements android.os.Parcelable {
     ctor public SmsCbCmasInfo(int, int, int, int, int, int);
     method public int describeContents();
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 4a0f0076f257c..7bd0bc0b69ceb 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -18,7 +18,6 @@ package android.telephony;
 
 import android.annotation.ElapsedRealtimeLong;
 import android.annotation.NonNull;
-import android.annotation.SystemApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Build;
 import android.os.Bundle;
@@ -291,9 +290,7 @@ public class SignalStrength implements Parcelable {
      * This constructor is used to create a copy of an existing SignalStrength object.
      *
      * @param s Source SignalStrength
-     * @hide
      */
-    @SystemApi
     public SignalStrength(@NonNull SignalStrength s) {
         copyFrom(s);
     }