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

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

Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" am: 863a88ef am:... 

Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" am: 863a88ef am: 82c1a3d0 am: abab02f6

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



Change-Id: I57ebf8c2a9ad9297daa002cc55c8c5fc512bf3ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b62f6629 abab02f6

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -8970,7 +8970,7 @@ public class TelephonyManager { 
     * @param executor The executor through which the callback should be invoked. Since the scan

     *        request may trigger multiple callbacks and they must be invoked in the same order as

     *        they are received by the platform, the user should provide an executor which executes

     *        tasks one at a time in serial order. For example AsyncTask.SERIAL_EXECUTOR.

     *        tasks one at a time in serial order.

     * @param callback Returns network scan results or errors.

     * @return A NetworkScan obj which contains a callback which can be used to stop the scan.

     */
@@ -9014,7 +9014,7 @@ public class TelephonyManager { 
     * @param executor The executor through which the callback should be invoked. Since the scan

     *        request may trigger multiple callbacks and they must be invoked in the same order as

     *        they are received by the platform, the user should provide an executor which executes

     *        tasks one at a time in serial order. For example AsyncTask.SERIAL_EXECUTOR.

     *        tasks one at a time in serial order.

     * @param callback Returns network scan results or errors.

     * @return A NetworkScan obj which contains a callback which can be used to stop the scan.

     */