Java 6 compat

This commit is contained in:
mar-v-in 2015-04-13 23:52:26 +02:00
parent 8928053170
commit deb757edfb
51 changed files with 56 additions and 57 deletions

2
extern/SafeParcel vendored

@ -1 +1 @@
Subproject commit 26d9c429770c37ad3e087d4469c4d4b3042e4f25 Subproject commit d7b18b06734e4109bc3131345a26aa261d369605

View File

@ -20,4 +20,7 @@ dependencies {
android { android {
compileSdkVersion 22 compileSdkVersion 22
buildToolsVersion "22.0.0" buildToolsVersion "22.0.0"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
}
} }

View File

@ -38,5 +38,5 @@ public class CorpusStatus extends AutoSafeParcelable {
@SafeParceled(6) @SafeParceled(6)
public String g; public String g;
public static final Creator<CorpusStatus> CREATOR = new AutoCreator<>(CorpusStatus.class); public static final Creator<CorpusStatus> CREATOR = new AutoCreator<CorpusStatus>(CorpusStatus.class);
} }

View File

@ -20,5 +20,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
public class PIMEUpdate extends AutoSafeParcelable { public class PIMEUpdate extends AutoSafeParcelable {
public static final Creator<PIMEUpdate> CREATOR = new AutoCreator<>(PIMEUpdate.class); public static final Creator<PIMEUpdate> CREATOR = new AutoCreator<PIMEUpdate>(PIMEUpdate.class);
} }

View File

@ -37,5 +37,5 @@ public class PIMEUpdateResponse extends AutoSafeParcelable {
this.updates = new PIMEUpdate[0]; this.updates = new PIMEUpdate[0];
} }
public static final Creator<PIMEUpdateResponse> CREATOR = new AutoCreator<>(PIMEUpdateResponse.class); public static final Creator<PIMEUpdateResponse> CREATOR = new AutoCreator<PIMEUpdateResponse>(PIMEUpdateResponse.class);
} }

View File

@ -24,5 +24,5 @@ public class RequestIndexingSpecification extends AutoSafeParcelable {
@SafeParceled(1000) @SafeParceled(1000)
private int versionCode; private int versionCode;
public static final Creator<RequestIndexingSpecification> CREATOR = new AutoCreator<>(RequestIndexingSpecification.class); public static final Creator<RequestIndexingSpecification> CREATOR = new AutoCreator<RequestIndexingSpecification>(RequestIndexingSpecification.class);
} }

View File

@ -23,5 +23,5 @@ public class SuggestSpecification extends AutoSafeParcelable {
@SafeParceled(1000) @SafeParceled(1000)
private int versionCode = 2; private int versionCode = 2;
public static final Creator<SuggestSpecification> CREATOR = new AutoCreator<>(SuggestSpecification.class); public static final Creator<SuggestSpecification> CREATOR = new AutoCreator<SuggestSpecification>(SuggestSpecification.class);
} }

View File

@ -47,5 +47,5 @@ public class SuggestionResults extends AutoSafeParcelable {
this.s2 = s2; this.s2 = s2;
} }
public static final Creator<SuggestionResults> CREATOR = new AutoCreator<>(SuggestionResults.class); public static final Creator<SuggestionResults> CREATOR = new AutoCreator<SuggestionResults>(SuggestionResults.class);
} }

View File

@ -20,5 +20,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
public class UsageInfo extends AutoSafeParcelable { public class UsageInfo extends AutoSafeParcelable {
public static Creator<UsageInfo> CREATOR = new AutoCreator<>(UsageInfo.class); public static Creator<UsageInfo> CREATOR = new AutoCreator<UsageInfo>(UsageInfo.class);
} }

View File

@ -3,5 +3,5 @@ package com.google.android.gms.auth;
import org.microg.safeparcel.AutoSafeParcelable; import org.microg.safeparcel.AutoSafeParcelable;
public class AccountChangeEvent extends AutoSafeParcelable { public class AccountChangeEvent extends AutoSafeParcelable {
public static Creator<AccountChangeEvent> CREATOR = new AutoCreator<>(AccountChangeEvent.class); public static Creator<AccountChangeEvent> CREATOR = new AutoCreator<AccountChangeEvent>(AccountChangeEvent.class);
} }

View File

