diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fccd82d3..bbcf844f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -58,30 +58,46 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -115,24 +131,10 @@ - - - - - @@ -140,6 +142,16 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GmsApi b/GmsApi index 3243e7d3..6020cd81 160000 --- a/GmsApi +++ b/GmsApi @@ -1 +1 @@ -Subproject commit 3243e7d3ecf2f7ff92279b61c4a7e7831356f5c7 +Subproject commit 6020cd818a17d1d38a85157b0d44e3505fe791ee diff --git a/res/values/permissions.xml b/res/values/permissions.xml index f2afd012..426998ed 100644 --- a/res/values/permissions.xml +++ b/res/values/permissions.xml @@ -150,6 +150,7 @@ Manage your city-level location provides read and write access to the user\'s Maps Engine data from your application. provides read-only access to the user\'s Maps Engine data from your + Full access to your Google Maps account Manage your Orkut activity View your Orkut data Know your name, basic info, and list of people you\'re connected to on Google+ diff --git a/src/com/google/android/gms/ads/AdActivity.java b/src/com/google/android/gms/ads/AdActivity.java new file mode 100644 index 00000000..5bb1354d --- /dev/null +++ b/src/com/google/android/gms/ads/AdActivity.java @@ -0,0 +1,22 @@ +/* + * 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 com.google.android.gms.ads; + +import android.app.Activity; + +public class AdActivity extends Activity { +} diff --git a/src/com/google/android/gms/ads/AdManagerCreatorImpl.java b/src/com/google/android/gms/ads/AdManagerCreatorImpl.java new file mode 100644 index 00000000..d1f5add6 --- /dev/null +++ b/src/com/google/android/gms/ads/AdManagerCreatorImpl.java @@ -0,0 +1,20 @@ +/* + * 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 com.google.android.gms.ads; + +public class AdManagerCreatorImpl { +} diff --git a/src/com/google/android/gms/analytics/service/AnalyticsService.java b/src/com/google/android/gms/analytics/service/AnalyticsService.java new file mode 100644 index 00000000..2f456e5c --- /dev/null +++ b/src/com/google/android/gms/analytics/service/AnalyticsService.java @@ -0,0 +1,32 @@ +/* + * 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 com.google.android.gms.analytics.service; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +public class AnalyticsService extends Service { + private static final String TAG = "GmsAnalyticsSvc"; + + @Override + public IBinder onBind(Intent intent) { + Log.d(TAG, "onBind: " + intent); + return null; + } +} diff --git a/src/com/google/android/gms/auth/TokenActivity.java b/src/com/google/android/gms/auth/TokenActivity.java index 1d41ded3..027a8952 100644 --- a/src/com/google/android/gms/auth/TokenActivity.java +++ b/src/com/google/android/gms/auth/TokenActivity.java @@ -16,22 +16,20 @@ package com.google.android.gms.auth; -import android.accounts.*; import android.app.Activity; import android.os.Bundle; -import android.os.Handler; import android.util.Log; -import java.io.IOException; - public class TokenActivity extends Activity { + private static final String TAG = "GmsAuthTokenActivity"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle extras = getIntent().getExtras(); extras.get("KEY"); - Log.d("TokenActivity", extras.toString()); - AccountManager accountManager = AccountManager.get(this); + Log.d(TAG, extras.toString()); + /*AccountManager accountManager = AccountManager.get(this); accountManager.getAuthToken(new Account(extras.getString("authAccount"), "com.google"), extras.getString("service"), extras.getBundle("callerExtras"), this, new AccountManagerCallback() { @Override public void run(AccountManagerFuture future) { @@ -51,6 +49,6 @@ public class TokenActivity extends Activity { e.printStackTrace(); } } - }, new Handler(getMainLooper())); + }, new Handler(getMainLooper()));*/ } } diff --git a/src/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java b/src/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java new file mode 100644 index 00000000..935ccdd9 --- /dev/null +++ b/src/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java @@ -0,0 +1,20 @@ +/* + * 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 com.google.android.gms.common.ui; + +public class SignInButtonCreatorImpl { +} diff --git a/src/com/google/android/gms/recovery/RecoveryService.java b/src/com/google/android/gms/recovery/RecoveryService.java new file mode 100644 index 00000000..a7e2ccdd --- /dev/null +++ b/src/com/google/android/gms/recovery/RecoveryService.java @@ -0,0 +1,32 @@ +/* + * 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 com.google.android.gms.recovery; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +public class RecoveryService extends Service { + private static final String TAG = "GmsRecoverySvc"; + + @Override + public IBinder onBind(Intent intent) { + Log.d(TAG, "onBind: " + intent); + return null; + } +} diff --git a/src/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java b/src/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java new file mode 100644 index 00000000..4329e19b --- /dev/null +++ b/src/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java @@ -0,0 +1,20 @@ +/* + * 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 com.google.android.gms.wallet.dynamite; + +public class WalletDynamiteCreatorImpl { +} diff --git a/src/org/microg/gms/auth/AuthManagerServiceImpl.java b/src/org/microg/gms/auth/AuthManagerServiceImpl.java index 4ffdb3d6..ef44fd9a 100644 --- a/src/org/microg/gms/auth/AuthManagerServiceImpl.java +++ b/src/org/microg/gms/auth/AuthManagerServiceImpl.java @@ -35,7 +35,7 @@ import com.google.android.gms.auth.AccountChangeEventsResponse; import org.microg.gms.common.Utils; public class AuthManagerServiceImpl extends IAuthManagerService.Stub { - private static final String TAG = "GmsAuthManagerService"; + private static final String TAG = "GmsAuthManagerSvc"; public static final String GOOGLE_ACCOUNT_TYPE = "com.google"; diff --git a/src/org/microg/gms/auth/loginservice/GoogleLoginService.java b/src/org/microg/gms/auth/loginservice/GoogleLoginService.java index bfaddde6..c34df3a6 100644 --- a/src/org/microg/gms/auth/loginservice/GoogleLoginService.java +++ b/src/org/microg/gms/auth/loginservice/GoogleLoginService.java @@ -40,7 +40,7 @@ import java.io.IOException; import java.util.Arrays; public class GoogleLoginService extends Service { - private static final String TAG = "GmsLoginService"; + private static final String TAG = "GmsAuthLoginSvc"; private String accountType; diff --git a/src/org/microg/gms/checkin/CheckinService.java b/src/org/microg/gms/checkin/CheckinService.java index 2b0a0426..5150e307 100644 --- a/src/org/microg/gms/checkin/CheckinService.java +++ b/src/org/microg/gms/checkin/CheckinService.java @@ -23,7 +23,7 @@ import android.util.Log; import java.io.IOException; public class CheckinService extends IntentService { - private static final String TAG = "GmsCheckinService"; + private static final String TAG = "GmsCheckinSvc"; public CheckinService() { super(TAG); diff --git a/src/org/microg/gms/gcm/PushRegisterService.java b/src/org/microg/gms/gcm/PushRegisterService.java index 33bf780a..3970cc4f 100644 --- a/src/org/microg/gms/gcm/PushRegisterService.java +++ b/src/org/microg/gms/gcm/PushRegisterService.java @@ -23,7 +23,7 @@ import android.os.Build; import android.util.Log; public class PushRegisterService extends IntentService { - private static final String TAG = "GmsGcmRegisterService"; + private static final String TAG = "GmsGcmRegisterSvc"; public PushRegisterService() { super(TAG); diff --git a/src/org/microg/gms/icing/LightweightAppDataSearchImpl.java b/src/org/microg/gms/icing/LightweightAppDataSearchImpl.java new file mode 100644 index 00000000..e4cd8637 --- /dev/null +++ b/src/org/microg/gms/icing/LightweightAppDataSearchImpl.java @@ -0,0 +1,33 @@ +/* + * 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.icing; + +import android.util.Log; + +import com.google.android.gms.appdatasearch.UsageInfo; +import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearch; +import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearchCallbacks; + +import java.util.Arrays; + +public class LightweightAppDataSearchImpl extends ILightweightAppDataSearch.Stub { + private static final String TAG = "GmsIcingLightSearchImpl"; + + public void view(ILightweightAppDataSearchCallbacks callbacks, String packageName, UsageInfo[] usageInfos) { + Log.d(TAG, "view: " + Arrays.toString(usageInfos)); + } +} diff --git a/src/org/microg/gms/icing/LightweightIndexService.java b/src/org/microg/gms/icing/LightweightIndexService.java new file mode 100644 index 00000000..0b919de8 --- /dev/null +++ b/src/org/microg/gms/icing/LightweightIndexService.java @@ -0,0 +1,46 @@ +/* + * 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.icing; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; + +import com.google.android.gms.common.internal.IGmsCallbacks; + +import org.microg.gms.AbstractGmsServiceBroker; + +public class LightweightIndexService extends Service { + private static final String TAG = "GmsIcingLightIndexSvc"; + + private LightweightAppDataSearchImpl appDataSearch = new LightweightAppDataSearchImpl(); + private AbstractGmsServiceBroker broker = new AbstractGmsServiceBroker() { + @Override + public void getLightweightAppDataSearchService(IGmsCallbacks callback, int versionCode, + String packageName) throws RemoteException { + Log.d(TAG, "bound by: " + packageName); + callback.onPostInitComplete(0, appDataSearch.asBinder(), null); + } + }; + + @Override + public IBinder onBind(Intent intent) { + return broker.asBinder(); + } +} diff --git a/src/com/google/android/location/internal/GoogleLocationManagerService.java b/src/org/microg/gms/location/GoogleLocationManagerService.java similarity index 95% rename from src/com/google/android/location/internal/GoogleLocationManagerService.java rename to src/org/microg/gms/location/GoogleLocationManagerService.java index 0f7e7ab9..91f1e5e4 100644 --- a/src/com/google/android/location/internal/GoogleLocationManagerService.java +++ b/src/org/microg/gms/location/GoogleLocationManagerService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.location.internal; +package org.microg.gms.location; import android.app.Service; import android.content.Intent; @@ -31,7 +31,7 @@ import org.microg.gms.location.GoogleLocationManagerServiceImpl; import static org.microg.gms.common.Constants.ACTION_GMS_LOCATION_MANAGER_SERVICE_START; public class GoogleLocationManagerService extends Service { - private static final String TAG = "GmsLMS"; + private static final String TAG = "GmsLocManagerSvc"; private GoogleLocationManagerServiceImpl impl = new GoogleLocationManagerServiceImpl(this); private AbstractGmsServiceBroker broker = new AbstractGmsServiceBroker() { diff --git a/src/org/microg/gms/location/GoogleLocationManagerServiceImpl.java b/src/org/microg/gms/location/GoogleLocationManagerServiceImpl.java index e3faef57..5da8e47f 100644 --- a/src/org/microg/gms/location/GoogleLocationManagerServiceImpl.java +++ b/src/org/microg/gms/location/GoogleLocationManagerServiceImpl.java @@ -39,7 +39,7 @@ import com.google.android.gms.maps.model.LatLngBounds; import java.util.List; public class GoogleLocationManagerServiceImpl extends IGoogleLocationManagerService.Stub { - private static final String TAG = "GmsLMSImpl"; + private static final String TAG = "GmsLocManagerSvcImpl"; private final Context context; private GoogleLocationManager locationManager; diff --git a/src/org/microg/gms/location/LocationRequestHelper.java b/src/org/microg/gms/location/LocationRequestHelper.java index db4cc979..7da0716b 100644 --- a/src/org/microg/gms/location/LocationRequestHelper.java +++ b/src/org/microg/gms/location/LocationRequestHelper.java @@ -26,7 +26,7 @@ import com.google.android.gms.location.ILocationListener; import com.google.android.gms.location.LocationRequest; public class LocationRequestHelper { - public static final String TAG = "GmsLocationRequestHelper"; + public static final String TAG = "GmsLocRequestHelper"; private final Context context; public final LocationRequest locationRequest; public final boolean hasFinePermission; @@ -90,10 +90,7 @@ public class LocationRequestHelper { } lastReport = location; numReports++; - if (numReports >= locationRequest.getNumUpdates()) { - return false; - } - return true; + return numReports < locationRequest.getNumUpdates(); } @Override diff --git a/src/org/microg/gms/location/RealLocationProvider.java b/src/org/microg/gms/location/RealLocationProvider.java index ee9578ea..5fd4a45c 100644 --- a/src/org/microg/gms/location/RealLocationProvider.java +++ b/src/org/microg/gms/location/RealLocationProvider.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class RealLocationProvider { - public static final String TAG = "GmsRealLocationProvider"; + public static final String TAG = "GmsLocProviderReal"; private Location lastLocation; private LocationManager locationManager; private String name; diff --git a/src/org/microg/gms/location/ReportingAndroidService.java b/src/org/microg/gms/location/ReportingAndroidService.java new file mode 100644 index 00000000..bf92d730 --- /dev/null +++ b/src/org/microg/gms/location/ReportingAndroidService.java @@ -0,0 +1,32 @@ +/* + * 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.location; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +public class ReportingAndroidService extends Service { + private static final String TAG = "GmsLocReportingSvc"; + + @Override + public IBinder onBind(Intent intent) { + Log.d(TAG, "onBind: " + intent); + return null; + } +} diff --git a/src/org/microg/gms/maps/BackendMap.java b/src/org/microg/gms/maps/BackendMap.java index 34b91a59..e7854de6 100644 --- a/src/org/microg/gms/maps/BackendMap.java +++ b/src/org/microg/gms/maps/BackendMap.java @@ -44,7 +44,7 @@ import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import java.util.HashMap; public class BackendMap implements ItemizedLayer.OnItemGestureListener { - private final static String TAG = "GmsBackendMap"; + private final static String TAG = "GmsMapBackend"; private final Context context; private final MapView mapView; diff --git a/src/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java b/src/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java index c902f7b0..e75c44fd 100644 --- a/src/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java +++ b/src/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java @@ -21,8 +21,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; public class ResourceBitmapDescriptor extends AbstractBitmapDescriptor { - private static final String TAG = ResourceBitmapDescriptor.class.getName(); - private int resourceId; public ResourceBitmapDescriptor(int resourceId) { diff --git a/src/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java b/src/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java index 2a6fce9b..f4202505 100644 --- a/src/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java +++ b/src/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java @@ -29,7 +29,7 @@ import org.oscim.core.MapPosition; import org.oscim.map.Map; public class CameraUpdateFactoryImpl extends ICameraUpdateFactoryDelegate.Stub { - private static final String TAG = CameraUpdateFactoryImpl.class.getName(); + private static final String TAG = "GmsMapCamUpdateFactory"; @Override public IObjectWrapper zoomIn() throws RemoteException { diff --git a/src/org/microg/gms/maps/markup/MarkerImpl.java b/src/org/microg/gms/maps/markup/MarkerImpl.java index 045f04fd..826f0901 100644 --- a/src/org/microg/gms/maps/markup/MarkerImpl.java +++ b/src/org/microg/gms/maps/markup/MarkerImpl.java @@ -36,7 +36,7 @@ import org.oscim.layers.marker.MarkerSymbol; import org.oscim.map.Map; public class MarkerImpl extends IMarkerDelegate.Stub implements Markup { - private static final String TAG = MarkerImpl.class.getName(); + private static final String TAG = "GmsMapMarkerImpl"; private final String id; private final MarkerOptions options; diff --git a/src/org/microg/gms/mdm/NetworkQualityService.java b/src/org/microg/gms/mdm/NetworkQualityService.java new file mode 100644 index 00000000..be6ba77b --- /dev/null +++ b/src/org/microg/gms/mdm/NetworkQualityService.java @@ -0,0 +1,32 @@ +/* + * 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.mdm; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +public class NetworkQualityService extends Service { + private static final String TAG = "GmsMdmQualitySvc"; + + @Override + public IBinder onBind(Intent intent) { + Log.d(TAG, "onBind: " + intent); + return null; + } +} diff --git a/src/com/google/android/gms/people/service/PeopleService.java b/src/org/microg/gms/people/PeopleService.java similarity index 91% rename from src/com/google/android/gms/people/service/PeopleService.java rename to src/org/microg/gms/people/PeopleService.java index cd3b9929..454477c0 100644 --- a/src/com/google/android/gms/people/service/PeopleService.java +++ b/src/org/microg/gms/people/PeopleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.gms.people.service; +package org.microg.gms.people; import android.app.Service; import android.content.Intent; @@ -26,12 +26,11 @@ import android.util.Log; import com.google.android.gms.common.internal.IGmsCallbacks; import org.microg.gms.AbstractGmsServiceBroker; -import org.microg.gms.people.service.PeopleServiceImpl; import static org.microg.gms.common.Constants.ACTION_GMS_PEOPLE_SERVICE_START; public class PeopleService extends Service { - private static final String TAG = "GmsPeopleService"; + private static final String TAG = "GmsPeopleSvc"; private PeopleServiceImpl impl = new PeopleServiceImpl(this); private AbstractGmsServiceBroker broker = new AbstractGmsServiceBroker() { diff --git a/src/org/microg/gms/people/service/PeopleServiceImpl.java b/src/org/microg/gms/people/PeopleServiceImpl.java similarity index 95% rename from src/org/microg/gms/people/service/PeopleServiceImpl.java rename to src/org/microg/gms/people/PeopleServiceImpl.java index 660e3188..2d820bd4 100644 --- a/src/org/microg/gms/people/service/PeopleServiceImpl.java +++ b/src/org/microg/gms/people/PeopleServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.microg.gms.people.service; +package org.microg.gms.people; import android.content.Context; import android.os.Binder; diff --git a/src/org/microg/gms/settings/GoogleSettingsProvider.java b/src/org/microg/gms/settings/GoogleSettingsProvider.java new file mode 100644 index 00000000..128d4795 --- /dev/null +++ b/src/org/microg/gms/settings/GoogleSettingsProvider.java @@ -0,0 +1,54 @@ +/* + * 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.settings; + +import android.content.ContentProvider; +import android.content.ContentValues; +import android.database.Cursor; +import android.net.Uri; + +public class GoogleSettingsProvider extends ContentProvider { + @Override + public boolean onCreate() { + return false; + } + + @Override + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { + return null; + } + + @Override + public String getType(Uri uri) { + return null; + } + + @Override + public Uri insert(Uri uri, ContentValues values) { + return null; + } + + @Override + public int delete(Uri uri, String selection, String[] selectionArgs) { + return 0; + } + + @Override + public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { + return 0; + } +} diff --git a/src/org/microg/gms/wearable/WearableService.java b/src/org/microg/gms/wearable/WearableService.java new file mode 100644 index 00000000..ec343f17 --- /dev/null +++ b/src/org/microg/gms/wearable/WearableService.java @@ -0,0 +1,32 @@ +/* + * 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.wearable; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +public class WearableService extends Service { + private static final String TAG = "GmsWearSvc"; + + @Override + public IBinder onBind(Intent intent) { + Log.d(TAG, "onBind: " + intent); + return null; + } +}