fix

.gitmodules

@@ -1,15 +0,0 @@
-[submodule "extern/UnifiedNlp"]
-	path = extern/UnifiedNlp
-	url = https://github.com/microg/android_packages_apps_UnifiedNlp.git
-[submodule "extern/GmsApi"]
-	path = extern/GmsApi
-	url = https://github.com/microg/android_external_GmsApi.git
-[submodule "extern/Wearable"]
-	path = extern/Wearable
-	url = https://github.com/microg/android_external_Wearable.git
-[submodule "extern/GmsLib"]
-	path = extern/GmsLib
-	url = https://github.com/microg/android_external_GmsLib.git
-[submodule "extern/RemoteDroidGuard"]
-	path = extern/RemoteDroidGuard
-	url = https://github.com/microg/android_packages_apps_RemoteDroidGuard.git

.travis.yml

@@ -10,7 +10,6 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-29.0.2
-  - android-27
-  - android-28
+  - build-tools-29.0.3
+  - android-29
   - extra-android-m2repository

build.gradle

@@ -1,63 +1,110 @@
 /*
- * Copyright 2013-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.
+ * SPDX-FileCopyrightText: 2013, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.nlpVersion = '2.0-alpha1'
+    ext.remoteDroidGuardVersion = '0.1.1'
+    ext.safeParcelVersion = '1.6.0'
+    ext.wearableVersion = '0.1.1'
+
+    ext.kotlinVersion = '1.3.72'
+    ext.coroutineVersion = '1.3.7'
+
+    ext.annotationVersion = '1.1.0'
+    ext.appcompatVersion = '1.1.0'
+    ext.fragmentVersion = '1.2.5'
+    ext.lifecycleVersion = '2.2.0'
+    ext.mediarouterVersion = '1.1.0'
+    ext.multidexVersion = '2.0.1'
+    ext.navigationVersion = '2.3.0'
+    ext.preferenceVersion = '1.1.1'
+    ext.recyclerviewVersion = '1.1.0'
+
+    ext.supportLibraryVersion = "28.0.0"
+    ext.slf4jVersion = "1.7.25"
+
+    ext.androidBuildGradleVersion = "3.6.3"
+
+    ext.androidBuildVersionTools = "29.0.3"
+
+    ext.androidMinSdk = 14
+    ext.androidTargetSdk = 29
+    ext.androidCompileSdk = 29
+
     repositories {
         jcenter()
         google()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "com.android.tools.build:gradle:$androidBuildGradleVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
+def execResult(...args) {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine args
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+def gmsVersion = "19.4.20"
+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"))
+def gitCommitId = execResult('git', 'show-ref', '--abbrev=7', '--head', 'HEAD').split(' ')[0]
+def gitDirty = execResult('git', 'status', '--porcelain').size() > 0
+def ourVersionBase = gitVersionBase.substring(0, gitVersionBase.lastIndexOf('.'))
+def ourVersionMinor = Integer.parseInt(ourVersionBase.substring(ourVersionBase.lastIndexOf('.') + 1))
+def ourVersionCode = gmsVersionCode * 1000 + ourVersionMinor * 2  + (gitCommitCount > 0 || gitDirty ? 1 : 0)
+def ourVersionName = "$ourVersionBase.$gmsVersionCode" + (gitCommitCount > 0 && !gitDirty ? "-$gitCommitCount" : "") + (gitDirty ? "-dirty" : "") + (gitCommitCount > 0 && !gitDirty ? " ($gitCommitId)" : "")
+logger.lifecycle('Starting build for version {} ({})...', ourVersionName, ourVersionCode)
+
+@Deprecated
+String getMyVersionName() {
+    return ourVersionName
+}
+
+@Deprecated
+int getMyVersionCode() {
+    return ourVersionCode
+}
+
+
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "29.0.2"
-    ext.supportLibraryVersion = "28.0.0"
+
+    group = 'org.microg.gms'
+    version = ourVersionName
+    ext.appVersionCode = ourVersionCode
     ext.isReleaseVersion = false
-    ext.slf4jVersion = "1.7.25"
 }
 
-def androidCompileSdk() { return 28 }
+@Deprecated
+def androidCompileSdk() { return androidCompileSdk }
 
-def androidTargetSdk() { return 29 }
+@Deprecated
+def androidTargetSdk() { return androidTargetSdk }
 
-def androidMinSdk() { return 14 }
+@Deprecated
+def androidMinSdk() { return androidMinSdk }
 
+@Deprecated
 def versionCode() {
-    def stdout = new ByteArrayOutputStream()
-    exec { commandLine 'git', 'rev-list', '--count', "HEAD"; standardOutput = stdout }
-    return Integer.parseInt(stdout.toString().trim())
+    return ourVersionCode
 }
 
+@Deprecated
 def versionName() {
-    def stdout = new ByteArrayOutputStream()
-    if (rootProject.file("gradlew").exists())
-        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }
-    else // automatic build system, don't tag dirty
-        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }
-    return stdout.toString().trim().substring(1)
+    return ourVersionName
 }
 
 subprojects {
-    group = 'org.microg'
     repositories {
         jcenter()
         google()

extern/GmsApi

@@ -1 +0,0 @@
-Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6

extern/GmsLib

@@ -1 +0,0 @@
-Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792

extern/UnifiedNlp

@@ -1 +0,0 @@
-Subproject commit 82479b79c76353f532e0c6edd0d1dee8d49c48f4

gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

microg-ui-tools

@@ -1 +0,0 @@
-extern/UnifiedNlp/microg-ui-tools/

play-services-api

@@ -1 +0,0 @@
-extern/GmsApi/play-services-api

play-services-api/build.gradle

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013-2015 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.
+ */
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+}
+
+dependencies {
+    api project(':play-services-basement')
+    api project(':play-services-cast-api')
+    api project(':play-services-cast-framework-api')
+    api project(':play-services-iid-api')
+    api project(':play-services-location-api')
+    api project(':play-services-wearable-api')
+}

