Move selection after deleting last item in the list
Bug: 3429922
Change-Id: I9887082b6f07ed1f3d99158c9f65d789b33674ab
diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index 9b99639..be920db 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -520,12 +520,18 @@
protected void selectDefaultContact() {
Uri contactUri = null;
+ ContactListAdapter adapter = getAdapter();
if (mLastSelectedPosition != -1) {
- contactUri = getAdapter().getContactUri(mLastSelectedPosition);
+ int count = adapter.getCount();
+ int pos = mLastSelectedPosition;
+ if (pos >= count && count > 0) {
+ pos = count - 1;
+ }
+ contactUri = adapter.getContactUri(pos);
}
if (contactUri == null) {
- contactUri = getAdapter().getFirstContactUri();
+ contactUri = adapter.getFirstContactUri();
}
setSelectedContactUri(contactUri, false, mSmoothScrollRequested, false, false);