MicroG 0.2.23.220217

2024-12-28 13:45:50 +01:00 · 2022-01-26 06:26:56 +01:00 · 2022-01-26 06:26:56 +01:00 · d64e4556f6
commit d64e4556f6
parent 2a4c73518b
437 changed files with 10019 additions and 967 deletions
--- a/Android.mk
+++ b/Android.mk
@ -22,20 +22,20 @@ LOCAL_PACKAGE_NAME := GmsCore
 gmscore_root  := $(LOCAL_PATH)
 gmscore_dir   := play-services-core
 gmscore_out   := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates
-gmscore_build := $(gmscore_root)/$(gmscore_dir)/build
-gmscore_apk   := build/outputs/apk/release/play-services-core-release-unsigned.apk
+gmscore_build := $(gmscore_dir)/build
+gmscore_apk   := $(gmscore_build)/outputs/apk/release/play-services-core-release-unsigned.apk

-$(gmscore_root)/$(gmscore_dir)/$(gmscore_apk):
-	rm -Rf $(gmscore_build)
+$(gmscore_root)/$(gmscore_apk):
+	rm -Rf $(gmscore_root)/$(gmscore_build)
 	mkdir -p $(ANDROID_BUILD_TOP)/$(gmscore_out)
-	ln -s $(ANDROID_BUILD_TOP)/$(gmscore_out) $(ANDROID_BUILD_TOP)/$(gmscore_build)
+	ln -s $(ANDROID_BUILD_TOP)/$(gmscore_out) $(ANDROID_BUILD_TOP)/$(gmscore_root)/$(gmscore_build)
 	echo "sdk.dir=$(ANDROID_HOME)" > $(gmscore_root)/local.properties
 	cd $(gmscore_root) && git submodule update --recursive --init
 	cd $(gmscore_root)/$(gmscore_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ../gradlew assembleRelease

 LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := $(gmscore_dir)/$(gmscore_apk)
+LOCAL_SRC_FILES := $(gmscore_apk)
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)

