From 7e5bf58bc31f11834ca886c5f0a2db9e4d9fe0e7 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Tue, 23 Jun 2015 00:20:54 +0200
Subject: [PATCH] Ensure Apps are not waiting for autocomplete list

---
 extern/GmsApi                                 |  2 +-
 .../org/microg/gms/common/NonCancelToken.java | 28 +++++++++++++++++++
 .../microg/gms/people/PeopleServiceImpl.java  |  9 ++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java

diff --git a/extern/GmsApi b/extern/GmsApi
index 37e3b4dc..d3c11f1e 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit 37e3b4dc398cb349e9637471d6df09db9c8910c8
+Subproject commit d3c11f1e82949e364c3c36cdb9e2e5071cf42ab4
diff --git a/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java b/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
new file mode 100644
index 00000000..0e50eada
--- /dev/null
+++ b/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013-2015 µg 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.common;
+
+import android.os.RemoteException;
+
+import com.google.android.gms.common.internal.ICancelToken;
+
+public class NonCancelToken extends ICancelToken.Stub {
+    @Override
+    public void cancel() throws RemoteException {
+
+    }
+}
diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
index fd2020ce..c743f8dd 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
@@ -32,6 +32,8 @@ import com.google.android.gms.common.internal.ICancelToken;
 import com.google.android.gms.people.internal.IPeopleCallbacks;
 import com.google.android.gms.people.internal.IPeopleService;
 
+import org.microg.gms.common.NonCancelToken;
+
 import java.io.File;
 
 public class PeopleServiceImpl extends IPeopleService.Stub {
@@ -134,6 +136,13 @@ public class PeopleServiceImpl extends IPeopleService.Stub {
         };
     }
 
+    @Override
+    public ICancelToken loadAutocompleteList(IPeopleCallbacks callbacks, String account, String pageId, boolean directorySearch, String var5, String query, int autocompleteType, int var8, int numberOfResults, boolean var10) throws RemoteException {
+        Log.d(TAG, "loadAutocompleteList: " + account + ", " + pageId + ", " + directorySearch + ", " + var5 + ", " + query + ", " + autocompleteType + ", " + var8 + ", " + numberOfResults + ", " + var10);
+        callbacks.onDataHolder(0, new Bundle(), null);
+        return new NonCancelToken();
+    }
+
     @Override
     public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {
         if (super.onTransact(code, data, reply, flags)) return true;