Merge "Optimization: Don't monitor internet connection or create handler if Auto-Provisioning is disabled." am: 22f368a9a4 am: e7d2cc9ac6 am: 96fc98f356

Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/1976732

Change-Id: I551396285b192ffdf6e9bf441bc1d21190695c28

1 files changed, 22 insertions, 18 deletions

diff --git a/src/com/android/ons/ONSProfileConfigurator.java b/src/com/android/ons/ONSProfileConfigurator.java
index b1b5b0c..11c4a45 100644
--- a/src/com/android/ons/ONSProfileConfigurator.java
+++ b/src/com/android/ons/ONSProfileConfigurator.java
@@ -71,26 +71,30 @@ public class ONSProfileConfigurator {
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
         mCarrierConfigMgr = mContext.getSystemService(CarrierConfigManager.class);
 
-        //Monitor internet connection.
-        final ConnectivityManager connMgr = (ConnectivityManager) context
-                .getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkRequest request = new NetworkRequest.Builder()
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-                .build();
-        connMgr.registerNetworkCallback(request, new NetworkCallback());
-
-        //Delete Subscription response handler.
-        if (sDeleteSubscriptionCallbackHandler == null) {
-            sDeleteSubscriptionCallbackHandler = new Handler(mContext.getMainLooper()) {
-                @Override
-                public void handleMessage(Message msg) {
-                    if (msg.what == REQUEST_CODE_DELETE_SUB) {
-                        if (mONSProfConfigListener != null) {
-                            mONSProfConfigListener.onOppSubscriptionDeleted(msg.arg1);
+        //Don't monitor internet connection or create handler if Auto-Provisioning is disabled.
+        if (isONSAutoProvisioningEnabled()) {
+            //Monitor internet connection.
+            final ConnectivityManager connMgr = (ConnectivityManager) context
+                    .getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkRequest request = new NetworkRequest.Builder()
+                    .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                    .build();
+            connMgr.registerNetworkCallback(request, new NetworkCallback());
+
+
+            //Delete Subscription response handler.
+            if (sDeleteSubscriptionCallbackHandler == null) {
+                sDeleteSubscriptionCallbackHandler = new Handler(mContext.getMainLooper()) {
+                    @Override
+                    public void handleMessage(Message msg) {
+                        if (msg.what == REQUEST_CODE_DELETE_SUB) {
+                            if (mONSProfConfigListener != null) {
+                                mONSProfConfigListener.onOppSubscriptionDeleted(msg.arg1);
+                            }
                         }
                     }
-                }
-            };
+                };
+            }
         }
     }