fixup! SystemUI: old style mobile data indicators

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

Author: neobuddy89

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java

@@ -138,6 +138,7 @@ protected void destroy() {
                 mDarkIconDispatcher.removeDarkReceiver((DarkReceiver) mGroup.getChildAt(i));
             }
             mGroup.removeAllViews();
+            Dependency.get(TunerService.class).removeTunable(this);
         }
 
         @Override
@@ -240,8 +241,6 @@ public IconManager(ViewGroup group, CommandQueue commandQueue) {
                 // In case we miss the first onAttachedToWindow event
                 tracker.onViewAttachedToWindow(mGroup);
             }
-
-            Dependency.get(TunerService.class).addTunable(this, USE_OLD_MOBILETYPE);
         }
 
         public boolean isDemoable() {
@@ -316,6 +315,7 @@ protected StatusBarMobileView addMobileIcon(int index, String slot, MobileIconSt
             StatusBarMobileView view = onCreateStatusBarMobileView(slot);
             view.applyMobileState(state);
             mGroup.addView(view, index, onCreateLayoutParams());
+            Dependency.get(TunerService.class).addTunable(this, USE_OLD_MOBILETYPE);
 
             if (mIsInDemoMode) {
                 mDemoStatusIcons.addMobileView(state);
@@ -348,6 +348,7 @@ protected LinearLayout.LayoutParams onCreateLayoutParams() {
 
         protected void destroy() {
             mGroup.removeAllViews();
+            Dependency.get(TunerService.class).removeTunable(this);
         }
 
         protected void onIconExternal(int viewIndex, int height) {