some changes due to an API review
- make EntityIterator extend Iterator and thus not throw a
RemoteException, instead converting it into a RuntimeException.
- rename ActiveSyncInfo to SyncInfo
- change getActiveSync to getCurrentSync
- remove the accessors in SyncInfo and instead make the final
fields publicly accessible
Change-Id: Id67bc22b34f3c0d8bf59a70c38c2e4622dd83e29
http://b/issue?id=2553539
http://b/issue?id=2553541
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 2824ab9..2b2a8f7 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -340,9 +340,6 @@
Entity entity = iterator.next();
newEntities.add(entity);
}
- } catch (RemoteException e) {
- Log.w(TAG, "Problem reading contact data: " + e.toString());
- return null;
} finally {
iterator.close();
}
diff --git a/src/com/android/contacts/model/EntitySet.java b/src/com/android/contacts/model/EntitySet.java
index 7502d0f..83fe338 100644
--- a/src/com/android/contacts/model/EntitySet.java
+++ b/src/com/android/contacts/model/EntitySet.java
@@ -23,7 +23,6 @@
import android.content.ContentProviderOperation.Builder;
import android.os.Parcel;
import android.os.Parcelable;
-import android.os.RemoteException;
import android.provider.ContactsContract.AggregationExceptions;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.RawContacts;
@@ -76,8 +75,6 @@
state.add(entity);
}
return state;
- } catch (RemoteException e) {
- throw new IllegalStateException("Problem querying contact details", e);
} finally {
iterator.close();
}
diff --git a/src/com/android/contacts/ui/ContactsPreferencesActivity.java b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
index b6a20c7..0432aaf 100644
--- a/src/com/android/contacts/ui/ContactsPreferencesActivity.java
+++ b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
@@ -574,8 +574,6 @@
// Create single entry handling ungrouped status
mUngrouped = GroupDelta.fromSettings(resolver, accountName, accountType, hasGroups);
addGroup(mUngrouped);
- } catch (RemoteException e) {
- Log.w(TAG, "Problem reading groups: " + e.toString());
} finally {
iterator.close();
}