commit 9bb9f48cf92c2cefd06762bc576c1358fcbfca5d
author Nathan Harold <nharold@google.com> Wed Mar 06 14:24:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 14:24:57 2019 -0800
tree 7c6e53146b89b64580b39c3d59dc86b2da4591d0
parent b54aa3d9aec501d1b423e95dee7e557d5916e798
parent c66121b3f4f260804293c049609fefc07adba536

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

Change-Id: I00a0c204862f71b118c0920339caee657bc52199

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index cf0f6ba..bc73125 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -44848,7 +44848,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 c516d97..480c9d9 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)) {