Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle TooManyRequestsException" into tm-dev am: db6650eb07

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18288928

Change-Id: I0c38f84d6d319d60033b1fa539de52445a94074b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu-Han Yang
2022-05-12 17:48:44 +00:00
committed by Automerger Merge Worker
parent 0075b600f7 db6650eb07
commit 8d670cef9b
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
View File

@@ -200,7 +200,7 @@ class GnssNetworkConnectivityHandler {
mHandler = new Handler(looper); mHandler = new Handler(looper);
mNiHandler = niHandler; mNiHandler = niHandler;
mConnMgr = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); mConnMgr = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
mSuplConnectivityCallback = createSuplConnectivityCallback(); mSuplConnectivityCallback = null;
} }
/** /**
@@ -584,11 +584,21 @@ class GnssNetworkConnectivityHandler {
networkRequestBuilder.setNetworkSpecifier(Integer.toString(mActiveSubId)); networkRequestBuilder.setNetworkSpecifier(Integer.toString(mActiveSubId));
} }
NetworkRequest networkRequest = networkRequestBuilder.build(); NetworkRequest networkRequest = networkRequestBuilder.build();
mConnMgr.requestNetwork( // Make sure we only have a single request.
networkRequest, if (mSuplConnectivityCallback != null) {
mSuplConnectivityCallback, mConnMgr.unregisterNetworkCallback(mSuplConnectivityCallback);
mHandler, }
SUPL_NETWORK_REQUEST_TIMEOUT_MILLIS); mSuplConnectivityCallback = createSuplConnectivityCallback();
try {
mConnMgr.requestNetwork(
networkRequest,
mSuplConnectivityCallback,
mHandler,
SUPL_NETWORK_REQUEST_TIMEOUT_MILLIS);
} catch (RuntimeException e) {
Log.e(TAG, "Failed to request network.", e);
handleReleaseSuplConnection(GPS_AGPS_DATA_CONN_FAILED);
}
} }
private int getNetworkCapability(int agpsType) { private int getNetworkCapability(int agpsType) {
@@ -619,7 +629,10 @@ class GnssNetworkConnectivityHandler {
} }
mAGpsDataConnectionState = AGPS_DATA_CONNECTION_CLOSED; mAGpsDataConnectionState = AGPS_DATA_CONNECTION_CLOSED;
mConnMgr.unregisterNetworkCallback(mSuplConnectivityCallback); if (mSuplConnectivityCallback != null) {
mConnMgr.unregisterNetworkCallback(mSuplConnectivityCallback);
mSuplConnectivityCallback = null;
}
switch (agpsDataConnStatus) { switch (agpsDataConnStatus) {
case GPS_AGPS_DATA_CONN_FAILED: case GPS_AGPS_DATA_CONN_FAILED:
native_agps_data_conn_failed(); native_agps_data_conn_failed();