commit c66121b3f4f260804293c049609fefc07adba536
author Nathan Harold <nharold@google.com> Wed Mar 06 14:08:35 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 14:08:35 2019 -0800
tree 33b091497d898fe0d71804d9c739e62c67c874f9
parent 74a88361754d270b15bdc656a7d876f3e2498d85
parent 7c59ddb0b8509768ffb526d57ec6c2b1947335d2

Merge "Move Annotations for getCellSignalStrengths" am: 5ba92cf940
am: 7c59ddb0b8

Change-Id: Ife18dafa8c9a910dfa4a80c76e3bc445b0c23e5f

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index b5398a7..5fca444 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42762,7 +42762,7 @@
     method @Deprecated public int getCdmaDbm();
     method @Deprecated public int getCdmaEcio();
     method @NonNull public java.util.List<android.telephony.CellSignalStrength> getCellSignalStrengths();
-    method public <T extends android.telephony.CellSignalStrength> java.util.List<T> getCellSignalStrengths(@NonNull Class<T>);
+    method @NonNull public <T extends android.telephony.CellSignalStrength> java.util.List<T> getCellSignalStrengths(@NonNull Class<T>);
     method @Deprecated public int getEvdoDbm();
     method @Deprecated public int getEvdoEcio();
     method @Deprecated public int getEvdoSnr();

telephony/java/android/telephony/SignalStrength.java

diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index d461bd0..cab2374 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -214,7 +214,7 @@
      * @see android.telephony#CellSignalStrengthCdma
      * @see android.telephony#CellSignalStrengthGsm
      */
-    public @NonNull List<CellSignalStrength> getCellSignalStrengths() {
+    @NonNull public List<CellSignalStrength> getCellSignalStrengths() {
         return getCellSignalStrengths(CellSignalStrength.class);
     }
 
@@ -240,7 +240,7 @@
      * @see android.telephony#CellSignalStrengthCdma
      * @see android.telephony#CellSignalStrengthGsm
      */
-    public <T extends CellSignalStrength> @NonNull List<T> getCellSignalStrengths(
+    @NonNull public <T extends CellSignalStrength> List<T> getCellSignalStrengths(
             @NonNull Class<T> clazz) {
         List<T> cssList = new ArrayList<>(2); // Usually have 2 or fewer elems
         if (mLte.isValid() && clazz.isAssignableFrom(CellSignalStrengthLte.class)) {