commit 0e4586f47b0c5855c54bd5ea8342b52bcc3a1bd2
author Nathan Harold <nharold@google.com> Wed Dec 19 10:36:58 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 19 10:36:58 2018 -0800
tree d6ac436e9e4ac2b54d8087e506750c3c737c977b
parent 0ee1e893ac0ebc4b349c52ccefd5830099a0313a
parent ff9932a7aa9eba089b016fb240198065f5d763ce

Merge "Annotate CallbackExecutor in requestCellInfoUpdate"
am: ff9932a7aa

Change-Id: I3523ef0d8b4c8b4a3bfedc6c220acae0599a62f0

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 3a337d5..bb48d53539 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -4861,7 +4861,7 @@
      */
     @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION)
     public void requestCellInfoUpdate(
-            @NonNull Executor executor, @NonNull CellInfoCallback callback) {
+            @NonNull @CallbackExecutor Executor executor, @NonNull CellInfoCallback callback) {
         try {
             ITelephony telephony = getITelephony();
             if (telephony == null) return;