Merge "Fix NPE when using VisibilityLogger."

src/com/android/settings/DeviceAdminSettings.java

@@ -49,8 +49,8 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settings.core.instrumentation.Instrumentable;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -84,6 +84,13 @@ public class DeviceAdminSettings extends ListFragment implements Instrumentable
             return this.name.compareTo(other.name);
         }
     }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mVisibilityLoggerMixin.onAttach(context);
+    }
+
     /**
      * Internal collection of device admin info objects for all profiles associated with the current
      * user.

src/com/android/settings/UserDictionarySettings.java

@@ -80,6 +80,12 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab
         return MetricsProto.MetricsEvent.USER_DICTIONARY_SETTINGS;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mVisibilityLoggerMixin.onAttach(context);
+    }
+
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

src/com/android/settings/ZonePicker.java

@@ -136,6 +136,12 @@ public class ZonePicker extends ListFragment implements Instrumentable {
         return TimeZone.getTimeZone((String)((Map<?, ?>)item).get(ZoneGetter.KEY_ID));
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mVisibilityLoggerMixin.onAttach(context);
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.ZONE_PICKER;

src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java

@@ -50,11 +50,15 @@ public class VisibilityLoggerMixin implements LifecycleObserver, OnResume, OnPau
 
     @Override
     public void onResume() {
-        mMetricsFeature.visible(null /* context */, mMetricsCategory);
+        if (mMetricsFeature != null) {
+            mMetricsFeature.visible(null /* context */, mMetricsCategory);
+        }
     }
 
     @Override
     public void onPause() {
-        mMetricsFeature.hidden(null /* context */, mMetricsCategory);
+        if (mMetricsFeature != null) {
+            mMetricsFeature.hidden(null /* context */, mMetricsCategory);
+        }
     }
 }