@ -32,6 +32,6 @@ public class AccountChangeEventsRequest extends AutoSafeParcelable {
versionCode = 1; versionCode = 1;
} }
public static Creator<AccountChangeEventsRequest> CREATOR = new AutoCreator<>(AccountChangeEventsRequest.class); public static Creator<AccountChangeEventsRequest> CREATOR = new AutoCreator<AccountChangeEventsRequest>(AccountChangeEventsRequest.class);
} }

View File

@ -30,8 +30,8 @@ public class AccountChangeEventsResponse extends AutoSafeParcelable {
public AccountChangeEventsResponse() { public AccountChangeEventsResponse() {
versionCode = 1; versionCode = 1;
events = new ArrayList<>(); events = new ArrayList<AccountChangeEvent>();
} }
public static Creator<AccountChangeEventsResponse> CREATOR = new AutoCreator<>(AccountChangeEventsResponse.class); public static Creator<AccountChangeEventsResponse> CREATOR = new AutoCreator<AccountChangeEventsResponse>(AccountChangeEventsResponse.class);
} }

View File

@ -3,5 +3,5 @@ package com.google.android.gms.common.api;
import org.microg.safeparcel.AutoSafeParcelable; import org.microg.safeparcel.AutoSafeParcelable;
public class AccountInfo extends AutoSafeParcelable { public class AccountInfo extends AutoSafeParcelable {
public static final Creator<AccountInfo> CREATOR = new AutoCreator<>(AccountInfo.class); public static final Creator<AccountInfo> CREATOR = new AutoCreator<AccountInfo>(AccountInfo.class);
} }

View File

@ -47,5 +47,5 @@ public class Scope extends AutoSafeParcelable {
return scopeUri; return scopeUri;
} }
public static final Creator<Scope> CREATOR = new AutoCreator<>(Scope.class); public static final Creator<Scope> CREATOR = new AutoCreator<Scope>(Scope.class);
} }

View File

@ -79,5 +79,5 @@ public final class Status extends AutoSafeParcelable implements Result {
return this; return this;
} }
public static final Creator<Status> CREATOR = new AutoCreator<>(Status.class); public static final Creator<Status> CREATOR = new AutoCreator<Status>(Status.class);
} }

View File

@ -83,7 +83,7 @@ public class DataHolder extends AutoSafeParcelable {
} }
public static DataHolder fromCursor(Cursor cursor, int statusCode, Bundle metadata) { public static DataHolder fromCursor(Cursor cursor, int statusCode, Bundle metadata) {
List<CursorWindow> windows = new ArrayList<>(); List<CursorWindow> windows = new ArrayList<CursorWindow>();
CursorWindow cursorWindow = null; CursorWindow cursorWindow = null;
int row = 0; int row = 0;
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
@ -142,5 +142,5 @@ public class DataHolder extends AutoSafeParcelable {
'}'; '}';
} }
public static final Creator<DataHolder> CREATOR = new AutoCreator<>(DataHolder.class); public static final Creator<DataHolder> CREATOR = new AutoCreator<DataHolder>(DataHolder.class);
} }

View File

@ -78,5 +78,5 @@ public class GetServiceRequest extends AutoSafeParcelable {
'}'; '}';
} }
public static Creator<GetServiceRequest> CREATOR = new AutoCreator<>(GetServiceRequest.class); public static Creator<GetServiceRequest> CREATOR = new AutoCreator<GetServiceRequest>(GetServiceRequest.class);
} }

View File

@ -19,5 +19,5 @@ package com.google.android.gms.common.internal;
import org.microg.safeparcel.AutoSafeParcelable; import org.microg.safeparcel.AutoSafeParcelable;
public class ValidateAccountRequest extends AutoSafeParcelable { public class ValidateAccountRequest extends AutoSafeParcelable {
public static Creator<ValidateAccountRequest> CREATOR = new AutoCreator<>(ValidateAccountRequest.class); public static Creator<ValidateAccountRequest> CREATOR = new AutoCreator<ValidateAccountRequest>(ValidateAccountRequest.class);
} }

View File

@ -20,5 +20,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
public class FavaDiagnosticsEntity extends AutoSafeParcelable { public class FavaDiagnosticsEntity extends AutoSafeParcelable {
public static final Creator<FavaDiagnosticsEntity> CREATOR = new AutoCreator<>(FavaDiagnosticsEntity.class); public static final Creator<FavaDiagnosticsEntity> CREATOR = new AutoCreator<FavaDiagnosticsEntity>(FavaDiagnosticsEntity.class);
} }

