cuynu/VancedxMicroG
cuynu/VancedxMicroG
Watch
1
Fork
You've already forked VancedxMicroG
 0
Code Issues Pull requests Releases 48 Wiki Activity

Merge pull request #159 from GoldenRetro/master

Browse source 
Some updates
This commit is contained in:
KevinX8 2021-09-11 21:19:30 +01:00 • committed by GitHub
commit 2a4c73518b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 204 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/debug.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
- name: JDK 8 Setup
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11.0.8
- name: Install NDK
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669"

6
build.gradle
View file

@ -36,7 +36,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
}
@ -46,8 +46,8 @@ allprojects {
apply plugin: 'idea'
group = 'org.microg.gms'
version = "0.2.21.212417"
ext.appVersionCode = 212417001
version = "0.2.22.212658"
ext.appVersionCode = 212658001
ext.isReleaseVersion = false
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat Jul 03 09:49:43 CEST 2021
#Sat Sep 11 09:04:01 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

1
play-services-api/build.gradle
View file

@ -21,7 +21,6 @@ android {
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}

2
play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerCallbacks.aidl
View file

@ -3,5 +3,5 @@ package com.google.android.gms.clearcut.internal;
import com.google.android.gms.common.api.Status;
interface IClearcutLoggerCallbacks {
void onStatus(in Status status) = 0;
oneway void onStatus(in Status status) = 0;
}

4
play-services-api/src/main/aidl/com/mgoogle/android/gms/phenotype/internal/IPhenotypeCallbacks.aidl
View file

@ -4,6 +4,6 @@ import com.google.android.gms.common.api.Status;
import com.mgoogle.android.gms.phenotype.Configurations;
interface IPhenotypeCallbacks {
void onRegister(in Status status) = 0;
void onConfigurations(in Status status, in Configurations configurations) = 3;
oneway void onRegister(in Status status) = 0;
oneway void onConfigurations(in Status status, in Configurations configurations) = 3;
}

28
play-services-api/src/main/java/com/google/android/gms/clearcut/LogEventParcelable.java
View file

@ -18,6 +18,8 @@ package com.google.android.gms.clearcut;
import android.util.Base64;
import com.google.android.gms.phenotype.ExperimentToken;
import com.google.android.gms.phenotype.GenericDimension;
import com.google.android.gms.playlog.internal.PlayLoggerContext;
import org.microg.safeparcel.AutoSafeParcelable;
@ -30,30 +32,36 @@ import java.nio.charset.StandardCharsets;
import java.util.Arrays;
public class LogEventParcelable extends AutoSafeParcelable {
@SafeParceled(1)
@Field(1)
private int versionCode = 1;
@SafeParceled(2)
@Field(2)
public final PlayLoggerContext context;
@SafeParceled(3)
@Field(3)
public final byte[] bytes;
@SafeParceled(4)
@Field(4)
public final int[] testCodes;
@SafeParceled(5)
@Field(5)
public final String[] mendelPackages;
@SafeParceled(6)
@Field(6)
public final int[] experimentIds;
@SafeParceled(7)
@Field(7)
public final byte[][] experimentTokens;
@SafeParceled(8)
@Field(8)
public final boolean addPhenotypeExperimentTokens;
@Field(9)
public final ExperimentToken[] experimentTokenParcelables;
@Field(10)
public final GenericDimension[] genericDimensions;
private LogEventParcelable() {
context = null;
bytes = null;
@ -61,6 +69,8 @@ public class LogEventParcelable extends AutoSafeParcelable {
mendelPackages = null;
experimentTokens = null;
addPhenotypeExperimentTokens = false;
experimentTokenParcelables = null;
genericDimensions = null;
}
public LogEventParcelable(PlayLoggerContext context, byte[] bytes, int[] testCodes, String[] mendelPackages, int[] experimentIds, byte[][] experimentTokens, boolean addPhenotypeExperimentTokens) {
@ -71,6 +81,8 @@ public class LogEventParcelable extends AutoSafeParcelable {
this.experimentIds = experimentIds;
this.experimentTokens = experimentTokens;
this.addPhenotypeExperimentTokens = addPhenotypeExperimentTokens;
experimentTokenParcelables = null;
genericDimensions = null;
}
@Override

87
play-services-api/src/main/java/com/google/android/gms/playlog/internal/PlayLoggerContext.java
View file

@ -21,55 +21,49 @@ import org.microg.safeparcel.SafeParceled;
public class PlayLoggerContext extends AutoSafeParcelable {
@SafeParceled(1)
@Field(1)
private int versionCode = 1;
@SafeParceled(2)
@Field(2)
public final String packageName;
@SafeParceled(3)
@Field(3)
public final int packageVersionCode;
@SafeParceled(4)
@Field(4)
public final int logSource;
@SafeParceled(5)
public final String uploadAccount;
@SafeParceled(6)
public final int loggingId;
@SafeParceled(7)
public final boolean logAndroidId;
@SafeParceled(8)
@Field(8)
public final String logSourceName;
@SafeParceled(9)
@Field(5)
public final String uploadAccount;
@Field(6)
public final String loggingId;
@Field(7)
public final boolean logAndroidId;
@Field(9)
public final boolean isAnonymous;
@SafeParceled(10)
@Field(10)
public final int qosTier;
@Field(11)
public final Integer appMobileSpecId;
@Field(12)
public final boolean scrubMccMnc;
private PlayLoggerContext() {
packageName = uploadAccount = logSourceName = null;
qosTier = packageVersionCode = logSource = loggingId = -1;
isAnonymous = logAndroidId = false;
packageName = uploadAccount = logSourceName = loggingId = null;
qosTier = packageVersionCode = logSource = appMobileSpecId = -1;
isAnonymous = logAndroidId = scrubMccMnc = false;
}
public PlayLoggerContext(String packageName, int packageVersionCode, int logSource, String uploadAccount, int loggingId, boolean logAndroidId) {
this.packageName = packageName;
this.packageVersionCode = packageVersionCode;
this.logSource = logSource;
this.logSourceName = null;
this.uploadAccount = uploadAccount;
this.loggingId = loggingId;
this.logAndroidId = logAndroidId;
this.isAnonymous = false;
this.qosTier = 0;
}
public PlayLoggerContext(String packageName, int packageVersionCode, int logSource, String logSourceName, String uploadAccount, int loggingId, boolean isAnonymous, int qosTier) {
public PlayLoggerContext(String packageName, int packageVersionCode, int logSource, String logSourceName, String uploadAccount, String loggingId, boolean isAnonymous, int qosTier, boolean scrubMccMnc) {
this.packageName = packageName;
this.packageVersionCode = packageVersionCode;
this.logSource = logSource;
@ -79,22 +73,25 @@ public class PlayLoggerContext extends AutoSafeParcelable {
this.logAndroidId = !isAnonymous;
this.isAnonymous = isAnonymous;
this.qosTier = qosTier;
this.appMobileSpecId = null;
this.scrubMccMnc = scrubMccMnc;
}
@Override
public String toString() {
return "PlayLoggerContext[" + versionCode +
", package=" + packageName +
", packageVersionCode=" + packageVersionCode +
", logSource=" + logSource +
", uploadAccount=" + uploadAccount +
", loggingId=" + loggingId +
", logAndroidId=" + logAndroidId +
", logSourceName=" + logSourceName +
", isAnonymous=" + isAnonymous +
", qosTier=" + qosTier +
']';
final StringBuilder sb = new StringBuilder("PlayLoggerContext[").append(versionCode);
sb.append(", package=").append(packageName);
sb.append(", packageVersionCode=").append(packageVersionCode);
sb.append(", logSource=").append(logSource);
sb.append(", uploadAccount=").append(uploadAccount);
sb.append(", loggingId=").append(loggingId);
sb.append(", logAndroidId=").append(logAndroidId);
sb.append(", logSourceName=").append(logSourceName);
sb.append(", isAnonymous=").append(isAnonymous);
sb.append(", qosTier=").append(qosTier);
sb.append(']');
return sb.toString();
}
public static Creator<PlayLoggerContext> CREATOR = new AutoCreator<>(PlayLoggerContext.class);
}
public static Creator<PlayLoggerContext> CREATOR = new AutoCreator<PlayLoggerContext>(PlayLoggerContext.class);
}

12
play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/ExperimentToken.java Normal file
View file

@ -0,0 +1,12 @@
/*
* SPDX-FileCopyrightText: 2020, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.phenotype;
import org.microg.safeparcel.AutoSafeParcelable;
public class ExperimentToken extends AutoSafeParcelable {
public static final Creator<ExperimentToken> CREATOR = new AutoCreator<>(ExperimentToken.class);
}

17
play-services-api/src/main/java/com/mgoogle/android/gms/phenotype/GenericDimension.java Normal file
View file

@ -0,0 +1,17 @@
/*
* SPDX-FileCopyrightText: 2020, microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/
package com.google.android.gms.phenotype;
import org.microg.safeparcel.AutoSafeParcelable;
public class GenericDimension extends AutoSafeParcelable {
@Field(1)
public int a;
@Field(2)
public int b;
public static final Creator<GenericDimension> CREATOR = new AutoCreator<>(GenericDimension.class);
}

1
play-services-base-api/build.gradle
View file

@ -28,7 +28,6 @@ android {
aidlPackageWhiteList "com/google/android/gms/common/images/WebImage.aidl"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}

3
play-services-base/build.gradle
View file

@ -21,7 +21,6 @@ android {
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}
@ -39,6 +38,6 @@ dependencies {
api project(':play-services-tasks')
api project(':play-services-base-api')
implementation 'androidx.fragment:fragment:1.3.5'
implementation 'androidx.fragment:fragment:1.3.6'
implementation 'com.google.android.gms:play-services-base:17.6.0'
}

3
play-services-basement/build.gradle
View file

@ -21,7 +21,7 @@ dependencies {
api "org.microg:safe-parcel:1.7.0"
implementation "androidx.annotation:annotation:1.2.0"
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32'
}
android {
@ -34,7 +34,6 @@ android {
aidlPackageWhiteList "com/google/android/gms/dynamic/IObjectWrapper.aidl"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
buildConfigField "int", "VERSION_CODE", "$appVersionCode"

1
play-services-cast-api/build.gradle
View file

@ -24,7 +24,6 @@ android {
aidlPackageWhiteList "com/google/android/gms/cast/LaunchOptions.aidl"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}

14
play-services-cast-api/src/main/aidl/com/google/android/gms/cast/internal/ICastDeviceController.aidl
View file

@ -4,11 +4,11 @@ import com.google.android.gms.cast.LaunchOptions;
import com.google.android.gms.cast.JoinOptions;
interface ICastDeviceController {
void disconnect() = 0;
void stopApplication(String sessionId) = 4;
void sendMessage(String namespace, String message, long requestId) = 8;
void registerNamespace(String namespace) = 10;
void unregisterNamespace(String namespace) = 11;
void launchApplication(String applicationId, in LaunchOptions launchOptions) = 12;
void joinApplication(String applicationId, String sessionId, in JoinOptions joinOptions) = 13;
oneway void disconnect() = 0;
oneway void stopApplication(String sessionId) = 4;
oneway void sendMessage(String namespace, String message, long requestId) = 8;
oneway void registerNamespace(String namespace) = 10;
oneway void unregisterNamespace(String namespace) = 11;
oneway void launchApplication(String applicationId, in LaunchOptions launchOptions) = 12;
oneway void joinApplication(String applicationId, String sessionId, in JoinOptions joinOptions) = 13;
}

1
play-services-cast-framework-api/build.gradle
View file

@ -21,7 +21,6 @@ android {
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}

1
play-services-cast/build.gradle
View file

@ -21,7 +21,6 @@ android {
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}

7
play-services-core/build.gradle
View file

@ -21,9 +21,6 @@ apply plugin: 'kotlin-kapt'
dependencies {
implementation 'com.squareup.wire:wire-runtime:3.6.1'
implementation 'de.hdodenhof:circleimageview:3.1.0'
// TODO: Switch to upstream once raw requests are merged
// https://github.com/vitalidze/chromecast-java-api-v2/pull/99
// implementation "su.litvak.chromecast:api-v2:0.10.4"
implementation "info.armills.chromecast-java-api-v2:api-v2-raw-request:0.10.4-raw-request-1"
implementation project(':play-services-cronet-core')
@ -33,8 +30,8 @@ dependencies {
implementation project(':play-services-cast-api')
// AndroidX UI
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.mediarouter:mediarouter:1.2.4'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.mediarouter:mediarouter:1.2.5'
implementation "androidx.preference:preference-ktx:$preferenceVersion"
implementation "org.microg.gms:conscrypt-gmscore:2.5.1"

3
play-services-core/microg-ui-tools/build.gradle
View file

@ -21,7 +21,6 @@ android {
buildToolsVersion "$androidBuildVersionTools"
defaultConfig {
versionName version
minSdkVersion androidMinSdk
targetSdkVersion androidTargetSdk
}
@ -38,7 +37,7 @@ android {
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation "androidx.preference:preference:$preferenceVersion"
}

3
play-services-core/src/main/AndroidManifest.xml
View file

@ -95,7 +95,7 @@
<provider
android:name="org.microg.mgms.settings.SettingsProvider"
android:authorities="org.microg.mgms.settings"
android:authorities="${applicationId}.microg.settings"
android:exported="false" />
<!-- Services Framework -->
@ -478,6 +478,7 @@
<action android:name="com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START" />
<action android:name="com.google.android.gms.gass.START" />
<action android:name="com.google.android.gms.audit.service.START" />
<action android:name="com.google.android.mobstore.service.START" />
</intent-filter>
</service>
</application>

Some files were not shown because too many files have changed in this diff Show more