play-services-api/gradle.properties

@@ -0,0 +1,34 @@
+#
+# Copyright 2013-2016 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.
+#
+
+POM_NAME=Play Services Internal API
+POM_DESCRIPTION=Interfaces and objects for IPC between Play Services Library and Play Services Core
+
+POM_PACKAGING=aar
+
+POM_URL=https://github.com/microg/android_external_GmsApi
+
+POM_SCM_URL=https://github.com/microg/android_external_GmsApi
+POM_SCM_CONNECTION=scm:git@github.com:microg/android_external_GmsApi.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:microg/android_external_GmsApi.git
+
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=mar-v-in
+POM_DEVELOPER_NAME=Marvin W
+

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2017 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.
+  -->
+
+<manifest package="org.microg.gms.api"/>

play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl

@@ -0,0 +1,14 @@
+package com.google.android.auth;
+
+import android.os.Bundle;
+import android.accounts.Account;
+
+import com.google.android.gms.auth.AccountChangeEventsResponse;
+import com.google.android.gms.auth.AccountChangeEventsRequest;
+
+interface IAuthManagerService {
+    Bundle getToken(String accountName, String scope, in Bundle extras) = 0;
+    Bundle clearToken(String token, in Bundle extras) = 1;
+    AccountChangeEventsResponse getChangeEvents(in AccountChangeEventsRequest request)  = 2;
+    Bundle getTokenWithAccount(in Account account, String scope, in Bundle extras) = 4;
+}

play-services-api/src/main/aidl/com/google/android/gms/ads/AdManagerCreator.aidl

@@ -0,0 +1,4 @@
+package com.google.android.gms.ads;
+
+interface AdManagerCreator {
+}

play-services-api/src/main/aidl/com/google/android/gms/ads/identifier/internal/IAdvertisingIdService.aidl