View File

@ -20,5 +20,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
public class Geofence extends AutoSafeParcelable { public class Geofence extends AutoSafeParcelable {
public static Creator<Geofence> CREATOR = new AutoCreator<>(Geofence.class); public static Creator<Geofence> CREATOR = new AutoCreator<Geofence>(Geofence.class);
} }

View File

@ -7,6 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
*/ */
public class GeofencingRequest extends AutoSafeParcelable { public class GeofencingRequest extends AutoSafeParcelable {
public static final Creator<GeofencingRequest> CREATOR = new AutoCreator<>( public static final Creator<GeofencingRequest> CREATOR = new AutoCreator<GeofencingRequest>(GeofencingRequest.class);
GeofencingRequest.class);
} }

View File

@ -412,5 +412,5 @@ public class LocationRequest extends AutoSafeParcelable {
return super.toString(); return super.toString();
} }
public static final Creator<LocationRequest> CREATOR = new AutoCreator<>(LocationRequest.class); public static final Creator<LocationRequest> CREATOR = new AutoCreator<LocationRequest>(LocationRequest.class);
} }

View File

@ -76,5 +76,5 @@ public class LocationStatus extends AutoSafeParcelable {
} }
} }
public static final Creator<LocationStatus> CREATOR = new AutoCreator<>(LocationStatus.class); public static final Creator<LocationStatus> CREATOR = new AutoCreator<LocationStatus>(LocationStatus.class);
} }

View File

@ -7,6 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
*/ */
public class LocationRequestInternal extends AutoSafeParcelable { public class LocationRequestInternal extends AutoSafeParcelable {
public static final Creator<LocationRequestInternal> CREATOR = new AutoCreator<>( public static final Creator<LocationRequestInternal> CREATOR = new AutoCreator<LocationRequestInternal>(LocationRequestInternal.class);
LocationRequestInternal.class);
} }

View File

@ -15,6 +15,5 @@ public class AutocompleteFilter extends AutoSafeParcelable {
this.versionCode = 1; this.versionCode = 1;
} }
public static final Creator<AutocompleteFilter> CREATOR = new AutoCreator<>( public static final Creator<AutocompleteFilter> CREATOR = new AutoCreator<AutocompleteFilter>(AutocompleteFilter.class);
AutocompleteFilter.class);
} }

View File

@ -7,6 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
*/ */
public class NearbyAlertRequest extends AutoSafeParcelable { public class NearbyAlertRequest extends AutoSafeParcelable {
public static final Creator<NearbyAlertRequest> CREATOR = new AutoCreator<>( public static final Creator<NearbyAlertRequest> CREATOR = new AutoCreator<NearbyAlertRequest>(NearbyAlertRequest.class);
NearbyAlertRequest.class);
} }

View File

@ -7,5 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
*/ */
public class PlaceFilter extends AutoSafeParcelable { public class PlaceFilter extends AutoSafeParcelable {
public static final Creator<PlaceFilter> CREATOR = new AutoCreator<>(PlaceFilter.class); public static final Creator<PlaceFilter> CREATOR = new AutoCreator<PlaceFilter>(PlaceFilter.class);
} }

View File

@ -6,5 +6,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
* TODO: usage * TODO: usage
*/ */
public class PlaceReport extends AutoSafeParcelable { public class PlaceReport extends AutoSafeParcelable {
public static final Creator<PlaceReport> CREATOR = new AutoCreator<>(PlaceReport.class); public static final Creator<PlaceReport> CREATOR = new AutoCreator<PlaceReport>(PlaceReport.class);
} }

View File

@ -6,5 +6,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
* TODO: usage * TODO: usage
*/ */
public class PlaceRequest extends AutoSafeParcelable { public class PlaceRequest extends AutoSafeParcelable {
public static final Creator<PlaceRequest> CREATOR = new AutoCreator<>(PlaceRequest.class); public static final Creator<PlaceRequest> CREATOR = new AutoCreator<PlaceRequest>(PlaceRequest.class);
} }

View File

@ -15,5 +15,5 @@ public class UserAddedPlace extends AutoSafeParcelable {
versionCode = 1; versionCode = 1;
} }
public static final Creator<UserAddedPlace> CREATOR = new AutoCreator<>(UserAddedPlace.class); public static final Creator<UserAddedPlace> CREATOR = new AutoCreator<UserAddedPlace>(UserAddedPlace.class);
} }

