From 9dea25dca4c45e12dd9e72580d67d9e252837325 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Mon, 6 Apr 2015 23:54:07 +0200 Subject: [PATCH] Extend ServiceBroker --- .../common/internal/GetServiceRequest.aidl | 3 + .../common/internal/IGmsServiceBroker.aidl | 53 +++++++++------- .../internal/ValidateAccountRequest.aidl | 3 + .../common/internal/GetServiceRequest.java | 63 +++++++++++++++++++ .../internal/ValidateAccountRequest.java | 23 +++++++ 5 files changed, 121 insertions(+), 24 deletions(-) create mode 100644 play-services-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl create mode 100644 play-services-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl create mode 100644 play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java create mode 100644 play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl new file mode 100644 index 0000000..791dbe9 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.common.internal; + +parcelable GetServiceRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl index 185b394..2074e4a 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl @@ -3,30 +3,35 @@ package com.google.android.gms.common.internal; import android.os.Bundle; import com.google.android.gms.common.internal.IGmsCallbacks; +import com.google.android.gms.common.internal.GetServiceRequest; +import com.google.android.gms.common.internal.ValidateAccountRequest; interface IGmsServiceBroker { - void getPlusService(IGmsCallbacks callback, int code, String str1, String str2, in String[] paramArrayOfString, String str3, in Bundle params); - void getPanoramaService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getAppDataSearchService(IGmsCallbacks callback, int code, String str); - void getWalletService(IGmsCallbacks callback, int code); - void getPeopleService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getReportingService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getLocationService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getGoogleLocationManagerService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getGamesService(IGmsCallbacks callback, int code, String str1, String str2, in String[] args, String str3, IBinder binder, String str4, in Bundle params); - void getAppStateService(IGmsCallbacks callback, int code, String str1, String str2, in String[] args); - void getPlayLogService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getAdMobService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getDroidGuardService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getLockboxService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getCastMirroringService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getNetworkQualityService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getGoogleIdentityService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getGoogleFeedbackService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getCastService(IGmsCallbacks callback, int code, String str, IBinder binder, in Bundle params); - void getDriveService(IGmsCallbacks callback, int code, String str1, in String[] args, String str2, in Bundle params); - void getLightweightAppDataSearchService(IGmsCallbacks callback, int code, String str); - void getSearchAdministrationService(IGmsCallbacks callback, int code, String str); - void getAutoBackupService(IGmsCallbacks callback, int code, String str, in Bundle params); - void getAddressService(IGmsCallbacks callback, int code, String str); + void getPlusService(IGmsCallbacks callback, int code, String str1, String str2, in String[] paramArrayOfString, String str3, in Bundle params) = 0; + void getPanoramaService(IGmsCallbacks callback, int code, String str, in Bundle params) = 1; + void getAppDataSearchService(IGmsCallbacks callback, int code, String str) = 2; + void getWalletService(IGmsCallbacks callback, int code) = 3; + void getPeopleService(IGmsCallbacks callback, int code, String str, in Bundle params) = 4; + void getReportingService(IGmsCallbacks callback, int code, String str, in Bundle params) = 5; + void getLocationService(IGmsCallbacks callback, int code, String str, in Bundle params) = 6; + void getGoogleLocationManagerService(IGmsCallbacks callback, int code, String str, in Bundle params) = 7; + void getGamesService(IGmsCallbacks callback, int code, String str1, String str2, in String[] args, String str3, IBinder binder, String str4, in Bundle params) = 8; + void getAppStateService(IGmsCallbacks callback, int code, String str1, String str2, in String[] args) = 9; + void getPlayLogService(IGmsCallbacks callback, int code, String str, in Bundle params) = 10; + void getAdMobService(IGmsCallbacks callback, int code, String str, in Bundle params) = 11; + void getDroidGuardService(IGmsCallbacks callback, int code, String str, in Bundle params) = 12; + void getLockboxService(IGmsCallbacks callback, int code, String str, in Bundle params) = 13; + void getCastMirroringService(IGmsCallbacks callback, int code, String str, in Bundle params) = 14; + void getNetworkQualityService(IGmsCallbacks callback, int code, String str, in Bundle params) = 15; + void getGoogleIdentityService(IGmsCallbacks callback, int code, String str, in Bundle params) = 16; + void getGoogleFeedbackService(IGmsCallbacks callback, int code, String str, in Bundle params) = 17; + void getCastService(IGmsCallbacks callback, int code, String str, IBinder binder, in Bundle params) = 18; + void getDriveService(IGmsCallbacks callback, int code, String str1, in String[] args, String str2, in Bundle params) = 19; + void getLightweightAppDataSearchService(IGmsCallbacks callback, int code, String str) = 20; + void getSearchAdministrationService(IGmsCallbacks callback, int code, String str) = 21; + void getAutoBackupService(IGmsCallbacks callback, int code, String str, in Bundle params) = 22; + void getAddressService(IGmsCallbacks callback, int code, String str) = 23; + + void getService(IGmsCallbacks callback, in GetServiceRequest request) = 45; + void validateAccount(IGmsCallbacks callback, in ValidateAccountRequest request) = 46; } diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl new file mode 100644 index 0000000..cef6ad7 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.common.internal; + +parcelable ValidateAccountRequest; diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java new file mode 100644 index 0000000..ecaa97f --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java @@ -0,0 +1,63 @@ +/* + * Copyright 2013-2015 µg Project Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.android.gms.common.internal; + +import android.accounts.Account; +import android.os.Bundle; +import android.os.IBinder; + +import com.google.android.gms.common.api.Scope; + +import org.microg.gms.common.Constants; +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class GetServiceRequest extends AutoSafeParcelable { + @SafeParceled(1) + private final int versionCode = 2; + + @SafeParceled(2) + public final int serviceId; + + @SafeParceled(3) + public int gmsVersion = Constants.MAX_REFERENCE_VERSION; + + @SafeParceled(4) + public String packageName; + + @SafeParceled(5) + public IBinder accountAccessor; + + @SafeParceled(6) + public Scope[] scopes; + + @SafeParceled(7) + public Bundle extras; + + @SafeParceled(8) + public Account account; + + private GetServiceRequest() { + serviceId = -1; + } + + public GetServiceRequest(int serviceId) { + this.serviceId = serviceId; + } + + public static Creator CREATOR = new AutoCreator<>(GetServiceRequest.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java b/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java new file mode 100644 index 0000000..0c93abb --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java @@ -0,0 +1,23 @@ +/* + * Copyright 2013-2015 µg Project Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.android.gms.common.internal; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class ValidateAccountRequest extends AutoSafeParcelable { + public static Creator CREATOR = new AutoCreator<>(ValidateAccountRequest.class); +}