diff options
| author | Jack Yu <jackyu@google.com> | 2023-02-28 21:46:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-28 21:46:40 +0000 |
| commit | 8dfea8e36ec8badfd24f2d87a844e8618f14c8fb (patch) | |
| tree | 49c49f483b7073ad9076ec38332d196de3dd874d | |
| parent | 5f08dcb1326e11b33c7107a4e53c929dad07afb5 (diff) | |
| parent | 90ef9db71f585b123d5a32c6d7ad85e9b07e0455 (diff) | |
| download | AlternativeNetworkAccess-8dfea8e36ec8badfd24f2d87a844e8618f14c8fb.tar.gz | |
Revert "Replace CarrierConfigChange broadcast receiver with new listener API." am: 90ef9db71f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21648762
Change-Id: Ifebdb86ffa3494b773f4206e3e2f94ab99b114c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/android/ons/OpportunisticNetworkService.java | 20 |
2 files changed, 7 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fb40082..fb2346f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -56,6 +56,9 @@ <intent-filter> <action android:name="com.android.ons.action.ESIM_CONFIG"/> </intent-filter> + <intent-filter> + <action android:name="android.telephony.action.CARRIER_CONFIG_CHANGED"/> + </intent-filter> </receiver> </application> </manifest> diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java index 223cd37..485722f 100644 --- a/src/com/android/ons/OpportunisticNetworkService.java +++ b/src/com/android/ons/OpportunisticNetworkService.java @@ -71,7 +71,6 @@ public class OpportunisticNetworkService extends Service { @VisibleForTesting protected ONSProfileSelector mProfileSelector; private SharedPreferences mSharedPref; @VisibleForTesting protected HashMap<String, ONSConfigInput> mONSConfigInputHashMap; - private CarrierConfigManager.CarrierConfigChangeListener mCarrierConfigChangeListener; private static final String TAG = "ONS"; private static final String PREF_NAME = TAG; @@ -423,6 +422,10 @@ public class OpportunisticNetworkService extends Service { ); } break; + + case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED: + mONSProfileActivator.handleCarrierConfigChange(); + break; } } }.setIntent(intent)); @@ -435,12 +438,6 @@ public class OpportunisticNetworkService extends Service { super.onDestroy(); log("Destroyed Successfully..."); mHandler.getLooper().quitSafely(); - - // Unregister carrier configuration listener - CarrierConfigManager ccm = mContext.getSystemService(CarrierConfigManager.class); - if (ccm != null && mCarrierConfigChangeListener != null) { - ccm.unregisterCarrierConfigChangeListener(mCarrierConfigChangeListener); - } } /** @@ -465,15 +462,6 @@ public class OpportunisticNetworkService extends Service { new IntentFilter(TelephonyIntents.ACTION_SIM_STATE_CHANGED)); enableOpportunisticNetwork(getPersistentEnableState()); mONSProfileActivator = new ONSProfileActivator(mContext, mONSStats); - // Register carrier configuration change listener. - CarrierConfigManager ccm = mContext.getSystemService(CarrierConfigManager.class); - if (ccm != null) { - mCarrierConfigChangeListener = (slotIndex, subId, carrierId, specificCarrierId) - -> mONSProfileActivator.handleCarrierConfigChange(); - ccm.registerCarrierConfigChangeListener(mHandler::post, mCarrierConfigChangeListener); - } else { - log("Unable to register carrier configuration listener."); - } } private void handleCarrierAppAvailableNetworks( |