Merge branch 'master' of github.com:microg/android_external_GmsApi

This commit is contained in:
mar-v-in 2015-03-25 23:10:47 +01:00
commit c43facae3d
4 changed files with 13 additions and 0 deletions

View File

@ -0,0 +1,5 @@
package com.google.android.gms.http;
interface IGoogleHttpService {
Bundle checkUrl(String url);
}

View File

@ -7,4 +7,5 @@ import com.google.android.gms.common.data.DataHolder;
interface IPeopleCallbacks { interface IPeopleCallbacks {
void onDataHolder(int code, in Bundle resolution, in DataHolder holder) = 1; void onDataHolder(int code, in Bundle resolution, in DataHolder holder) = 1;
void onDataHolders(int code, in Bundle resolution, in DataHolder[] holders) = 3; void onDataHolders(int code, in Bundle resolution, in DataHolder[] holders) = 3;
void onParcelFileDescriptor(int code, in Bundle resolution, in ParcelFileDescriptor fileDescriptor, in Bundle extras) = 4;
} }

View File

@ -35,6 +35,9 @@ interface IPeopleService {
// void addPeopleToCircle(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5); // void addPeopleToCircle(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5);
Bundle registerDataChangedListener(IPeopleCallbacks callbacks, boolean register, String var3, String var4, int scopes) = 10; Bundle registerDataChangedListener(IPeopleCallbacks callbacks, boolean register, String var3, String var4, int scopes) = 10;
void loadCircles(IPeopleCallbacks callbacks, String account, String pageGaiaId, String circleId, int type, String var6, boolean var7) = 18;
Bundle requestSync(String account, String var2, long var3, boolean var5, boolean var6) = 204;
void loadOwners(IPeopleCallbacks callbacks, boolean var2, boolean var3, String account, String var5, int sortOrder) = 304; void loadOwners(IPeopleCallbacks callbacks, boolean var2, boolean var3, String account, String var5, int sortOrder) = 304;
void loadPeopleForAggregation(IPeopleCallbacks callbacks, String account, String var3, String filter, int var5, boolean var6, int var7, int var8, String var9, boolean var10, int var11, int var12) = 401;
ICancelToken loadOwnerAvatar(IPeopleCallbacks callbacks, String account, String pageId, int size, int flags) = 504; ICancelToken loadOwnerAvatar(IPeopleCallbacks callbacks, String account, String pageId, int size, int flags) = 504;
} }

View File

@ -0,0 +1,4 @@
package com.google.android.gms.playlog.internal;
interface IPlayLogService {
}