Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d68d9f43 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix inconsistant nullability doc on onCellInfo()" am: 991fa9e7 am:... 

Merge "Fix inconsistant nullability doc on onCellInfo()" am: 991fa9e7 am: c92aeec5 am: a1d72e22 am: a8f94d66 am: 187dbf52

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2165858



Change-Id: I6a7716a3709ebb2bc0d1d8d0899cc4d55017fde3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a470878 187dbf52

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -6641,7 +6641,7 @@ public class TelephonyManager { 
         * list will be provided. If an error occurs, null will be provided unless the onError

         * callback is overridden.

         *

         * @param cellInfo a list of {@link CellInfo}, an empty list, or null.

         * @param cellInfo a list of {@link CellInfo} or an empty list.

         *

         * {@see android.telephony.TelephonyManager#getAllCellInfo getAllCellInfo()}

         */