PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Settings for guava 27.1

Browse Source 
Futures.addCallback now requires an Executor argument.

Bug: 130306229
Test: m checkbuild
Change-Id: I1958918e26eff6c0966c7a6bcf3dec6029003162
This commit is contained in:
Colin Cross
2019-04-11 18:21:41 -07:00
parent 3f5718a002
commit e2abf3f5c6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/NetworkScanHelper.java
View File

@@ -31,6 +31,7 @@ import com.android.internal.telephony.CellNetworkScanResult;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import java.lang.annotation.Retention;
@@ -180,7 +181,7 @@ public class NetworkScanHelper {
int errCode = Integer.parseInt(t.getMessage());
onError(errCode);
}
});
}, MoreExecutors.directExecutor());
mExecutor.execute(new NetworkScanSyncTask(
mTelephonyManager, (SettableFuture) mNetworkScanFuture));
} else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {