Use common BaseService, update AuthService (2f78c63e) · Commits · e / os / GmsCore

GmsApi @ 37e3b4dc

Original line number	Diff line number	Diff line
		Subproject commit 6743f1d4b1a3cf0202b9d62f2ebc5dfb385b5576
		Subproject commit 37e3b4dc398cb349e9637471d6df09db9c8910c8

play-services-core/src/main/AndroidManifest.xml

+19 −6

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.google.android.gms"
		android:versionCode="7099448"
		android:versionName="1.0">
		android:versionCode="7574001"
		android:versionName="7.5.74 (µg v0.01)">

		<uses-sdk
		android:minSdkVersion="10"
		@@ -344,6 +344,23 @@
		</intent-filter>
		</activity>

		<service
		android:name="org.microg.gms.ads.GService"
		android:exported="true">
		<intent-filter>
		<action android:name="com.google.android.gms.ads.gservice.START" />
		</intent-filter>
		</service>


		<service
		android:name="org.microg.gms.feedback.FeedbackService"
		android:exported="true">
		<intent-filter>
		<action android:name="com.google.android.gms.feedback.internal.IFeedbackService" />
		</intent-filter>
		</service>

		<service
		android:name="org.microg.gms.DummyService"
		android:exported="true">
		@@ -359,7 +376,6 @@
		<action android:name="com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE" />
		<action android:name="com.google.android.gms.drive.ApiService.START" />
		<action android:name="com.google.android.gms.identity.service.BIND" />
		<action android:name="com.google.android.gms.car.service.START" />
		<action android:name="com.google.android.gms.wearable.BIND" />
		<action android:name="com.google.android.gms.auth.service.START" />
		<action android:name="com.google.android.gms.fitness.GoogleFitnessService.START" />
		@@ -368,7 +384,6 @@
		<action android:name="com.google.android.gms.droidguard.service.START" />
		<action android:name="com.google.android.gms.lockbox.service.START" />
		<action android:name="com.google.android.gms.cast_mirroring.service.START" />
		<action android:name="com.google.android.gms.feedback.internal.IFeedbackService" />
		<action android:name="com.google.android.gms.photos.autobackup.service.START" />
		<action android:name="com.google.android.gms.udc.service.START" />
		<action android:name="com.google.android.gms.mdm.services.DeviceManagerApiService.START" />
		@@ -380,13 +395,11 @@
		<action android:name="com.google.android.gms.common.download.START" />
		<action android:name="com.google.android.gms.signin.service.START" />
		<action android:name="com.google.android.gms.safetynet.service.START" />
		<action android:name="com.google.android.gms.ads.gservice.START" />
		<action android:name="com.google.android.contextmanager.service.ContextManagerService.START" />
		<action android:name="com.google.android.gms.audiomodem.service.AudioModemService.START" />
		<action android:name="com.google.android.gms.nearby.sharing.service.NearbySharingService.START" />
		<action android:name="com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START" />
		<action android:name="com.google.android.gms.phenotype.service.START" />

		<action android:name="com.google.android.gms.auth.api.credentials.service.START" />
		</intent-filter>
		</service>

play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,5 +16,5 @@

		package com.google.android.gms.ads;

		public class AdManagerCreatorImpl {
		public class AdManagerCreatorImpl extends AdManagerCreator.Stub {
		}

play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ import java.util.HashSet;
		import java.util.Set;

		public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {
		public static final int ID_ACCEPT_ALL = -1;

		private static final String TAG = "GmsServiceBroker";
		private final Set<Integer> supportedServiceIds;

		@@ -265,7 +267,7 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub {

		@Override
		public void getService(IGmsCallbacks callback, GetServiceRequest request) throws RemoteException {
		if (supportedServiceIds.contains(request.serviceId)) {
		if (supportedServiceIds.contains(request.serviceId) \|\| supportedServiceIds.contains(ID_ACCEPT_ALL)) {
		handleServiceRequest(callback, request);
		} else {
		Log.d(TAG, "Service not supported: " + request);

play-services-core/src/main/java/org/microg/gms/BaseService.java

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/*
		* 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 org.microg.gms;

		import android.app.Service;
		import android.content.Intent;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.util.Log;

		import com.google.android.gms.common.internal.GetServiceRequest;
		import com.google.android.gms.common.internal.IGmsCallbacks;
		import com.google.android.gms.common.internal.IGmsServiceBroker;

		public abstract class BaseService extends Service {
		private final IGmsServiceBroker broker;
		protected final String TAG;

		public BaseService(String tag, Integer supportedServiceId, Integer... supportedServiceIds) {
		this.TAG = tag;
		broker = new AbstractGmsServiceBroker(supportedServiceId, supportedServiceIds) {
		@Override
		public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request) throws RemoteException {
		Log.d(TAG, "bound by: " + request);
		BaseService.this.handleServiceRequest(callback, request);
		}
		};
		}

		@Override
		public IBinder onBind(Intent intent) {
		Log.d(TAG, "onBind: " + intent);
		return broker.asBinder();
		}

		public abstract void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request) throws RemoteException;
		}