@@ -0,0 +1,8 @@
+package com.google.android.gms.ads.identifier.internal;
+
+interface IAdvertisingIdService {
+    String getAdvertisingId() = 0;
+    boolean isAdTrackingLimited(boolean defaultHint) = 1;
+    String generateAdvertisingId(String packageName) = 2;
+    void setAdTrackingLimited(String packageName, boolean limited) = 3;
+}

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable CorpusStatus;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdate.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable PIMEUpdate;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdateResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable PIMEUpdateResponse;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/RequestIndexingSpecification.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable RequestIndexingSpecification;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable SuggestSpecification;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable SuggestionResults;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable UsageInfo;

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl

@@ -0,0 +1,14 @@
+package com.google.android.gms.appdatasearch.internal;
+
+import com.google.android.gms.appdatasearch.CorpusStatus;
+import com.google.android.gms.appdatasearch.PIMEUpdateResponse;
+import com.google.android.gms.appdatasearch.RequestIndexingSpecification;
+import com.google.android.gms.appdatasearch.SuggestionResults;
+import com.google.android.gms.appdatasearch.SuggestSpecification;
+
+interface IAppDataSearch {
+    SuggestionResults getSuggestions(String var1, String packageName, in String[] accounts, int maxNum, in SuggestSpecification specs) = 1;
+    boolean requestIndexing(String packageName, String accountName, long l, in RequestIndexingSpecification specs) = 3;
+    CorpusStatus getStatus(String packageName, String accountName) = 4;
+    PIMEUpdateResponse requestPIMEUpdate(String s1, String s2, int i, in byte[] bs) = 34;
+}

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl

@@ -0,0 +1,8 @@
+package com.google.android.gms.appdatasearch.internal;
+
+import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearchCallbacks;
+import com.google.android.gms.appdatasearch.UsageInfo;
+
+interface ILightweightAppDataSearch {
+    void view(ILightweightAppDataSearchCallbacks callbacks, String packageName, in UsageInfo[] usageInfos);
+}

play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl

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

play-services-api/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth;
+
+parcelable AccountChangeEventsRequest;

play-services-api/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth;
+
+parcelable AccountChangeEventsResponse;

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/Credential.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.credentials;
+
+parcelable Credential;

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/CredentialRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.credentials;
+
+parcelable CredentialRequest;

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/internal/DeleteRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.credentials.internal;
+
+parcelable DeleteRequest;

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/internal/GeneratePasswordRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.credentials.internal;
+
+parcelable GeneratePasswordRequest;

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/internal/ICredentialsCallbacks.aidl

@@ -0,0 +1,10 @@
+package com.google.android.gms.auth.api.credentials.internal;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.auth.api.credentials.Credential;
+
+interface ICredentialsCallbacks {
+    void onStatusAndCredential(in Status status, in Credential credential) = 0;
+    void onStatus(in Status status) = 1;
+    void onStatusAndString(in Status status, String string) = 2;
+}

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/internal/ICredentialsService.aidl

@@ -0,0 +1,15 @@
+package com.google.android.gms.auth.api.credentials.internal;
+
+import com.google.android.gms.auth.api.credentials.CredentialRequest;
+import com.google.android.gms.auth.api.credentials.internal.ICredentialsCallbacks;
+import com.google.android.gms.auth.api.credentials.internal.DeleteRequest;
+import com.google.android.gms.auth.api.credentials.internal.GeneratePasswordRequest;
+import com.google.android.gms.auth.api.credentials.internal.SaveRequest;
+
+interface ICredentialsService {
+    void request(ICredentialsCallbacks callbacks, in CredentialRequest request) = 0;
+    void save(ICredentialsCallbacks callbacks, in SaveRequest request) = 1;
+    void delete(ICredentialsCallbacks callbacks, in DeleteRequest request) = 2;
+    void disableAutoSignIn(ICredentialsCallbacks callbacks) = 3;
+    void generatePassword(ICredentialsCallbacks callbacks, in GeneratePasswordRequest request) = 4;
+}

play-services-api/src/main/aidl/com/google/android/gms/auth/api/credentials/internal/SaveRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.credentials.internal;
+
+parcelable SaveRequest;

