Fix crash in GetViewById (9dad8db4) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmClock.java

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -474,8 +474,10 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
	public void run() {		public void run() {
	if (mScrollAlarmId != -1) {		if (mScrollAlarmId != -1) {
	View v = getViewById(mScrollAlarmId);		View v = getViewById(mScrollAlarmId);
			if (v != null) {
	Rect rect = new Rect(v.getLeft(), v.getTop(), v.getRight(), v.getBottom());		Rect rect = new Rect(v.getLeft(), v.getTop(), v.getRight(), v.getBottom());
	mList.requestChildRectangleOnScreen(v, rect, false);		mList.requestChildRectangleOnScreen(v, rect, false);
			}
	mScrollAlarmId = -1;		mScrollAlarmId = -1;
	}		}
	}		}
	@@ -1011,11 +1013,13 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
	private View getViewById(int id) {		private View getViewById(int id) {
	for (int i = 0; i < mList.getCount(); i++) {		for (int i = 0; i < mList.getCount(); i++) {
	View v = mList.getChildAt(i);		View v = mList.getChildAt(i);
			if (v != null) {
	ItemHolder h = (ItemHolder)(v.getTag());		ItemHolder h = (ItemHolder)(v.getTag());
	if (h.alarm.id == id) {		if (h != null && h.alarm.id == id) {
	return v;		return v;
	}		}
	}		}
			}
	return null;		return null;
	}		}