Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6013973b authored by Fred Quintana's avatar Fred Quintana
Browse files

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
parent f3113e3e

src/com/android/contacts/ViewContactActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -340,9 +340,6 @@ public class ViewContactActivity extends Activity 
                        Entity entity = iterator.next();

                        newEntities.add(entity);

                    }

                } catch (RemoteException e) {

                    Log.w(TAG, "Problem reading contact data: " + e.toString());

                    return null;

                } finally {

                    iterator.close();

                }

src/com/android/contacts/model/EntitySet.java

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.EntityIterator; 
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 @@ public class EntitySet extends ArrayList<EntityDelta> implements Parcelable { 
                state.add(entity);

            }

            return state;

        } catch (RemoteException e) {

            throw new IllegalStateException("Problem querying contact details", e);

        } finally {

            iterator.close();

        }

src/com/android/contacts/ui/ContactsPreferencesActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -574,8 +574,6 @@ public final class ContactsPreferencesActivity extends ExpandableListActivity im 
                // 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();

            }