From deb757edfb0684f41ccc493b7c35a98878571a56 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Mon, 13 Apr 2015 23:52:26 +0200
Subject: [PATCH] Java 6 compat

---
 extern/SafeParcel                                             | 2 +-
 play-services-api/build.gradle                                | 3 +++
 .../com/google/android/gms/appdatasearch/CorpusStatus.java    | 2 +-
 .../java/com/google/android/gms/appdatasearch/PIMEUpdate.java | 2 +-
 .../google/android/gms/appdatasearch/PIMEUpdateResponse.java  | 2 +-
 .../gms/appdatasearch/RequestIndexingSpecification.java       | 2 +-
 .../android/gms/appdatasearch/SuggestSpecification.java       | 2 +-
 .../google/android/gms/appdatasearch/SuggestionResults.java   | 2 +-
 .../java/com/google/android/gms/appdatasearch/UsageInfo.java  | 2 +-
 .../java/com/google/android/gms/auth/AccountChangeEvent.java  | 2 +-
 .../google/android/gms/auth/AccountChangeEventsRequest.java   | 2 +-
 .../google/android/gms/auth/AccountChangeEventsResponse.java  | 4 ++--
 .../java/com/google/android/gms/common/api/AccountInfo.java   | 2 +-
 .../main/java/com/google/android/gms/common/api/Scope.java    | 2 +-
 .../main/java/com/google/android/gms/common/api/Status.java   | 2 +-
 .../java/com/google/android/gms/common/data/DataHolder.java   | 4 ++--
 .../google/android/gms/common/internal/GetServiceRequest.java | 2 +-
 .../android/gms/common/internal/ValidateAccountRequest.java   | 2 +-
 .../android/gms/common/server/FavaDiagnosticsEntity.java      | 2 +-
 .../main/java/com/google/android/gms/location/Geofence.java   | 2 +-
 .../com/google/android/gms/location/GeofencingRequest.java    | 3 +--
 .../java/com/google/android/gms/location/LocationRequest.java | 2 +-
 .../java/com/google/android/gms/location/LocationStatus.java  | 2 +-
 .../gms/location/internal/LocationRequestInternal.java        | 3 +--
 .../android/gms/location/places/AutocompleteFilter.java       | 3 +--
 .../android/gms/location/places/NearbyAlertRequest.java       | 3 +--
 .../com/google/android/gms/location/places/PlaceFilter.java   | 2 +-
 .../com/google/android/gms/location/places/PlaceReport.java   | 2 +-
 .../com/google/android/gms/location/places/PlaceRequest.java  | 2 +-
 .../google/android/gms/location/places/UserAddedPlace.java    | 2 +-
 .../com/google/android/gms/location/places/UserDataType.java  | 2 +-
 .../android/gms/location/places/internal/PlacesParams.java    | 2 +-
 .../google/android/gms/location/reporting/ReportingState.java | 2 +-
 .../java/com/google/android/gms/maps/GoogleMapOptions.java    | 2 +-
 .../com/google/android/gms/maps/model/CameraPosition.java     | 2 +-
 .../java/com/google/android/gms/maps/model/CircleOptions.java | 2 +-
 .../google/android/gms/maps/model/GroundOverlayOptions.java   | 4 ++--
 .../main/java/com/google/android/gms/maps/model/LatLng.java   | 2 +-
 .../java/com/google/android/gms/maps/model/LatLngBounds.java  | 2 +-
 .../java/com/google/android/gms/maps/model/MarkerOptions.java | 2 +-
 .../com/google/android/gms/maps/model/PolygonOptions.java     | 2 +-
 .../com/google/android/gms/maps/model/PolylineOptions.java    | 2 +-
 .../src/main/java/com/google/android/gms/maps/model/Tile.java | 2 +-
 .../com/google/android/gms/maps/model/TileOverlayOptions.java | 2 +-
 .../java/com/google/android/gms/maps/model/VisibleRegion.java | 2 +-
 .../com/google/android/gms/people/model/AccountMetadata.java  | 2 +-
 .../com/google/android/gms/playlog/internal/LogEvent.java     | 2 +-
 .../android/gms/playlog/internal/PlayLoggerContext.java       | 2 +-
 .../src/main/java/com/google/android/gms/wearable/Asset.java  | 2 +-
 .../java/com/google/android/gms/wearable/PutDataRequest.java  | 2 +-
 .../google/android/gms/wearable/internal/NodeParcelable.java  | 2 +-
 51 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/extern/SafeParcel b/extern/SafeParcel