play-services-api/src/main/aidl/com/google/android/gms/checkin/internal/ICheckinService.aidl

@@ -0,0 +1,5 @@
+package com.google.android.gms.checkin.internal;
+
+interface ICheckinService {
+    String getDeviceDataVersionInfo();
+}

play-services-api/src/main/aidl/com/google/android/gms/clearcut/LogEventParcelable.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.clearcut;
+
+parcelable LogEventParcelable;

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

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

play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerService.aidl

@@ -0,0 +1,8 @@
+package com.google.android.gms.clearcut.internal;
+
+import com.google.android.gms.clearcut.internal.IClearcutLoggerCallbacks;
+import com.google.android.gms.clearcut.LogEventParcelable;
+
+interface IClearcutLoggerService {
+    void log(IClearcutLoggerCallbacks callbacks, in LogEventParcelable event) = 0;
+}

play-services-api/src/main/aidl/com/google/android/gms/common/internal/GoogleCertificatesQuery.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.common.internal;
+
+parcelable GoogleCertificatesQuery;

play-services-api/src/main/aidl/com/google/android/gms/common/internal/ICertData.aidl

@@ -0,0 +1,8 @@
+package com.google.android.gms.common.internal;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface ICertData {
+    IObjectWrapper getWrappedBytes();
+    int remoteHashCode();
+}

play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGoogleCertificatesApi.aidl

@@ -0,0 +1,12 @@
+package com.google.android.gms.common.internal;
+
+import com.google.android.gms.common.internal.GoogleCertificatesQuery;
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface IGoogleCertificatesApi {
+    IObjectWrapper getGoogleCertficates();
+    IObjectWrapper getGoogleReleaseCertificates();
+    boolean isGoogleReleaseSigned(String packageName, IObjectWrapper certData);
+    boolean isGoogleSigned(String packageName, IObjectWrapper certData);
+    boolean isGoogleOrPlatformSigned(in GoogleCertificatesQuery query, IObjectWrapper packageManager);
+}

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/AddEventListenerRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable AddEventListenerRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/AddPermissionRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable AddPermissionRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/AuthorizeAccessRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable AuthorizeAccessRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CancelPendingActionsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CancelPendingActionsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ChangeResourceParentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ChangeResourceParentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ChangeSequenceNumber.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ChangeSequenceNumber;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ChangesResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ChangesResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CheckResourceIdsExistRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CheckResourceIdsExistRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CloseContentsAndUpdateMetadataRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CloseContentsAndUpdateMetadataRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CloseContentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CloseContentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ContentsResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ContentsResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ControlProgressRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ControlProgressRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateContentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CreateContentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateFileIntentSenderRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CreateFileIntentSenderRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateFileRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CreateFileRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateFolderRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable CreateFolderRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DeleteResourceRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DeleteResourceRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DeviceUsagePreferenceResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DeviceUsagePreferenceResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DisconnectRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DisconnectRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DownloadProgressResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DownloadProgressResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DriveIdResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DriveIdResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DrivePreferencesResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DrivePreferencesResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DriveServiceResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable DriveServiceResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/EventResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable EventResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/FetchThumbnailRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable FetchThumbnailRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/FetchThumbnailResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable FetchThumbnailResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetChangesRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable GetChangesRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetDriveIdFromUniqueIdRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable GetDriveIdFromUniqueIdRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetMetadataRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable GetMetadataRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetPermissionsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable GetPermissionsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetPermissionsResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable GetPermissionsResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IDriveService.aidl

