From bbc64501db49930f59af064bdc47007c065c6251 Mon Sep 17 00:00:00 2001
From: Yu-Han Yang <yuhany@google.com>
Date: Thu, 26 May 2022 18:08:26 +0000
Subject: [PATCH] Fix "NetworkCallback was not registered" crash

Bug: 233491431
Test: manual
Change-Id: I96f635b1a8e0b6bcded073ba0448aa50423afd45
---
 .../server/location/gnss/GnssNetworkConnectivityHandler.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
index 2e1aaf85d25a4..aba7572ee1a0b 100644
--- a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
+++ b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
@@ -599,6 +599,7 @@ class GnssNetworkConnectivityHandler {
                     SUPL_NETWORK_REQUEST_TIMEOUT_MILLIS);
         } catch (RuntimeException e) {
             Log.e(TAG, "Failed to request network.", e);
+            mSuplConnectivityCallback = null;
             handleReleaseSuplConnection(GPS_AGPS_DATA_CONN_FAILED);
         }
     }