Merge branch 'v0.2.8.17785' into merge-upstream (c0817e8e) · Commits · e / os / GmsCore

GmsApi @ 51509859

Original line number	Diff line number	Diff line
		Subproject commit 7197b8320b4e6d55d15b76d4faf05adaba36bf72
		Subproject commit 51509859ae51097ad5789ba4ca2e9ffb9658f80e

play-services-core/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ def execResult(...args) {
		return stdout.toString().trim()
		}

		def gmsVersion = "17.4.55"
		def gmsVersion = "17.7.85"
		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
		def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)
		def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -664,6 +664,7 @@
		<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"/>
		<action android:name="com.google.android.gms.gass.START"/>
		</intent-filter>
		</service>
		</application>

play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,9 @@ public class DynamiteLoaderImpl extends IDynamiteLoader.Stub {
		Log.d(TAG, "returning temp fix module version for " + moduleId + ". Firebase Database will not be functional!");
		return com.google.android.gms.dynamite.descriptors.com.google.android.gms.firebase_database.ModuleDescriptor.MODULE_VERSION;
		}
		if (moduleId.equals("com.google.android.gms.googlecertificates")) {
		return com.google.android.gms.dynamite.descriptors.com.google.android.gms.googlecertificates.ModuleDescriptor.MODULE_VERSION;
		}
		if (moduleId.equals("com.google.android.gms.cast.framework.dynamite")) {
		Log.d(TAG, "returning temp fix module version for " + moduleId + ". Cast API wil not be functional!");
		return 1;

play-services-core/src/main/java/com/google/android/gms/common/GoogleCertificatesImpl.java

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 microG 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;

		import android.os.RemoteException;
		import android.support.annotation.Keep;
		import android.util.Log;

		import com.google.android.gms.common.internal.GoogleCertificatesQuery;
		import com.google.android.gms.common.internal.IGoogleCertificatesApi;
		import com.google.android.gms.dynamic.IObjectWrapper;
		import com.google.android.gms.dynamic.ObjectWrapper;

		import org.microg.gms.common.PackageUtils;

		@Keep
		public class GoogleCertificatesImpl extends IGoogleCertificatesApi.Stub {
		private static final String TAG = "GmsCertImpl";

		@Override
		public IObjectWrapper getGoogleCertficates() throws RemoteException {
		Log.d(TAG, "unimplemented Method: getGoogleCertficates");
		return null;
		}

		@Override
		public IObjectWrapper getGoogleReleaseCertificates() throws RemoteException {
		Log.d(TAG, "unimplemented Method: getGoogleReleaseCertificates");
		return null;
		}

		@Override
		public boolean isGoogleReleaseSigned(String packageName, IObjectWrapper certData) throws RemoteException {
		return PackageUtils.isGooglePackage(packageName, ObjectWrapper.unwrapTyped(certData, byte[].class));
		}

		@Override
		public boolean isGoogleSigned(String packageName, IObjectWrapper certData) throws RemoteException {
		return PackageUtils.isGooglePackage(packageName, ObjectWrapper.unwrapTyped(certData, byte[].class));
		}

		@Override
		public boolean isGoogleOrPlatformSigned(GoogleCertificatesQuery query, IObjectWrapper packageManager) throws RemoteException {
		return PackageUtils.isGooglePackage(query.getPackageName(), query.getCertData().getBytes());
		}
		}