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

Commit 0e4586f4 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Annotate CallbackExecutor in requestCellInfoUpdate" 

am: ff9932a7

Change-Id: I3523ef0d8b4c8b4a3bfedc6c220acae0599a62f0
parents 0ee1e893 ff9932a7

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -4861,7 +4861,7 @@ public class TelephonyManager { 
     */

     */

    @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION)

    @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION)

    public void requestCellInfoUpdate(

    public void requestCellInfoUpdate(

            @NonNull Executor executor, @NonNull CellInfoCallback callback) {

            @NonNull @CallbackExecutor Executor executor, @NonNull CellInfoCallback callback) {

        try {

        try {

            ITelephony telephony = getITelephony();

            ITelephony telephony = getITelephony();

            if (telephony == null) return;

            if (telephony == null) return;