View File

@ -7,5 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
*/ */
public class UserDataType extends AutoSafeParcelable { public class UserDataType extends AutoSafeParcelable {
public static final Creator<UserDataType> CREATOR = new AutoCreator<>(UserDataType.class); public static final Creator<UserDataType> CREATOR = new AutoCreator<UserDataType>(UserDataType.class);
} }

View File

@ -21,5 +21,5 @@ public class PlacesParams extends AutoSafeParcelable {
clientPackageName = locale = accountName = gCoreClientName = null; clientPackageName = locale = accountName = gCoreClientName = null;
} }
public static final Creator<PlacesParams> CREATOR = new AutoCreator<>(PlacesParams.class); public static final Creator<PlacesParams> CREATOR = new AutoCreator<PlacesParams>(PlacesParams.class);
} }

View File

@ -37,5 +37,5 @@ public class ReportingState extends AutoSafeParcelable {
@SafeParceled(8) @SafeParceled(8)
public Integer deviceTag; public Integer deviceTag;
public static final Creator<ReportingState> CREATOR = new AutoCreator<>(ReportingState.class); public static final Creator<ReportingState> CREATOR = new AutoCreator<ReportingState>(ReportingState.class);
} }

View File

@ -79,5 +79,5 @@ public final class GoogleMapOptions extends AutoSafeParcelable {
return rotateGesturesEnabled; return rotateGesturesEnabled;
} }
public static Creator<GoogleMapOptions> CREATOR = new AutoCreator<>(GoogleMapOptions.class); public static Creator<GoogleMapOptions> CREATOR = new AutoCreator<GoogleMapOptions>(GoogleMapOptions.class);
} }

View File

