PartsBin: Rework import of 5G Mode Switcher local src/aidl files

 ** even they are imported for all devices,
  we are guarding mode switcher  with overlay, so we shall be safe to go.

Change-Id: I039913b5f658d5a3a747b17ea5a07c28517d8bef

2 files changed, 18 insertions, 19 deletions

diff --git a/Android.mk b/Android.mk
index 832050b..28bbe3e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     AicpGear-preference \
     AicpGear-util
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src)
+LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, src)
 ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),cheeseburger dumpling))
     LOCAL_SRC_FILES += $(call all-java-files-under, src_5kh)
 endif
@@ -19,8 +20,7 @@ ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),guacamole guacamoleb hotdog hot
     LOCAL_SRC_FILES += $(call all-java-files-under, src_7kh)
 endif
 ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),instantnoodle instantnoodlep kebab))
-    LOCAL_SRC_FILES += $(call all-java-files-under, src_8kh) $(call all-Iaidl-files-under, src)
-    LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, src)
+    LOCAL_SRC_FILES += $(call all-java-files-under, src_8kh)
 LOCAL_STATIC_JAVA_LIBRARIES := \
     vendor.oneplus.hardware.camera-V1.0-java
 endif
diff --git a/src/com/aicp/device/DeviceSettings.java b/src/com/aicp/device/DeviceSettings.java
index 02df205..f8d0914 100644
--- a/src/com/aicp/device/DeviceSettings.java
+++ b/src/com/aicp/device/DeviceSettings.java
@@ -360,24 +360,23 @@ public class DeviceSettings extends PreferenceFragment implements
             }
         }
 
-        Intent mIntent = new Intent();
-        mIntent.setClassName("com.qualcomm.qcrilmsgtunnel", "com.qualcomm.qcrilmsgtunnel.QcrilMsgTunnelService");
-        getContext().bindService(mIntent, new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                IQcrilMsgTunnel tunnel = IQcrilMsgTunnel.Stub.asInterface(service);
-                if (tunnel != null)
-                    mProtocol = new Protocol(tunnel);
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-                mProtocol = null;
-            }
-        }, getContext().BIND_AUTO_CREATE);
-
         SelfRemovingPreferenceCategory networkCategory = (SelfRemovingPreferenceCategory) findPreference(KEY_NETWORK_CATEGORY);
         if (networkCategory != null) {
+            Intent mIntent = new Intent();
+            mIntent.setClassName("com.qualcomm.qcrilmsgtunnel", "com.qualcomm.qcrilmsgtunnel.QcrilMsgTunnelService");
+            getContext().bindService(mIntent, new ServiceConnection() {
+                @Override
+                public void onServiceConnected(ComponentName name, IBinder service) {
+                    IQcrilMsgTunnel tunnel = IQcrilMsgTunnel.Stub.asInterface(service);
+                    if (tunnel != null)
+                        mProtocol = new Protocol(tunnel);
+                }
+
+                @Override
+                public void onServiceDisconnected(ComponentName name) {
+                    mProtocol = null;
+                }
+            }, getContext().BIND_AUTO_CREATE);
         mNrModeSwitcher = (ListPreference) findPreference(KEY_NR_MODE_SWITCHER);
         mNrModeSwitcher.setOnPreferenceChangeListener(this);
         }