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

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

Merge "Annotate CallbackExecutor in requestCellInfoUpdate" am: ff9932a7 am: 0e4586f4 

am: a6d51ea0

Change-Id: Iedb4ae4bcaf89a09d1886bda5b971fbfd2e36ea5
parents a03f107c a6d51ea0

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -4908,7 +4908,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;