From a19db96290c410e54101396b2109d47005c39eaa Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Sun, 8 Mar 2015 22:47:12 +0100 Subject: [PATCH] Fix DataHolder --- src/com/google/android/gms/common/data/DataHolder.java | 2 ++ .../google/android/gms/people/internal/IPeopleService.aidl | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/google/android/gms/common/data/DataHolder.java b/src/com/google/android/gms/common/data/DataHolder.java index 335a004a..75a57dd4 100644 --- a/src/com/google/android/gms/common/data/DataHolder.java +++ b/src/com/google/android/gms/common/data/DataHolder.java @@ -49,6 +49,8 @@ public class DataHolder extends AutoSafeParcelable { cursorWindow = new CursorWindow(false); cursorWindow.setNumColumns(cursor.getColumnCount()); windows.add(cursorWindow); + if (!cursorWindow.allocRow()) + throw new RuntimeException("Impossible to store Cursor in CursorWindows"); row = 0; } for (int i = 0; i < cursor.getColumnCount(); i++) { diff --git a/src/com/google/android/gms/people/internal/IPeopleService.aidl b/src/com/google/android/gms/people/internal/IPeopleService.aidl index 15a17a33..c6cd04e9 100644 --- a/src/com/google/android/gms/people/internal/IPeopleService.aidl +++ b/src/com/google/android/gms/people/internal/IPeopleService.aidl @@ -13,7 +13,7 @@ interface IPeopleService { // Bundle syncRawContact(in Uri var1); // void loadPeopleForAggregation8(IPeopleCallbacks var1, String var2, String var3, String var4, boolean var5, int var6); // void setSyncToContactsSettings(IPeopleCallbacks var1, String var2, boolean var3, in String[] var4); - // Bundle registerDataChangedListener(IPeopleCallbacks var1, boolean var2, String var3, String var4, int var5); + // Bundle startSync(String var1, String var2); // void requestSync(IPeopleCallbacks var1, String var2, String var3, in Uri var4); // void updatePersonCirclesOld(IPeopleCallbacks var1, String var2, String var3, String var4, in List var5, in List var6); @@ -31,5 +31,6 @@ interface IPeopleService { // void addCircle(IPeopleCallbacks var1, String var2, String var3, String var4, String var5); // void addPeopleToCircle(IPeopleCallbacks var1, String var2, String var3, String var4, in List var5); - void loadOwners(IPeopleCallbacks callbacks, boolean var2, boolean var3, String var4, String var5, int var6) = 304; + Bundle registerDataChangedListener(IPeopleCallbacks callbacks, boolean register, String var3, String var4, int scopes) = 10; + void loadOwners(IPeopleCallbacks callbacks, boolean var2, boolean var3, String account, String var5, int sortOrder) = 304; }