@@ -0,0 +1,95 @@
+package com.google.android.gms.drive.internal;
+
+import com.google.android.gms.drive.internal.DriveServiceResponse;
+import com.google.android.gms.drive.internal.IDriveServiceCallbacks;
+import com.google.android.gms.drive.internal.IEventCallback;
+
+import com.google.android.gms.drive.internal.AddEventListenerRequest;
+import com.google.android.gms.drive.internal.AddPermissionRequest;
+import com.google.android.gms.drive.internal.AuthorizeAccessRequest;
+import com.google.android.gms.drive.internal.CancelPendingActionsRequest;
+import com.google.android.gms.drive.internal.ChangeResourceParentsRequest;
+import com.google.android.gms.drive.internal.CheckResourceIdsExistRequest;
+import com.google.android.gms.drive.internal.CloseContentsAndUpdateMetadataRequest;
+import com.google.android.gms.drive.internal.CloseContentsRequest;
+import com.google.android.gms.drive.internal.ControlProgressRequest;
+import com.google.android.gms.drive.internal.CreateContentsRequest;
+import com.google.android.gms.drive.internal.CreateFileRequest;
+import com.google.android.gms.drive.internal.CreateFileIntentSenderRequest;
+import com.google.android.gms.drive.internal.CreateFolderRequest;
+import com.google.android.gms.drive.internal.DeleteResourceRequest;
+import com.google.android.gms.drive.internal.DisconnectRequest;
+import com.google.android.gms.drive.internal.FetchThumbnailRequest;
+import com.google.android.gms.drive.internal.GetChangesRequest;
+import com.google.android.gms.drive.internal.GetDriveIdFromUniqueIdRequest;
+import com.google.android.gms.drive.internal.GetMetadataRequest;
+import com.google.android.gms.drive.internal.GetPermissionsRequest;
+import com.google.android.gms.drive.internal.ListParentsRequest;
+import com.google.android.gms.drive.internal.LoadRealtimeRequest;
+import com.google.android.gms.drive.internal.OpenContentsRequest;
+import com.google.android.gms.drive.internal.OpenFileIntentSenderRequest;
+import com.google.android.gms.drive.internal.RealtimeDocumentSyncRequest;
+import com.google.android.gms.drive.internal.RemoveEventListenerRequest;
+import com.google.android.gms.drive.internal.RemovePermissionRequest;
+import com.google.android.gms.drive.internal.SetDrivePreferencesRequest;
+import com.google.android.gms.drive.internal.SetFileUploadPreferencesRequest;
+import com.google.android.gms.drive.internal.SetResourceParentsRequest;
+import com.google.android.gms.drive.internal.StreamContentsRequest;
+import com.google.android.gms.drive.internal.TrashResourceRequest;
+import com.google.android.gms.drive.internal.UnsubscribeResourceRequest;
+import com.google.android.gms.drive.internal.UntrashResourceRequest;
+import com.google.android.gms.drive.internal.UpdateMetadataRequest;
+import com.google.android.gms.drive.internal.UpdatePermissionRequest;
+
+interface IDriveService {
+    void getMetadata(in GetMetadataRequest request, IDriveServiceCallbacks callbacks) = 0;
+
+    void updateMetadata(in UpdateMetadataRequest request, IDriveServiceCallbacks callbacks) = 2;
+    void createContents(in CreateContentsRequest request, IDriveServiceCallbacks callbacks) = 3;
+    void createFile(in CreateFileRequest request, IDriveServiceCallbacks callbacks) = 4;
+    void createFolder(in CreateFolderRequest request, IDriveServiceCallbacks callbacks) = 5;
+    DriveServiceResponse openContents(in OpenContentsRequest request, IDriveServiceCallbacks callbacks) = 6;
+    void closeContents(in CloseContentsRequest request, IDriveServiceCallbacks callbacks) = 7;
+    void requestSync(IDriveServiceCallbacks callbacks) = 8;
+    IntentSender openFileIntentSender(in OpenFileIntentSenderRequest request) = 9;
+    IntentSender createFileIntentSender(in CreateFileIntentSenderRequest request) = 10;
+    void authorizeAccess(in AuthorizeAccessRequest request, IDriveServiceCallbacks callbacks) = 11;
+    void listParents(in ListParentsRequest request, IDriveServiceCallbacks callbacks) = 12;
+    void addEventListener(in AddEventListenerRequest request, IEventCallback callback, String unused, IDriveServiceCallbacks callbacks) = 13;
+    void removeEventListener(in RemoveEventListenerRequest request, IEventCallback callback, String unused, IDriveServiceCallbacks callbacks) = 14;
+    void disconnect(in DisconnectRequest request) = 15;
+    void trashResource(in TrashResourceRequest request, IDriveServiceCallbacks callbacks) = 16;
+    void closeContentsAndUpdateMetadata(in CloseContentsAndUpdateMetadataRequest request, IDriveServiceCallbacks callbacks) = 17;
+
+    void deleteResource(in DeleteResourceRequest request, IDriveServiceCallbacks callbacks) = 23;
+
+    void loadRealtime(in LoadRealtimeRequest request, IDriveServiceCallbacks callbacks) = 26;
+    void setResourceParents(in SetResourceParentsRequest request, IDriveServiceCallbacks callbacks) = 27;
+    void getDriveIdFromUniqueId(in GetDriveIdFromUniqueIdRequest request, IDriveServiceCallbacks callbacks) = 28;
+    void checkResourceIdsExist(in CheckResourceIdsExistRequest request, IDriveServiceCallbacks callbacks) = 29;
+    void completePendingAction(IDriveServiceCallbacks callbacks) = 30;
+    void getDrivePreferences(IDriveServiceCallbacks callbacks) = 31;
+    void setDrivePreferences(in SetDrivePreferencesRequest request, IDriveServiceCallbacks callbacks) = 32;
+    void realtimeDocumentSync(in RealtimeDocumentSyncRequest request, IDriveServiceCallbacks callbacks) = 33;
+    void getDeviceUsagePreferences(IDriveServiceCallbacks callbacks) = 34;
+    void setFileUploadPreferences(in SetFileUploadPreferencesRequest request, IDriveServiceCallbacks callbacks) = 35;
+    void cancelPendingActions(in CancelPendingActionsRequest request, IDriveServiceCallbacks callbacks) = 36;
+    void untrashResource(in UntrashResourceRequest request, IDriveServiceCallbacks callbacks) = 37;
+
+    void isAutoBackupEnabled(IDriveServiceCallbacks callbacks) = 40;
+    void fetchThumbnail(in FetchThumbnailRequest request, IDriveServiceCallbacks callbacks) = 41;
+
+    void getChanges(in GetChangesRequest request, IDriveServiceCallbacks callbacks) = 43;
+
+    void unsubscribeResource(in UnsubscribeResourceRequest request, IDriveServiceCallbacks callbacks) = 45;
+    void getPermissions(in GetPermissionsRequest request, IDriveServiceCallbacks callbacks) = 46;
+    void addPermission(in AddPermissionRequest request, IDriveServiceCallbacks callbacks) = 47;
+    void updatePermission(in UpdatePermissionRequest request, IDriveServiceCallbacks callbacks) = 48;
+    void removePermission(in RemovePermissionRequest request, IDriveServiceCallbacks callbacks) = 49;
+
+    void removeQueryResultListener(IEventCallback callback, IDriveServiceCallbacks callbacks) = 51;
+    void controlProgress(in ControlProgressRequest request, IDriveServiceCallbacks callbacks) = 52;
+
+    void changeResourceParents(in ChangeResourceParentsRequest request, IDriveServiceCallbacks callbacks) = 54;
+    DriveServiceResponse streamContents(in StreamContentsRequest request, IDriveServiceCallbacks callbacks) = 55;
+}

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IDriveServiceCallbacks.aidl

