Merge "Fix bug #16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev

This commit is contained in:
Fabrice Di Meglio
2014-07-29 23:19:52 +00:00
committed by Android (Google) Code Review

View File

@@ -429,7 +429,7 @@ public class RunningProcessesView extends FrameLayout
mAdapter = new ServiceListAdapter(mState); mAdapter = new ServiceListAdapter(mState);
mListView.setAdapter(mAdapter); mListView.setAdapter(mAdapter);
mHeader = inflater.inflate(R.layout.running_processes_header, null); mHeader = inflater.inflate(R.layout.running_processes_header, null);
mListView.addHeaderView(mHeader); mListView.addHeaderView(mHeader, null, false /* set as not selectable */);
mColorBar = (LinearColorBar)mHeader.findViewById(R.id.color_bar); mColorBar = (LinearColorBar)mHeader.findViewById(R.id.color_bar);
Resources res = getResources(); Resources res = getResources();
mColorBar.setColors(res.getColor(R.color.running_processes_system_ram), mColorBar.setColors(res.getColor(R.color.running_processes_system_ram),