Loading GmsApi @ ef5e6dc0 Compare d3c11f1e to ef5e6dc0 Original line number Diff line number Diff line Subproject commit d3c11f1e82949e364c3c36cdb9e2e5071cf42ab4 Subproject commit ef5e6dc0668a8ca152aa38a78f0e91d65120d3b6 play-services-core/src/main/java/org/microg/gms/DummyService.java +5 −3 Original line number Diff line number Diff line Loading @@ -16,17 +16,19 @@ package org.microg.gms; import android.os.RemoteException; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.internal.GetServiceRequest; import com.google.android.gms.common.internal.IGmsCallbacks; public class DummyService extends BaseService { public DummyService() { super("GmsDummySvc", AbstractGmsServiceBroker.ID_ACCEPT_ALL); } @Override public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request) { // Dummy public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request) throws RemoteException { callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); } } play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java +6 −2 Original line number Diff line number Diff line Loading @@ -30,6 +30,8 @@ import com.google.android.gms.auth.AccountChangeEventsResponse; import org.microg.gms.common.PackageUtils; import java.io.IOException; import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; import static android.accounts.AccountManager.KEY_AUTHTOKEN; Loading Loading @@ -95,9 +97,11 @@ public class AuthManagerServiceImpl extends IAuthManagerService.Stub { result.putParcelable(KEY_USER_RECOVERY_INTENT, i); return result; } } catch (Exception e) { } catch (IOException e) { Log.w(TAG, e); throw new RuntimeException(e); Bundle result = new Bundle(); result.putString(KEY_ERROR, "NetworkError"); return result; } } Loading play-services-core/src/main/java/org/microg/gms/icing/CorporaSearchImpl.java→play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java +3 −3 Original line number Diff line number Diff line Loading @@ -20,10 +20,10 @@ import android.os.Parcel; import android.os.RemoteException; import android.util.Log; import com.google.android.gms.search.corpora.internal.ISearchCorporaService; import com.google.android.gms.search.global.internal.IGlobalSearchAdminService; public class CorporaSearchImpl extends ISearchCorporaService.Stub { private static final String TAG = "GmsIcingCorporaImpl"; public class GlobalSearchAdminImpl extends IGlobalSearchAdminService.Stub { private static final String TAG = "GmsIcingGlobalImpl"; @Override public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { Loading play-services-core/src/main/java/org/microg/gms/icing/IndexService.java +12 −5 Original line number Diff line number Diff line Loading @@ -18,6 +18,7 @@ package org.microg.gms.icing; import android.os.RemoteException; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.internal.GetServiceRequest; import com.google.android.gms.common.internal.IGmsCallbacks; Loading @@ -26,7 +27,9 @@ import org.microg.gms.common.Services; public class IndexService extends BaseService { private AppDataSearchImpl appDataSearch = new AppDataSearchImpl(); private CorporaSearchImpl corporaSearch = new CorporaSearchImpl(); private GlobalSearchAdminImpl globalSearchAdmin = new GlobalSearchAdminImpl(); private SearchCorporaImpl searchCorpora = new SearchCorporaImpl(); private SearchQueriesImpl searchQueries = new SearchQueriesImpl(); public IndexService() { super("GmsIcingIndexSvc", Loading @@ -42,15 +45,19 @@ public class IndexService extends BaseService { callback.onPostInitComplete(0, appDataSearch.asBinder(), null); break; case Services.SEARCH_ADMINISTRATION.SERVICE_ID: callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); break; case Services.SEARCH_CORPORA.SERVICE_ID: callback.onPostInitComplete(0, corporaSearch.asBinder(), null); case Services.SEARCH_QUERIES.SERVICE_ID: callback.onPostInitComplete(0, searchQueries.asBinder(), null); break; case Services.SEARCH_GLOBAL.SERVICE_ID: callback.onPostInitComplete(0, globalSearchAdmin.asBinder(), null); break; case Services.SEARCH_IME.SERVICE_ID: case Services.SEARCH_CORPORA.SERVICE_ID: callback.onPostInitComplete(0, searchCorpora.asBinder(), null); break; case Services.SEARCH_QUERIES.SERVICE_ID: case Services.SEARCH_IME.SERVICE_ID: callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); break; } } Loading Loading
GmsApi @ ef5e6dc0 Compare d3c11f1e to ef5e6dc0 Original line number Diff line number Diff line Subproject commit d3c11f1e82949e364c3c36cdb9e2e5071cf42ab4 Subproject commit ef5e6dc0668a8ca152aa38a78f0e91d65120d3b6
play-services-core/src/main/java/org/microg/gms/DummyService.java +5 −3 Original line number Diff line number Diff line Loading @@ -16,17 +16,19 @@ package org.microg.gms; import android.os.RemoteException; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.internal.GetServiceRequest; import com.google.android.gms.common.internal.IGmsCallbacks; public class DummyService extends BaseService { public DummyService() { super("GmsDummySvc", AbstractGmsServiceBroker.ID_ACCEPT_ALL); } @Override public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request) { // Dummy public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request) throws RemoteException { callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); } }
play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java +6 −2 Original line number Diff line number Diff line Loading @@ -30,6 +30,8 @@ import com.google.android.gms.auth.AccountChangeEventsResponse; import org.microg.gms.common.PackageUtils; import java.io.IOException; import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; import static android.accounts.AccountManager.KEY_AUTHTOKEN; Loading Loading @@ -95,9 +97,11 @@ public class AuthManagerServiceImpl extends IAuthManagerService.Stub { result.putParcelable(KEY_USER_RECOVERY_INTENT, i); return result; } } catch (Exception e) { } catch (IOException e) { Log.w(TAG, e); throw new RuntimeException(e); Bundle result = new Bundle(); result.putString(KEY_ERROR, "NetworkError"); return result; } } Loading
play-services-core/src/main/java/org/microg/gms/icing/CorporaSearchImpl.java→play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java +3 −3 Original line number Diff line number Diff line Loading @@ -20,10 +20,10 @@ import android.os.Parcel; import android.os.RemoteException; import android.util.Log; import com.google.android.gms.search.corpora.internal.ISearchCorporaService; import com.google.android.gms.search.global.internal.IGlobalSearchAdminService; public class CorporaSearchImpl extends ISearchCorporaService.Stub { private static final String TAG = "GmsIcingCorporaImpl"; public class GlobalSearchAdminImpl extends IGlobalSearchAdminService.Stub { private static final String TAG = "GmsIcingGlobalImpl"; @Override public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { Loading
play-services-core/src/main/java/org/microg/gms/icing/IndexService.java +12 −5 Original line number Diff line number Diff line Loading @@ -18,6 +18,7 @@ package org.microg.gms.icing; import android.os.RemoteException; import com.google.android.gms.common.api.CommonStatusCodes; import com.google.android.gms.common.internal.GetServiceRequest; import com.google.android.gms.common.internal.IGmsCallbacks; Loading @@ -26,7 +27,9 @@ import org.microg.gms.common.Services; public class IndexService extends BaseService { private AppDataSearchImpl appDataSearch = new AppDataSearchImpl(); private CorporaSearchImpl corporaSearch = new CorporaSearchImpl(); private GlobalSearchAdminImpl globalSearchAdmin = new GlobalSearchAdminImpl(); private SearchCorporaImpl searchCorpora = new SearchCorporaImpl(); private SearchQueriesImpl searchQueries = new SearchQueriesImpl(); public IndexService() { super("GmsIcingIndexSvc", Loading @@ -42,15 +45,19 @@ public class IndexService extends BaseService { callback.onPostInitComplete(0, appDataSearch.asBinder(), null); break; case Services.SEARCH_ADMINISTRATION.SERVICE_ID: callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); break; case Services.SEARCH_CORPORA.SERVICE_ID: callback.onPostInitComplete(0, corporaSearch.asBinder(), null); case Services.SEARCH_QUERIES.SERVICE_ID: callback.onPostInitComplete(0, searchQueries.asBinder(), null); break; case Services.SEARCH_GLOBAL.SERVICE_ID: callback.onPostInitComplete(0, globalSearchAdmin.asBinder(), null); break; case Services.SEARCH_IME.SERVICE_ID: case Services.SEARCH_CORPORA.SERVICE_ID: callback.onPostInitComplete(0, searchCorpora.asBinder(), null); break; case Services.SEARCH_QUERIES.SERVICE_ID: case Services.SEARCH_IME.SERVICE_ID: callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); break; } } Loading