@@ -0,0 +1,48 @@
+package com.google.android.gms.drive.internal;
+
+import com.google.android.gms.drive.internal.IRealtimeService;
+
+import com.google.android.gms.drive.internal.DownloadProgressResponse;
+import com.google.android.gms.drive.internal.ListEntriesResponse;
+import com.google.android.gms.drive.internal.DriveIdResponse;
+import com.google.android.gms.drive.internal.MetadataResponse;
+import com.google.android.gms.drive.internal.ContentsResponse;
+import com.google.android.gms.drive.internal.ListParentsResponse;
+import com.google.android.gms.drive.internal.SyncMoreResponse;
+import com.google.android.gms.drive.internal.LoadRealtimeResponse;
+import com.google.android.gms.drive.internal.ResourceIdSetResponse;
+import com.google.android.gms.drive.internal.DrivePreferencesResponse;
+import com.google.android.gms.drive.internal.DeviceUsagePreferenceResponse;
+import com.google.android.gms.drive.internal.FetchThumbnailResponse;
+import com.google.android.gms.drive.internal.ChangeSequenceNumber;
+import com.google.android.gms.drive.internal.ChangesResponse;
+import com.google.android.gms.drive.internal.GetPermissionsResponse;
+import com.google.android.gms.drive.internal.StringListResponse;
+import com.google.android.gms.drive.internal.StartStreamSession;
+
+import com.google.android.gms.common.api.Status;
+
+interface IDriveServiceCallbacks {
+    void onDownloadProgress(in DownloadProgressResponse response) = 0;
+    void onListEntries(in ListEntriesResponse response) = 1;
+    void onDriveId(in DriveIdResponse response) = 2;
+    void onMetadata(in MetadataResponse response) = 3;
+    void onContents(in ContentsResponse response) = 4;
+    void onStatus(in Status status) = 5;
+    void onSuccess() = 6;
+    void onListParents(in ListParentsResponse response) = 7;
+    void onSyncMore(in SyncMoreResponse response) = 8;
+
+    void onLoadRealtime(in LoadRealtimeResponse response, IRealtimeService realtimeService) = 10;
+    void onResourceIdSet(in ResourceIdSetResponse response) = 11;
+    void onDrivePreferences(in DrivePreferencesResponse response) = 12;
+    void onDeviceUsagePreference(in DeviceUsagePreferenceResponse response) = 13;
+    void onBooleanAnswer(boolean bool) = 14;
+    void onFetchThumbnail(in FetchThumbnailResponse response) = 15;
+    void onChangeSequenceNumber(in ChangeSequenceNumber csn) = 16;
+    void onChanges(in ChangesResponse response) = 17;
+
+    void onGetPermissions(in GetPermissionsResponse response) = 19;
+    void onStringList(in StringListResponse response) = 20;
+    void onStartStreamSession(in StartStreamSession response) = 21;
+}

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IEventCallback.aidl