-include $(BUILD_PREBUILT)
+include $(BUILD_PREBUILT)
--- a/LICENSES/CC0-1.0.txt
+++ b/LICENSES/CC0-1.0.txt
@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
--- a/build.gradle
+++ b/build.gradle
@ -4,31 +4,9 @@
 */

 buildscript {
-    ext.cronetVersion = '91.0.4472.120.1'
-    ext.safeParcelVersion = '1.7.0'
-
-    ext.kotlinVersion = '1.4.32'
-    ext.coroutineVersion = '1.3.8'
-
-    ext.annotationVersion = '1.2.0'
-    ext.appcompatVersion = '1.2.0'
-    ext.fragmentVersion = '1.3.0'
-    ext.lifecycleVersion = '2.3.1'
-    ext.mediarouterVersion = '1.2.2'
-    ext.navigationVersion = '2.3.5'
-    ext.preferenceVersion = '1.1.1'
-    ext.recyclerviewVersion = '1.1.0'
-
-    ext.supportLibraryVersion = "28.0.0"
-    ext.wireVersion = '3.2.2'
-
-    ext.androidBuildGradleVersion = "4.1.0"
-
-    ext.androidBuildVersionTools = "30.0.2"
-
    ext.androidMinSdk = 21
    ext.androidTargetSdk = 29
-    ext.androidCompileSdk = 30
+    ext.androidCompileSdk = 31

    repositories {
        jcenter()
@ -36,9 +14,9 @@ buildscript {
    }

    dependencies {
-        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"
+        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+        classpath "com.squareup.wire:wire-gradle-plugin:3.2.2"
    }
 }

@ -46,8 +24,8 @@ allprojects {
    apply plugin: 'idea'

    group = 'org.microg.gms'
-    version = "0.2.22.212658"
-    ext.appVersionCode = 212658001
+    version = "0.2.23.220217"
+    ext.appVersionCode = 220217001
    ext.isReleaseVersion = false
 }

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Sat Sep 11 09:04:01 CEST 2021
+#Wed Jan 26 02:00:21 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
--- a/274
+++ b/274
@ -1,7 +1,8 @@
-#!/usr/bin/env sh
+#!/bin/sh

+# SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -17,67 +18,101 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,99 +122,112 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

-exec "$JAVACMD" "$@"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@ -18,7 +18,7 @@ apply plugin: 'com.android.library'

 android {
    compileSdkVersion androidCompileSdk
-    buildToolsVersion "$androidBuildVersionTools"
+    buildToolsVersion "30.0.3"

    defaultConfig {
        minSdkVersion androidMinSdk
--- a/play-services-api/src/main/aidl/com/google/android/gms/ads/AdManagerCreator.aidl
+++ b/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 {
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/ads/identifier/internal/IAdvertisingIdService.aidl
+++ b/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;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/auth/api/internal/IAuthCallbacks.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/auth/api/internal/IAuthCallbacks.aidl
@ -0,0 +1,8 @@
+package com.google.android.gms.auth.api.internal;
+
+import com.google.android.gms.auth.api.proxy.ProxyResponse;
+
+interface IAuthCallbacks {
+    void onProxyResponse(in ProxyResponse response) = 0;
+    void onSpatulaHeader(String spatulaHeader) = 1;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/auth/api/internal/IAuthService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/auth/api/internal/IAuthService.aidl
@ -0,0 +1,11 @@
+package com.google.android.gms.auth.api.internal;
+
+import com.google.android.gms.auth.api.internal.IAuthCallbacks;
+//import com.google.android.gms.auth.api.proxy.ProxyGrpcRequest;
+import com.google.android.gms.auth.api.proxy.ProxyRequest;
+
+interface IAuthService {
+    void performProxyRequest(IAuthCallbacks callbacks, in ProxyRequest request) = 0;
+//    void performProxyGrpcRequest(IAuthCallback callbacks, in ProxyGrpcRequest request) = 1;
+    void getSpatulaHeader(IAuthCallbacks callbacks) = 2;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/auth/api/proxy/ProxyRequest.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/auth/api/proxy/ProxyRequest.aidl
@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.proxy;
+
+parcelable ProxyRequest;
--- a/play-services-api/src/main/aidl/com/google/android/gms/auth/api/proxy/ProxyResponse.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/auth/api/proxy/ProxyResponse.aidl
@ -0,0 +1,3 @@
+package com.google.android.gms.auth.api.proxy;
+
+parcelable ProxyResponse;
--- a/play-services-api/src/main/aidl/com/google/android/gms/auth/appcert/IAppCertService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/auth/appcert/IAppCertService.aidl
@ -0,0 +1,6 @@
+package com.google.android.gms.auth.appcert;
+
+interface IAppCertService {
+    boolean fetchDeviceKey() = 0;
+    String getSpatulaHeader(String packageName) = 1;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/checkin/internal/ICheckinService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/checkin/internal/ICheckinService.aidl
@ -2,4 +2,6 @@ package com.google.android.gms.checkin.internal;

 interface ICheckinService {
    String getDeviceDataVersionInfo();
+    long getLastCheckinSuccessTime();
+    String getLastSimOperator();
 }
--- a/play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerCallbacks.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerCallbacks.aidl
@ -1,7 +1,13 @@
 package com.google.android.gms.clearcut.internal;

 import com.google.android.gms.common.api.Status;
+import com.google.android.gms.common.data.DataHolder;

 interface IClearcutLoggerCallbacks {
-    oneway void onStatus(in Status status) = 0;
+    oneway void onLogResult(in Status status) = 0;
+    oneway void onForceUploadResult(in Status status) = 1;
+    oneway void onStartCollectForDebugResult(in Status status, long l) = 2;
+    oneway void onStopCollectForDebugResult(in Status status) = 3;
+    oneway void onCollectForDebugExpiryTime(in Status status, long l) = 4;
+    oneway void onLogEventParcelables(in DataHolder data) = 6;
 }
--- a/play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/IClearcutLoggerService.aidl
@ -4,5 +4,11 @@ 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;
+    oneway void log(IClearcutLoggerCallbacks callbacks, in LogEventParcelable event) = 0;
+    oneway void forceUpload(IClearcutLoggerCallbacks callbacks) = 1;
+    oneway void startCollectForDebug(IClearcutLoggerCallbacks callbacks) = 2;
+    oneway void stopCollectForDebug(IClearcutLoggerCallbacks callbacks) = 3;
+    oneway void getCollectForDebugExpiryTime(IClearcutLoggerCallbacks callbacks) = 4;
+    oneway void getLogEventParcelablesLegacy(IClearcutLoggerCallbacks callbacks) = 5;
+    oneway void getLogEventParcelables(IClearcutLoggerCallbacks callbacks) = 6;
 }
--- a/play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/PlayLoggerContext.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/clearcut/internal/PlayLoggerContext.aidl
@ -0,0 +1,3 @@
+package com.google.android.gms.clearcut.internal;
+
+parcelable PlayLoggerContext;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/AddEventListenerRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/AddPermissionRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/AuthorizeAccessRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CancelPendingActionsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ChangeResourceParentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ChangeSequenceNumber.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ChangesResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CheckResourceIdsExistRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CloseContentsAndUpdateMetadataRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CloseContentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ContentsResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ControlProgressRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateContentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateFileIntentSenderRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateFileRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/CreateFolderRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DeleteResourceRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DeviceUsagePreferenceResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DisconnectRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DownloadProgressResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DriveIdResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DrivePreferencesResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/DriveServiceResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/EventResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/FetchThumbnailRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/FetchThumbnailResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetChangesRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetDriveIdFromUniqueIdRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetMetadataRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetPermissionsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/GetPermissionsResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IDriveService.aidl
+++ b/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;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IDriveServiceCallbacks.aidl
+++ b/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;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IEventCallback.aidl
+++ b/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;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/IRealtimeService.aidl
+++ b/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
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ListEntriesResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ListParentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ListParentsResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/LoadRealtimeRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/LoadRealtimeResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/MetadataResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/OpenContentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/OpenFileIntentSenderRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/RealtimeDocumentSyncRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/RemoveEventListenerRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/RemovePermissionRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/ResourceIdSetResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SetDrivePreferencesRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SetFileUploadPreferencesRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SetResourceParentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/StartStreamSession.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/StreamContentsRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/StringListResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/SyncMoreResponse.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/TrashResourceRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UnsubscribeResourceRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UntrashResourceRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UpdateMetadataRequest.aidl
+++ b/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;
--- a/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UpdatePermissionRequest.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/drive/internal/UpdatePermissionRequest.aidl
@ -0,0 +1,3 @@
+package com.google.android.gms.drive.internal;
+
+parcelable UpdatePermissionRequest;
--- a/play-services-api/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
@ -0,0 +1,47 @@
+package com.google.android.gms.games.internal;
+
+import com.google.android.gms.common.data.DataHolder;
+import com.google.android.gms.games.multiplayer.realtime.RealTimeMessage;
+
+interface IGamesCallbacks {
+  void onAuthTokenLoaded(int statusCode, String authToken) = 5000;
+  void onAchievementsLoaded(in DataHolder data) = 5001;
+  void onAchievementUpdated(int statusCode, String achievementId) = 5002;
+  void onLeaderboardsLoaded(in DataHolder data) = 5003;
+  void onLeaderboardScoresLoaded(in DataHolder leaderboard, in DataHolder scores) = 5004;
+  void onScoreSubmitted(in DataHolder data) = 5005;
+  void onPlayersLoaded(in DataHolder data) = 5006;
+  void onExtendedPlayersLoaded(in DataHolder data) = 5007;
+  void onGamesLoaded(in DataHolder data) = 5008;
+  void onExtendedGamesLoaded(in DataHolder data) = 5009;
+  void onGameInstancesLoaded(in DataHolder data) = 5010;
+  void onGameplayAclLoaded(in DataHolder data) = 5011;
+  void onGameplayAclUpdated(int statusCode) = 5012;
+  void onFAclLoaded(in DataHolder data) = 5013;
+  void onFAclUpdated(int statusCode) = 5014;
+  void onSignOutComplete() = 5015;
+  void onInvitationsLoaded(in DataHolder data) = 5016;
+  void onRoomCreated(in DataHolder data) = 5017;
+  void onJoinedRoom(in DataHolder data) = 5018;
+  void onLeftRoom(int statusCode, String roomId) = 5019;
+  void onRoomConnecting(in DataHolder data) = 5020;
+  void onRoomAutoMatching(in DataHolder data) = 5021;
+  void onRoomConnected(in DataHolder data) = 5022;
+  void onConnectedToRoom(in DataHolder data) = 5023;
+  void onDisconnectedFromRoom(in DataHolder data) = 5024;
+  void onPeerInvitedToRoom(in DataHolder data, in String[] participantIds) = 5025;
+  void onPeerJoinedRoom(in DataHolder data, in String[] participantIds) = 5026;
+  void onPeerLeftRoom(in DataHolder data, in String[] participantIds) = 5027;
+  void onPeerDeclined(in DataHolder data, in String[] participantIds) = 5028;
+  void onPeerConnected(in DataHolder data, in String[] participantIds) = 5029;
+  void onPeerDisconnected(in DataHolder data, in String[] participantIds) = 5030;
+  void onRealTimeMessageReceived(in RealTimeMessage message) = 5031;
+  void onMessageSent(int statusCode, int messageId, String recipientParticipantId) = 5032;
+  void onGameMuteStatusChanged(int statusCode, String externalGameId, boolean isMuted) = 5033;
+  void onNotifyAclLoaded(in DataHolder data) = 5034;
+  void onNotifyAclUpdated(int statusCode) = 5035;
+  void onInvitationReceived(in DataHolder data) = 5036;
+  void onGameMuteStatusLoaded(in DataHolder data) = 5037;
+  void onContactSettingsLoaded(in DataHolder data) = 5038;
+  void onContactSettingsUpdated(int statusCode) = 5039;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
@ -0,0 +1,80 @@
+package com.google.android.gms.games.internal;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import com.google.android.gms.games.internal.IGamesCallbacks;
+import com.google.android.gms.common.data.DataHolder;
+
+interface IGamesService {
+  void clientDisconnecting(long clientId) = 5000;
+  void signOut(IGamesCallbacks callbacks) = 5001;
+  String getAppId() = 5002;
+  Bundle getConnectionHint() = 5003;
+  void showWelcomePopup(IBinder windowToken, in Bundle extraArgs) = 5004;
+  void cancelPopups() = 5005;
+  String getCurrentAccountName() = 5006;
+  void loadGameplayAclInternal(IGamesCallbacks callbacks, String gameId) = 5007;
+  void updateGameplayAclInternal(IGamesCallbacks callbacks, String gameId, String aclData) = 5008;
+  void loadFAclInternal(IGamesCallbacks callbacks, String gameId) = 5009;
+  void updateFAclInternal(IGamesCallbacks callbacks, String gameId, boolean allCirclesVisible, in long[] circleIds) = 5010;
+  String getCurrentPlayerId() = 5011;
+  DataHolder getCurrentPlayer() = 5012;
+  void loadPlayer(IGamesCallbacks callbacks, String playerId) = 5013;
+  void loadInvitablePlayers(IGamesCallbacks callbacks, int pageSize, boolean expandCachedData, boolean forceReload) = 5014;
+  void submitScore(IGamesCallbacks callbacks, String leaderboardId, long score) = 5015;
+  void loadLeaderboards(IGamesCallbacks callbacks) = 5016;
+  void loadLeaderboard(IGamesCallbacks callbacks, String leaderboardId) = 5017;
+  void loadTopScores(IGamesCallbacks callbacks, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5018;
+  void loadPlayerCenteredScores(IGamesCallbacks callbacks, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5019;
+  void loadMoreScores(IGamesCallbacks callbacks, in Bundle previousheader, int maxResults, int pageDirection) = 5020;
+  void loadAchievements(IGamesCallbacks callbacks) = 5021;
+  void revealAchievement(IGamesCallbacks callbacks, String achievementId, IBinder windowToken, in Bundle extraArgs) = 5022;
+  void unlockAchievement(IGamesCallbacks callbacks, String achievementId, IBinder windowToken, in Bundle extraArgs) = 5023;
+  void incrementAchievement(IGamesCallbacks callbacks, String achievementId, int numSteps, IBinder windowToken, in Bundle extraArgs) = 5024;
+  void loadGame(IGamesCallbacks callbacks) = 5025;
+  void loadInvitations(IGamesCallbacks callbacks) = 5026;
+  void declineInvitation(String invitationId, int invitationType) = 5027;
+  void dismissInvitation(String invitationId, int invitationType) = 5028;
+  void createRoom(IGamesCallbacks callbacks, IBinder processBinder, int variant, in String[] invitedPlayerIds, in Bundle autoMatchCriteria, boolean enableSockets, long clientId) = 5029;
+  void joinRoom(IGamesCallbacks callbacks, IBinder processBinder, String matchId, boolean enableSockets, long clientId) = 5030;
+  void leaveRoom(IGamesCallbacks callbacks, String matchId) = 5031;
+  int sendReliableMessage(IGamesCallbacks callbacks, in byte[] messageData, String matchId, String recipientParticipantId) = 5032;
+  int sendUnreliableMessage(in byte[] messageData, String matchId, in String[] recipientParticipantIds) = 5033;
+  String createSocketConnection(String participantId) = 5034;
+  void clearNotifications(int notificationTypes) = 5035;
+  void loadLeaderboardsFirstParty(IGamesCallbacks callbacks, String gameId) = 5036;
+  void loadLeaderboardFirstParty(IGamesCallbacks callbacks, String gameId, String leaderboardId) = 5037;
+  void loadTopScoresFirstParty(IGamesCallbacks callbacks, String gameId, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5038;
+  void loadPlayerCenteredScoresFirstParty(IGamesCallbacks callbacks, String gameId, String leaderboardId, int span, int leaderboardCollection, int maxResults, boolean forceReload) = 5039;
+  void loadAchievementsFirstParty(IGamesCallbacks callbacks, String playerId, String gameId) = 5040;
+  void loadGameFirstParty(IGamesCallbacks callbacks, String gameId) = 5041;
+  void loadGameInstancesFirstParty(IGamesCallbacks callbacks, String gameId) = 5042;
+  void loadGameCollectionFirstParty(IGamesCallbacks callbacks, int pageSize, int collectionType, boolean expandCachedData, boolean forceReload) = 5043;
+  void loadRecentlyPlayedGamesFirstParty(IGamesCallbacks callbacks, String externalPlayerId, int pageSize, boolean expandCachedData, boolean forceReload) = 5044;
+  void loadInvitablePlayersFirstParty(IGamesCallbacks callbacks, int pageSize, boolean expandCachedData, boolean forceReload) = 5045;
+  void loadRecentPlayersFirstParty(IGamesCallbacks callbacks) = 5046;
+  void loadCircledPlayersFirstParty(IGamesCallbacks callbacks, int pageSize, boolean expandCachedData, boolean forceReload) = 5047;
+  void loadSuggestedPlayersFirstParty(IGamesCallbacks callbacks) = 5048;
+  void dismissPlayerSuggestionFirstParty(String playerIdToDismiss) = 5049;
+  void declineInvitationFirstParty(String gameId, String invitationId, int invitationType) = 5050;
+  void loadInvitationsFirstParty(IGamesCallbacks callbacks, String gameId) = 5051;
+  int registerWaitingRoomListenerRestricted(IGamesCallbacks callbacks, String roomId) = 5052;
+  void setGameMuteStatusInternal(IGamesCallbacks callbacks, String gameId, boolean muted) = 5053;
+  void clearNotificationsFirstParty(String gameId, int notificationTypes) = 5054;
+  void loadNotifyAclInternal(IGamesCallbacks callbacks) = 5055;
+  void updateNotifyAclInternal(IGamesCallbacks callbacks, String aclData) = 5056;
+  void registerInvitationListener(IGamesCallbacks callbacks, long clientId) = 5057;
+  void unregisterInvitationListener(long clientId) = 5058;
+  int unregisterWaitingRoomListenerRestricted(String roomId) = 5059;
+  void isGameMutedInternal(IGamesCallbacks callbacks, String gameId) = 5060;
+  void loadContactSettingsInternal(IGamesCallbacks callbacks) = 5061;
+  void updateContactSettingsInternal(IGamesCallbacks callbacks, boolean enableMobileNotifications) = 5062;
+  String getSelectedAccountForGameFirstParty(String gamePackageName) = 5063;
+  void updateSelectedAccountForGameFirstParty(String gamePackageName, String accountName) = 5064;
+  Uri getGamesContentUriRestricted(String gameId) = 5065;
+  boolean shouldUseNewPlayerNotificationsFirstParty() = 5066;
+  void setUseNewPlayerNotificationsFirstParty(boolean newPlayerStyle) = 5067;
+  void searchForPlayersFirstParty(IGamesCallbacks callbacks, String query, int pageSize, boolean expandCachedData, boolean forceReload) = 5500;
+  DataHolder getCurrentGame() = 5501;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/games/multiplayer/realtime/RealTimeMessage.aidl
@ -0,0 +1,3 @@
+package com.google.android.gms.games.multiplayer.realtime;
+
+parcelable RealTimeMessage;
--- a/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IGooglePlaceDetectionService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IGooglePlaceDetectionService.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.location.places.internal;
+
+interface IGooglePlaceDetectionService {
+
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IGooglePlacesService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IGooglePlacesService.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.location.places.internal;
+
+interface IGooglePlacesService {
+
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl
@ -0,0 +1,3 @@
+package com.google.android.gms.maps;
+
+parcelable GoogleMapOptions;
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl
@ -0,0 +1,20 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
+
+interface ICameraUpdateFactoryDelegate {
+    IObjectWrapper zoomIn();
+    IObjectWrapper zoomOut();
+    IObjectWrapper scrollBy(float x, float y);
+    IObjectWrapper zoomTo(float zoom);
+    IObjectWrapper zoomBy(float zoomDelta);
+    IObjectWrapper zoomByWithFocus(float zoomDelta, int x, int y);
+    IObjectWrapper newCameraPosition(in CameraPosition cameraPosition);
+    IObjectWrapper newLatLng(in LatLng latLng);
+    IObjectWrapper newLatLngZoom(in LatLng latLng, float zoom);
+    IObjectWrapper newLatLngBounds(in LatLngBounds bounds, int padding);
+    IObjectWrapper newLatLngBoundsWithSize(in LatLngBounds bounds, int width, int height, int padding);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl
@ -0,0 +1,6 @@
+package com.google.android.gms.maps.internal;
+
+interface ICancelableCallback {
+    void onFinish();
+    void onCancel();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl
@ -0,0 +1,17 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+import com.google.android.gms.maps.GoogleMapOptions;
+import com.google.android.gms.maps.internal.IMapFragmentDelegate;
+import com.google.android.gms.maps.internal.IMapViewDelegate;
+import com.google.android.gms.maps.internal.ICameraUpdateFactoryDelegate;
+import com.google.android.gms.maps.model.internal.IBitmapDescriptorFactoryDelegate;
+
+interface ICreator {
+    void init(IObjectWrapper resources);
+    IMapFragmentDelegate newMapFragmentDelegate(IObjectWrapper activity);
+    IMapViewDelegate newMapViewDelegate(IObjectWrapper context, in GoogleMapOptions options);
+    ICameraUpdateFactoryDelegate newCameraUpdateFactoryDelegate();
+    IBitmapDescriptorFactoryDelegate newBitmapDescriptorFactoryDelegate();
+    void initV2(IObjectWrapper resources, int flags);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
@ -0,0 +1,144 @@
+package com.google.android.gms.maps.internal;
+
+import android.location.Location;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.internal.ICancelableCallback;
+import com.google.android.gms.maps.internal.ILocationSourceDelegate;
+import com.google.android.gms.maps.internal.IUiSettingsDelegate;
+import com.google.android.gms.maps.internal.IProjectionDelegate;
+import com.google.android.gms.maps.internal.IOnCameraChangeListener;
+import com.google.android.gms.maps.internal.IOnCameraIdleListener;
+import com.google.android.gms.maps.internal.IOnCameraMoveCanceledListener;
+import com.google.android.gms.maps.internal.IOnCameraMoveListener;
+import com.google.android.gms.maps.internal.IOnCameraMoveStartedListener;
+import com.google.android.gms.maps.internal.IOnMapClickListener;
+import com.google.android.gms.maps.internal.IOnMapLongClickListener;
+import com.google.android.gms.maps.internal.IOnMarkerClickListener;
+import com.google.android.gms.maps.internal.IOnMarkerDragListener;
+import com.google.android.gms.maps.internal.IOnInfoWindowClickListener;
+import com.google.android.gms.maps.internal.IInfoWindowAdapter;
+import com.google.android.gms.maps.internal.IOnMapLoadedCallback;
+import com.google.android.gms.maps.internal.IOnMyLocationChangeListener;
+import com.google.android.gms.maps.internal.IOnMyLocationButtonClickListener;
+import com.google.android.gms.maps.internal.ISnapshotReadyCallback;
+import com.google.android.gms.maps.model.CircleOptions;
+import com.google.android.gms.maps.model.GroundOverlayOptions;
+import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.MapStyleOptions;
+import com.google.android.gms.maps.model.PolygonOptions;
+import com.google.android.gms.maps.model.PolylineOptions;
+import com.google.android.gms.maps.model.TileOverlayOptions;
+import com.google.android.gms.maps.model.internal.IPolylineDelegate;
+import com.google.android.gms.maps.model.internal.IPolygonDelegate;
+import com.google.android.gms.maps.model.internal.IMarkerDelegate;
+import com.google.android.gms.maps.model.internal.ICircleDelegate;
+import com.google.android.gms.maps.model.internal.IGroundOverlayDelegate;
+import com.google.android.gms.maps.model.internal.ITileOverlayDelegate;
+
+interface IGoogleMapDelegate {
+    CameraPosition getCameraPosition() = 0;
+
+    float getMaxZoomLevel() = 1;
+    float getMinZoomLevel() = 2;
+
+    void moveCamera(IObjectWrapper cameraUpdate) = 3;
+    void animateCamera(IObjectWrapper cameraUpdate) = 4;
+    void animateCameraWithCallback(IObjectWrapper cameraUpdate, ICancelableCallback callback) = 5;
+    void animateCameraWithDurationAndCallback(IObjectWrapper cameraUpdate, int duration, ICancelableCallback callback) = 6;
+    void stopAnimation() = 7;
+
+    IPolylineDelegate addPolyline(in PolylineOptions options) = 8;
+    IPolygonDelegate addPolygon(in PolygonOptions options) = 9;
+    IMarkerDelegate addMarker(in MarkerOptions options) = 10;
+    IGroundOverlayDelegate addGroundOverlay(in GroundOverlayOptions options) = 11;
+    ITileOverlayDelegate addTileOverlay(in TileOverlayOptions options) = 12;
+
+    void clear() = 13;
+
+    int getMapType() = 14;
+    void setMapType(int type) = 15;
+    boolean isTrafficEnabled() = 16;
+    void setTrafficEnabled(boolean traffic) = 17;
+    boolean isIndoorEnabled() = 18;
+    void setIndoorEnabled(boolean indoor) = 19;
+
+    boolean isMyLocationEnabled() = 20;
+    void setMyLocationEnabled(boolean myLocation) = 21;
+    Location getMyLocation() = 22;
+    void setLocationSource(ILocationSourceDelegate locationSource) = 23;
+
+    IUiSettingsDelegate getUiSettings() = 24;
+    IProjectionDelegate getProjection() = 25;
+
+    void setOnCameraChangeListener(IOnCameraChangeListener listener) = 26;
+    void setOnMapClickListener(IOnMapClickListener listener) = 27;
+    void setOnMapLongClickListener(IOnMapLongClickListener listener) = 28;
+    void setOnMarkerClickListener(IOnMarkerClickListener listener) = 29;
+    void setOnMarkerDragListener(IOnMarkerDragListener listener) = 30;
+    void setOnInfoWindowClickListener(IOnInfoWindowClickListener listener) = 31;
+    void setInfoWindowAdapter(IInfoWindowAdapter adapter) = 32;
+
+    IObjectWrapper getTestingHelper() = 33;
+
+    ICircleDelegate addCircle(in CircleOptions options) = 34;
+
+    void setOnMyLocationChangeListener(IOnMyLocationChangeListener listener) = 35;
+    void setOnMyLocationButtonClickListener(IOnMyLocationButtonClickListener listener) = 36;
+
+    void snapshot(ISnapshotReadyCallback callback, IObjectWrapper bitmap) = 37;
+
+    void setPadding(int left, int top, int right, int bottom) = 38;
+
+    boolean isBuildingsEnabled() = 39;
+    void setBuildingsEnabled(boolean buildings) = 40;
+
+    void setOnMapLoadedCallback(IOnMapLoadedCallback callback) = 41;
+
+    //IIndoorBuildingDelegate getFocusedBuilding() = 43;
+    //void setIndoorStateChangeListener(IOnIndoorStateChangeListener listener) = 44;
+
+    void setWatermarkEnabled(boolean watermark) = 50;
+
+    //void getMapAsync(IOnMapReadyCallback callback) = 52;
+    void onCreate(in Bundle savedInstanceState) = 53;
+    void onResume() = 54;
+    void onPause() = 55;
+    void onDestroy() = 56;
+    void onLowMemory() = 57;
+    boolean useViewLifecycleWhenInFragment() = 58;
+    void onSaveInstanceState(out Bundle outState) = 59;
+
+    void setContentDescription(String desc) = 60;
+
+    //void snapshotForTest(ISnapshotReadyCallback callback) = 70;
+
+    //void setPoiClickListener(IOnPoiClickListener listener) = 79;
+    void onEnterAmbient(in Bundle bundle) = 80;
+    void onExitAmbient() = 81;
+
+    //void setOnGroundOverlayClickListener(IOnGroundOverlayClickListener listener) = 82;
+    //void setInfoWindowLongClickListener(IOnInfoWindowLongClickListener listener) = 83;
+    //void setPolygonClickListener(IOnPolygonClickListener listener) = 84;
+    //void setInfoWindowCloseListener(IOnInfoWindowCloseListener listener) = 85;
+    //void setPolylineClickListener(IOnPolylineClickListener listener) = 86;
+    //void setCircleClickListener(IOnCircleClickListener listener) = 88;
+
+    boolean setMapStyle(in MapStyleOptions options) = 90;
+    void setMinZoomPreference(float minZoom) = 91;
+    void setMaxZoomPreference(float maxZoom) = 92;
+    void resetMinMaxZoomPreference() = 93;
+    void setLatLngBoundsForCameraTarget(in LatLngBounds bounds) = 94;
+
+    void setCameraMoveStartedListener(IOnCameraMoveStartedListener listener) = 95;
+    void setCameraMoveListener(IOnCameraMoveListener listener) = 96;
+    void setCameraMoveCanceledListener(IOnCameraMoveCanceledListener listener) = 97;
+    void setCameraIdleListener(IOnCameraIdleListener listener) = 98;
+
+    void onStart() = 100;
+    void onStop() = 101;
+
+    //void setOnMyLocationClickListener(IOnMyLocationClickListener listener) = 106;
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl
@ -0,0 +1,9 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.dynamic.IObjectWrapper;
+import com.google.android.gms.maps.model.internal.IMarkerDelegate;
+
+interface IInfoWindowAdapter {
+    IObjectWrapper getInfoWindow(IMarkerDelegate marker);
+    IObjectWrapper getInfoContents(IMarkerDelegate marker);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl
@ -0,0 +1,4 @@
+package com.google.android.gms.maps.internal;
+
+interface ILocationSourceDelegate {
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
@ -0,0 +1,27 @@
+package com.google.android.gms.maps.internal;
+
+import android.os.Bundle;
+
+import com.google.android.gms.maps.internal.IGoogleMapDelegate;
+import com.google.android.gms.maps.internal.IOnMapReadyCallback;
+import com.google.android.gms.maps.GoogleMapOptions;
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface IMapFragmentDelegate {
+    IGoogleMapDelegate getMap();
+    void onInflate(IObjectWrapper activity, in GoogleMapOptions options, in Bundle savedInstanceState);
+    void onCreate(in Bundle savedInstanceState);
+    IObjectWrapper onCreateView(IObjectWrapper layoutInflater, IObjectWrapper container, in Bundle savedInstanceState);
+    void onResume();
+    void onPause();
+    void onDestroyView();
+    void onDestroy();
+    void onLowMemory();
+    void onSaveInstanceState(inout Bundle outState);
+    boolean isReady();
+    void getMapAsync(IOnMapReadyCallback callback);
+    void onEnterAmbient(in Bundle bundle);
+    void onExitAmbient();
+    void onStart();
+    void onStop();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
@ -0,0 +1,23 @@
+package com.google.android.gms.maps.internal;
+
+import android.os.Bundle;
+
+import com.google.android.gms.maps.internal.IGoogleMapDelegate;
+import com.google.android.gms.maps.internal.IOnMapReadyCallback;
+import com.google.android.gms.dynamic.IObjectWrapper;
+
+interface IMapViewDelegate {
+    IGoogleMapDelegate getMap();
+    void onCreate(in Bundle savedInstanceState);
+    void onResume();
+    void onPause();
+    void onDestroy();
+    void onLowMemory();
+    void onSaveInstanceState(inout Bundle outState);
+    IObjectWrapper getView();
+    void getMapAsync(IOnMapReadyCallback callback);
+    void onEnterAmbient(in Bundle bundle);
+    void onExitAmbient();
+    void onStart();
+    void onStop();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl
@ -0,0 +1,7 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.maps.model.CameraPosition;
+
+interface IOnCameraChangeListener {
+    void onCameraChange(in CameraPosition update);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraIdleListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraIdleListener.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.maps.internal;
+
+interface IOnCameraIdleListener {
+    void onCameraIdle();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveCanceledListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveCanceledListener.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.maps.internal;
+
+interface IOnCameraMoveCanceledListener {
+    void onCameraMoveCanceled();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveListener.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.maps.internal;
+
+interface IOnCameraMoveListener {
+    void onCameraMove();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveStartedListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraMoveStartedListener.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.maps.internal;
+
+interface IOnCameraMoveStartedListener {
+    void onCameraMoveStarted(int i);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl
@ -0,0 +1,7 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.maps.model.internal.IMarkerDelegate;
+
+interface IOnInfoWindowClickListener {
+    void onInfoWindowClick(IMarkerDelegate marker);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl
@ -0,0 +1,7 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.maps.model.LatLng;
+
+interface IOnMapClickListener {
+    void onMapClick(in LatLng latLng);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl
@ -0,0 +1,5 @@
+package com.google.android.gms.maps.internal;
+
+interface IOnMapLoadedCallback {
+    void onMapLoaded();
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl
@ -0,0 +1,7 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.maps.model.LatLng;
+
+interface IOnMapLongClickListener {
+    void onMapLongClick(in LatLng latLng);
+}
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapReadyCallback.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapReadyCallback.aidl
@ -0,0 +1,7 @@
+package com.google.android.gms.maps.internal;
+
+import com.google.android.gms.maps.internal.IGoogleMapDelegate;
+
+interface IOnMapReadyCallback {
+    void onMapReady(IGoogleMapDelegate map);
+}
--- a/Show More
+++ b/Show More