@ -170,7 +170,7 @@ public final class CameraPosition extends AutoSafeParcelable {
'}'; '}';
} }
public static Creator<CameraPosition> CREATOR = new AutoCreator<>(CameraPosition.class); public static Creator<CameraPosition> CREATOR = new AutoCreator<CameraPosition>(CameraPosition.class);
/** /**
* Builds camera position. * Builds camera position.

View File

@ -217,5 +217,5 @@ public class CircleOptions extends AutoSafeParcelable {
return this; return this;
} }
public static Creator<CircleOptions> CREATOR = new AutoCreator<>(CircleOptions.class); public static Creator<CircleOptions> CREATOR = new AutoCreator<CircleOptions>(CircleOptions.class);
} }

View File

@ -17,6 +17,7 @@
package com.google.android.gms.maps.model; package com.google.android.gms.maps.model;
import android.os.IBinder; import android.os.IBinder;
import com.google.android.gms.dynamic.ObjectWrapper; import com.google.android.gms.dynamic.ObjectWrapper;
import org.microg.gms.common.PublicApi; import org.microg.gms.common.PublicApi;
@ -336,6 +337,5 @@ public class GroundOverlayOptions extends AutoSafeParcelable {
return this; return this;
} }
public static Creator<GroundOverlayOptions> CREATOR = new AutoCreator<>( public static Creator<GroundOverlayOptions> CREATOR = new AutoCreator<GroundOverlayOptions>(GroundOverlayOptions.class);
GroundOverlayOptions.class);
} }

View File

@ -102,5 +102,5 @@ public final class LatLng extends AutoSafeParcelable {
return "lat/lng: (" + latitude + "," + longitude + ")"; return "lat/lng: (" + latitude + "," + longitude + ")";
} }
public static Creator<LatLng> CREATOR = new AutoCreator<>(LatLng.class); public static Creator<LatLng> CREATOR = new AutoCreator<LatLng>(LatLng.class);
} }

View File

@ -180,7 +180,7 @@ public final class LatLngBounds extends AutoSafeParcelable {
'}'; '}';
} }
public static Creator<LatLngBounds> CREATOR = new AutoCreator<>(LatLngBounds.class); public static Creator<LatLngBounds> CREATOR = new AutoCreator<LatLngBounds>(LatLngBounds.class);
/** /**
* This is a builder that is able to create a minimum bound based on a set of LatLng points. * This is a builder that is able to create a minimum bound based on a set of LatLng points.

View File

@ -326,5 +326,5 @@ public class MarkerOptions extends AutoSafeParcelable {
return this; return this;
} }
public static Creator<MarkerOptions> CREATOR = new AutoCreator<>(MarkerOptions.class); public static Creator<MarkerOptions> CREATOR = new AutoCreator<MarkerOptions>(MarkerOptions.class);
} }

View File

@ -28,5 +28,5 @@ public class PolygonOptions extends AutoSafeParcelable {
public PolygonOptions() { public PolygonOptions() {
} }
public static Creator<PolygonOptions> CREATOR = new AutoCreator<>(PolygonOptions.class); public static Creator<PolygonOptions> CREATOR = new AutoCreator<PolygonOptions>(PolygonOptions.class);
} }

View File

@ -41,5 +41,5 @@ public class PolylineOptions extends AutoSafeParcelable {
public PolylineOptions() { public PolylineOptions() {
} }
public static Creator<PolylineOptions> CREATOR = new AutoCreator<>(PolylineOptions.class); public static Creator<PolylineOptions> CREATOR = new AutoCreator<PolylineOptions>(PolylineOptions.class);
} }

View File

@ -51,5 +51,5 @@ public class Tile extends AutoSafeParcelable {
this.data = data; this.data = data;
} }
public static Creator<Tile> CREATOR = new AutoCreator<>(Tile.class); public static Creator<Tile> CREATOR = new AutoCreator<Tile>(Tile.class);
} }

View File

@ -137,5 +137,5 @@ public class TileOverlayOptions extends AutoSafeParcelable {
return this; return this;
} }
public static Creator<TileOverlayOptions> CREATOR = new AutoCreator<>(TileOverlayOptions.class); public static Creator<TileOverlayOptions> CREATOR = new AutoCreator<TileOverlayOptions>(TileOverlayOptions.class);
} }

View File

@ -63,5 +63,5 @@ public class VisibleRegion extends AutoSafeParcelable {
bounds); bounds);
} }
public static Creator<VisibleRegion> CREATOR = new AutoCreator<>(VisibleRegion.class); public static Creator<VisibleRegion> CREATOR = new AutoCreator<VisibleRegion>(VisibleRegion.class);
} }

View File

@ -24,5 +24,5 @@ public class AccountMetadata extends AutoSafeParcelable {
@SafeParceled(1) @SafeParceled(1)
private int versionCode = 2; private int versionCode = 2;
public static Creator<AccountMetadata> CREATOR = new AutoCreator<>(AccountMetadata.class); public static Creator<AccountMetadata> CREATOR = new AutoCreator<AccountMetadata>(AccountMetadata.class);
} }

View File

@ -51,5 +51,5 @@ public class LogEvent extends AutoSafeParcelable {
'}'; '}';
} }
public static Creator<LogEvent> CREATOR = new AutoCreator<>(LogEvent.class); public static Creator<LogEvent> CREATOR = new AutoCreator<LogEvent>(LogEvent.class);
} }

View File

@ -71,5 +71,5 @@ public class PlayLoggerContext extends AutoSafeParcelable {
'}'; '}';
} }
public static Creator<PlayLoggerContext> CREATOR = new AutoCreator<>(PlayLoggerContext.class); public static Creator<PlayLoggerContext> CREATOR = new AutoCreator<PlayLoggerContext>(PlayLoggerContext.class);
} }

View File

@ -85,5 +85,5 @@ public class Asset extends AutoSafeParcelable {
return null; return null;
} }
public static final Creator<Asset> CREATOR = new AutoCreator<>(Asset.class); public static final Creator<Asset> CREATOR = new AutoCreator<Asset>(Asset.class);
} }

View File

@ -96,5 +96,5 @@ public class PutDataRequest extends AutoSafeParcelable {
return "PutDataRequest{data=" + dataItem + "}"; return "PutDataRequest{data=" + dataItem + "}";
} }
public static final Creator<PutDataRequest> CREATOR = new AutoCreator<>(PutDataRequest.class); public static final Creator<PutDataRequest> CREATOR = new AutoCreator<PutDataRequest>(PutDataRequest.class);
} }

View File

@ -77,5 +77,5 @@ public class NodeParcelable extends AutoSafeParcelable implements Node {
return "NodeParcelable{" + id + "," + displayName + "}"; return "NodeParcelable{" + id + "," + displayName + "}";
} }
public static final Creator<NodeParcelable> CREATOR = new AutoCreator<>(NodeParcelable.class); public static final Creator<NodeParcelable> CREATOR = new AutoCreator<NodeParcelable>(NodeParcelable.class);
} }