@@ -0,0 +1,7 @@
+package com.google.android.gms.drive.internal;
+
+import com.google.android.gms.drive.internal.EventResponse;
+
+interface IEventCallback {
+    void onEventResponse(in EventResponse response) = 0;
+}

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IRealtimeService.aidl

@@ -0,0 +1,5 @@
+package com.google.android.gms.drive.internal;
+
+interface IRealtimeService {
+    // TODO
+}

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ListEntriesResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ListEntriesResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ListParentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ListParentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ListParentsResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ListParentsResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/LoadRealtimeRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable LoadRealtimeRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/LoadRealtimeResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable LoadRealtimeResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/MetadataResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable MetadataResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/OpenContentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable OpenContentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/OpenFileIntentSenderRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable OpenFileIntentSenderRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/RealtimeDocumentSyncRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable RealtimeDocumentSyncRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/RemoveEventListenerRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable RemoveEventListenerRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/RemovePermissionRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable RemovePermissionRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ResourceIdSetResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable ResourceIdSetResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SetDrivePreferencesRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable SetDrivePreferencesRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SetFileUploadPreferencesRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable SetFileUploadPreferencesRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SetResourceParentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable SetResourceParentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/StartStreamSession.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable StartStreamSession;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/StreamContentsRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable StreamContentsRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/StringListResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable StringListResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SyncMoreResponse.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable SyncMoreResponse;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/TrashResourceRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable TrashResourceRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UnsubscribeResourceRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable UnsubscribeResourceRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UntrashResourceRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable UntrashResourceRequest;

play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UpdateMetadataRequest.aidl

@@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable UpdateMetadataRequest;