Merge "Fix NPE in constructor"

This commit is contained in:
TreeHugger Robot
2019-03-20 17:06:17 +00:00
committed by Android (Google) Code Review

View File

@@ -48,16 +48,11 @@ public class PanelFragment extends Fragment {
private RecyclerView mPanelSlices;
private PanelContent mPanel;
private final MetricsFeatureProvider mMetricsProvider;
private MetricsFeatureProvider mMetricsProvider;
@VisibleForTesting
PanelSlicesAdapter mAdapter;
public PanelFragment() {
final Context context = getActivity();
mMetricsProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -83,6 +78,7 @@ public class PanelFragment extends Fragment {
.getPanelFeatureProvider()
.getPanel(activity, panelType, mediaPackageName);
mMetricsProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider();
// Log panel opened.
mMetricsProvider.action(
0 /* attribution */,