From d991888b89cb0022e8d94744d93a8af6aab5b720 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 7 Feb 2017 20:09:38 +0100
Subject: [PATCH] Spoof chimera provider, update sublib + build tools

---
 .travis.yml                                   |  4 +-
 build.gradle                                  | 10 +--
 extern/UnifiedNlp                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 .../src/main/AndroidManifest.xml              |  6 ++
 .../org/microg/gms/ChimeraSpoofProvider.java  | 66 +++++++++++++++++++
 6 files changed, 82 insertions(+), 10 deletions(-)
 create mode 100644 play-services-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java

diff --git a/.travis.yml b/.travis.yml
index f6117322..aad38ccc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-24.0.3
-  - android-24
+  - build-tools-25.0.2
+  - android-25
   - extra-android-m2repository
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
diff --git a/build.gradle b/build.gradle
index 3ec4bfce..432d0dc1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright 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.
@@ -19,20 +19,20 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "24.0.3"
+    ext.androidBuildVersionTools = "25.0.2"
     ext.isReleaseVersion = false
 }
 
-def androidCompileSdk() { return 24 }
+def androidCompileSdk() { return 25 }
 
-def androidTargetSdk() { return 24 }
+def androidTargetSdk() { return 23 }
 
 def androidMinSdk() { return 9 }
 
diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp
index 8f11adb8..ea09d3ff 160000
--- a/extern/UnifiedNlp
+++ b/extern/UnifiedNlp
@@ -1 +1 @@
-Subproject commit 8f11adb8f49eba2374ddb9bd00652f341877b53c
+Subproject commit ea09d3ff063c8ad32db492343bd640c3ac53bf2c
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8b3fd0a1..f766b3e6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 30 12:07:36 CET 2015
+#Tue Feb  7 18:49:43 UTC 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 96f3b383..254ee9b8 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -381,6 +381,12 @@
             </intent-filter>
         </activity>
 
+        <!-- Chimera spoof -->
+        <provider
+            android:authorities="com.google.android.gms.chimera"
+            android:name="org.microg.gms.ChimeraSpoofProvider"
+            android:exported="true"/>
+
         <!-- microG custom UI -->
 
         <activity
diff --git a/play-services-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java b/play-services-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java
new file mode 100644
index 00000000..f700437e
--- /dev/null
+++ b/play-services-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package org.microg.gms;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+public class ChimeraSpoofProvider extends ContentProvider {
+    private static final String TAG = "GmsChimeraSpoof";
+    private static final String[] COLUMNS = new String[]{"version", "apkPath", "loaderPath", "apkDescStr"};
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        MatrixCursor cursor = new MatrixCursor(COLUMNS);
+        Log.d(TAG, "query: " + uri);
+        return cursor;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return "vnd.android.cursor.item/com.google.android.gms.chimera";
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        return 0;
+    }
+}