index 26d9c42..d7b18b0 160000
--- a/extern/SafeParcel
+++ b/extern/SafeParcel
@@ -1 +1 @@
-Subproject commit 26d9c429770c37ad3e087d4469c4d4b3042e4f25
+Subproject commit d7b18b06734e4109bc3131345a26aa261d369605
diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
index 1013422..909d7a6 100644
--- a/play-services-api/build.gradle
+++ b/play-services-api/build.gradle
@@ -20,4 +20,7 @@ dependencies {
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.0"
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_6
+    }
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java
index 99a4fd6..b90a3f5 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java
@@ -38,5 +38,5 @@ public class CorpusStatus extends AutoSafeParcelable {
     @SafeParceled(6)
     public String g;
 
-    public static final Creator<CorpusStatus> CREATOR = new AutoCreator<>(CorpusStatus.class);
+    public static final Creator<CorpusStatus> CREATOR = new AutoCreator<CorpusStatus>(CorpusStatus.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java
index c78564b..d42634b 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java
@@ -20,5 +20,5 @@ import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java
index 82fc250..4d34120 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java
@@ -37,5 +37,5 @@ public class PIMEUpdateResponse extends AutoSafeParcelable {
         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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java
index 05bf1b8..ca32c01 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java
@@ -24,5 +24,5 @@ public class RequestIndexingSpecification extends AutoSafeParcelable {
     @SafeParceled(1000)
     private int versionCode;
 
-    public static final Creator<RequestIndexingSpecification> CREATOR = new AutoCreator<>(RequestIndexingSpecification.class);
+    public static final Creator<RequestIndexingSpecification> CREATOR = new AutoCreator<RequestIndexingSpecification>(RequestIndexingSpecification.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java
index e843328..d45adde 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java
@@ -23,5 +23,5 @@ public class SuggestSpecification extends AutoSafeParcelable {
     @SafeParceled(1000)
     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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java
index 8381855..e6f9476 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java
@@ -47,5 +47,5 @@ public class SuggestionResults extends AutoSafeParcelable {
         this.s2 = s2;
     }
 
-    public static final Creator<SuggestionResults> CREATOR = new AutoCreator<>(SuggestionResults.class);
+    public static final Creator<SuggestionResults> CREATOR = new AutoCreator<SuggestionResults>(SuggestionResults.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java
index 47e1239..adb7e2b 100644
--- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java
+++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java
@@ -20,5 +20,5 @@ import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java
index cfa8412..b7b5269 100644
--- a/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java
+++ b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java
@@ -3,5 +3,5 @@ package com.google.android.gms.auth;
 import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java
index 940301d..1ce15b3 100644
--- a/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java
@@ -32,6 +32,6 @@ public class AccountChangeEventsRequest extends AutoSafeParcelable {
         versionCode = 1;
     }
 
-    public static Creator<AccountChangeEventsRequest> CREATOR = new AutoCreator<>(AccountChangeEventsRequest.class);
+    public static Creator<AccountChangeEventsRequest> CREATOR = new AutoCreator<AccountChangeEventsRequest>(AccountChangeEventsRequest.class);
 
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java
index a319e62..fa37e5c 100644
--- a/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java
+++ b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java
@@ -30,8 +30,8 @@ public class AccountChangeEventsResponse extends AutoSafeParcelable {
 
     public AccountChangeEventsResponse() {
         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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java b/play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java
index e482b9f..ad7e899 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java
@@ -3,5 +3,5 @@ package com.google.android.gms.common.api;
 import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java b/play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java
index 47c0529..2226936 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java
@@ -47,5 +47,5 @@ public class Scope extends AutoSafeParcelable {
         return scopeUri;
     }
 
-    public static final Creator<Scope> CREATOR = new AutoCreator<>(Scope.class);
+    public static final Creator<Scope> CREATOR = new AutoCreator<Scope>(Scope.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/Status.java b/play-services-api/src/main/java/com/google/android/gms/common/api/Status.java
index 52e2cf7..49b637a 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/api/Status.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/api/Status.java
@@ -79,5 +79,5 @@ public final class Status extends AutoSafeParcelable implements Result {
         return this;
     }
 
-    public static final Creator<Status> CREATOR = new AutoCreator<>(Status.class);
+    public static final Creator<Status> CREATOR = new AutoCreator<Status>(Status.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java b/play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java
index 91bfbd6..e3bc9c1 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java
@@ -83,7 +83,7 @@ public class DataHolder extends AutoSafeParcelable {
     }
 
     public static DataHolder fromCursor(Cursor cursor, int statusCode, Bundle metadata) {
-        List<CursorWindow> windows = new ArrayList<>();
+        List<CursorWindow> windows = new ArrayList<CursorWindow>();
         CursorWindow cursorWindow = null;
         int row = 0;
         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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
index 2966070..69641a1 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java
@@ -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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java b/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java
index 0c93abb..88587e7 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java
@@ -19,5 +19,5 @@ package com.google.android.gms.common.internal;
 import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java b/play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java
index 6183e2f..b63d8f7 100644
--- a/play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java
+++ b/play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java
@@ -20,5 +20,5 @@ import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/Geofence.java b/play-services-api/src/main/java/com/google/android/gms/location/Geofence.java
index c47a90d..5b02f83 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/Geofence.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/Geofence.java
@@ -20,5 +20,5 @@ import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java
index a36d29e..73f955d 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java
@@ -7,6 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
  */
 public class GeofencingRequest extends AutoSafeParcelable {
 
-    public static final Creator<GeofencingRequest> CREATOR = new AutoCreator<>(
-            GeofencingRequest.class);
+    public static final Creator<GeofencingRequest> CREATOR = new AutoCreator<GeofencingRequest>(GeofencingRequest.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java
index a5369fd..52253aa 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java
@@ -412,5 +412,5 @@ public class LocationRequest extends AutoSafeParcelable {
         return super.toString();
     }
 
-    public static final Creator<LocationRequest> CREATOR = new AutoCreator<>(LocationRequest.class);
+    public static final Creator<LocationRequest> CREATOR = new AutoCreator<LocationRequest>(LocationRequest.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java b/play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java
index e60c531..ad57850 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java
@@ -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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java b/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
index 3ab5568..6bd6108 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java
@@ -7,6 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
  */
 public class LocationRequestInternal extends AutoSafeParcelable {
 
-    public static final Creator<LocationRequestInternal> CREATOR = new AutoCreator<>(
-            LocationRequestInternal.class);
+    public static final Creator<LocationRequestInternal> CREATOR = new AutoCreator<LocationRequestInternal>(LocationRequestInternal.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java b/play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java
index 23ffa4d..8870ca7 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java
@@ -15,6 +15,5 @@ public class AutocompleteFilter extends AutoSafeParcelable {
         this.versionCode = 1;
     }
 
-    public static final Creator<AutocompleteFilter> CREATOR = new AutoCreator<>(
-            AutocompleteFilter.class);
+    public static final Creator<AutocompleteFilter> CREATOR = new AutoCreator<AutocompleteFilter>(AutocompleteFilter.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java
index 94c415a..add70cc 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java
@@ -7,6 +7,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
  */
 public class NearbyAlertRequest extends AutoSafeParcelable {
 
-    public static final Creator<NearbyAlertRequest> CREATOR = new AutoCreator<>(
-            NearbyAlertRequest.class);
+    public static final Creator<NearbyAlertRequest> CREATOR = new AutoCreator<NearbyAlertRequest>(NearbyAlertRequest.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java
index 2bbc41f..57bebb5 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java
@@ -7,5 +7,5 @@ import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java
index 38d3900..eaef07e 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java
@@ -6,5 +6,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
  * TODO: usage
  */
 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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java
index ad46244..6817f7d 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java
@@ -6,5 +6,5 @@ import org.microg.safeparcel.AutoSafeParcelable;
  * TODO: usage
  */
 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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java b/play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java
index 534dac3..eea28f6 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java
@@ -15,5 +15,5 @@ public class UserAddedPlace extends AutoSafeParcelable {
         versionCode = 1;
     }
 
-    public static final Creator<UserAddedPlace> CREATOR = new AutoCreator<>(UserAddedPlace.class);
+    public static final Creator<UserAddedPlace> CREATOR = new AutoCreator<UserAddedPlace>(UserAddedPlace.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java b/play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java
index 7ac8579..cb253f6 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java
@@ -7,5 +7,5 @@ import org.microg.safeparcel.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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java b/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java
index ad739c4..74642be 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java
@@ -21,5 +21,5 @@ public class PlacesParams extends AutoSafeParcelable {
         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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java b/play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java
index b99bde5..f30b7c1 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java
@@ -37,5 +37,5 @@ public class ReportingState extends AutoSafeParcelable {
     @SafeParceled(8)
     public Integer deviceTag;
 
-    public static final Creator<ReportingState> CREATOR = new AutoCreator<>(ReportingState.class);
+    public static final Creator<ReportingState> CREATOR = new AutoCreator<ReportingState>(ReportingState.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java
index 19e62bb..e752175 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java
@@ -79,5 +79,5 @@ public final class GoogleMapOptions extends AutoSafeParcelable {
         return rotateGesturesEnabled;
     }
 
-    public static Creator<GoogleMapOptions> CREATOR = new AutoCreator<>(GoogleMapOptions.class);
+    public static Creator<GoogleMapOptions> CREATOR = new AutoCreator<GoogleMapOptions>(GoogleMapOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/CameraPosition.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/CameraPosition.java
index 86c2b25..717a7bd 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/CameraPosition.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/CameraPosition.java
@@ -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.
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java
index 0629d6f..4f52885 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java
@@ -217,5 +217,5 @@ public class CircleOptions extends AutoSafeParcelable {
         return this;
     }
 
-    public static Creator<CircleOptions> CREATOR = new AutoCreator<>(CircleOptions.class);
+    public static Creator<CircleOptions> CREATOR = new AutoCreator<CircleOptions>(CircleOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java
index 191afda..920c43a 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java
@@ -17,6 +17,7 @@
 package com.google.android.gms.maps.model;
 
 import android.os.IBinder;
+
 import com.google.android.gms.dynamic.ObjectWrapper;
 
 import org.microg.gms.common.PublicApi;
@@ -336,6 +337,5 @@ public class GroundOverlayOptions extends AutoSafeParcelable {
         return this;
     }
 
-    public static Creator<GroundOverlayOptions> CREATOR = new AutoCreator<>(
-            GroundOverlayOptions.class);
+    public static Creator<GroundOverlayOptions> CREATOR = new AutoCreator<GroundOverlayOptions>(GroundOverlayOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java
index 356e04d..ac434bc 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java
@@ -102,5 +102,5 @@ public final class LatLng extends AutoSafeParcelable {
         return "lat/lng: (" + latitude + "," + longitude + ")";
     }
     
-    public static Creator<LatLng> CREATOR = new AutoCreator<>(LatLng.class);
+    public static Creator<LatLng> CREATOR = new AutoCreator<LatLng>(LatLng.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java
index eae9cb2..371505f 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java
@@ -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.
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java
index bb28936..79a49d8 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java
@@ -326,5 +326,5 @@ public class MarkerOptions extends AutoSafeParcelable {
         return this;
     }
 
-    public static Creator<MarkerOptions> CREATOR = new AutoCreator<>(MarkerOptions.class);
+    public static Creator<MarkerOptions> CREATOR = new AutoCreator<MarkerOptions>(MarkerOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java
index 0b5aaa5..252a360 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java
@@ -28,5 +28,5 @@ public class PolygonOptions extends AutoSafeParcelable {
     public PolygonOptions() {
     }
 
-    public static Creator<PolygonOptions> CREATOR = new AutoCreator<>(PolygonOptions.class);
+    public static Creator<PolygonOptions> CREATOR = new AutoCreator<PolygonOptions>(PolygonOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java
index ce34b34..f6e30a7 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java
@@ -41,5 +41,5 @@ public class PolylineOptions extends AutoSafeParcelable {
     public PolylineOptions() {
     }
 
-    public static Creator<PolylineOptions> CREATOR = new AutoCreator<>(PolylineOptions.class);
+    public static Creator<PolylineOptions> CREATOR = new AutoCreator<PolylineOptions>(PolylineOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/Tile.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/Tile.java
index cf6f437..aa3b501 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/Tile.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/Tile.java
@@ -51,5 +51,5 @@ public class Tile extends AutoSafeParcelable {
         this.data = data;
     }
 
-    public static Creator<Tile> CREATOR = new AutoCreator<>(Tile.class);
+    public static Creator<Tile> CREATOR = new AutoCreator<Tile>(Tile.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java
index 7f2df33..68fdaad 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java
@@ -137,5 +137,5 @@ public class TileOverlayOptions extends AutoSafeParcelable {
         return this;
     }
 
-    public static Creator<TileOverlayOptions> CREATOR = new AutoCreator<>(TileOverlayOptions.class);
+    public static Creator<TileOverlayOptions> CREATOR = new AutoCreator<TileOverlayOptions>(TileOverlayOptions.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java
index ab0e20b..105c108 100644
--- a/play-services-api/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java
+++ b/play-services-api/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java
@@ -63,5 +63,5 @@ public class VisibleRegion extends AutoSafeParcelable {
                 bounds);
     }
 
-    public static Creator<VisibleRegion> CREATOR = new AutoCreator<>(VisibleRegion.class);
+    public static Creator<VisibleRegion> CREATOR = new AutoCreator<VisibleRegion>(VisibleRegion.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java b/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
index 943aac8..f62e3eb 100644
--- a/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
+++ b/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
@@ -24,5 +24,5 @@ public class AccountMetadata extends AutoSafeParcelable {
     @SafeParceled(1)
     private int versionCode = 2;
 
-    public static Creator<AccountMetadata> CREATOR = new AutoCreator<>(AccountMetadata.class);
+    public static Creator<AccountMetadata> CREATOR = new AutoCreator<AccountMetadata>(AccountMetadata.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/playlog/internal/LogEvent.java b/play-services-api/src/main/java/com/google/android/gms/playlog/internal/LogEvent.java
index 94f066b..3dc6b6e 100644
--- a/play-services-api/src/main/java/com/google/android/gms/playlog/internal/LogEvent.java
+++ b/play-services-api/src/main/java/com/google/android/gms/playlog/internal/LogEvent.java
@@ -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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/playlog/internal/PlayLoggerContext.java b/play-services-api/src/main/java/com/google/android/gms/playlog/internal/PlayLoggerContext.java
index 3dcd4f9..f35bf75 100644
--- a/play-services-api/src/main/java/com/google/android/gms/playlog/internal/PlayLoggerContext.java
+++ b/play-services-api/src/main/java/com/google/android/gms/playlog/internal/PlayLoggerContext.java
@@ -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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/Asset.java b/play-services-api/src/main/java/com/google/android/gms/wearable/Asset.java
index 6967fbd..0fa11be 100644
--- a/play-services-api/src/main/java/com/google/android/gms/wearable/Asset.java
+++ b/play-services-api/src/main/java/com/google/android/gms/wearable/Asset.java
@@ -85,5 +85,5 @@ public class Asset extends AutoSafeParcelable {
         return null;
     }
 
-    public static final Creator<Asset> CREATOR = new AutoCreator<>(Asset.class);
+    public static final Creator<Asset> CREATOR = new AutoCreator<Asset>(Asset.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataRequest.java b/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataRequest.java
index 8d049eb..8b8503d 100644
--- a/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataRequest.java
+++ b/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataRequest.java
@@ -96,5 +96,5 @@ public class PutDataRequest extends AutoSafeParcelable {
         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);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java
index d673c1b..6bdbce7 100644
--- a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java
+++ b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java
@@ -77,5 +77,5 @@ public class NodeParcelable extends AutoSafeParcelable implements Node {
         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);
 }