diff --git a/extern/SafeParcel b/extern/SafeParcel index cfbcc9db..ef1568e2 160000 --- a/extern/SafeParcel +++ b/extern/SafeParcel @@ -1 +1 @@ -Subproject commit cfbcc9db09d98a2d32e996f5ff9fe587aa9f21f4 +Subproject commit ef1568e2614f29c3f13a6b6536989aba7f1a1b5d diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl new file mode 100644 index 00000000..701f99a9 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.common.api; + +parcelable Status; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/AddListenerRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/AddListenerRequest.aidl new file mode 100644 index 00000000..bb1726dd --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/AddListenerRequest.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable AddListenerRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl new file mode 100644 index 00000000..973008ad --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable ConnectionConfiguration; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/DeleteDataItemsResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/DeleteDataItemsResponse.aidl new file mode 100644 index 00000000..87691545 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/DeleteDataItemsResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable DeleteDataItemsResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConfigResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConfigResponse.aidl new file mode 100644 index 00000000..611e1443 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConfigResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable GetConfigResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConfigsResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConfigsResponse.aidl new file mode 100644 index 00000000..21f56aab --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConfigsResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable GetConfigsResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConnectedNodesResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConnectedNodesResponse.aidl new file mode 100644 index 00000000..8068de2a --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetConnectedNodesResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable GetConnectedNodesResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetDataItemResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetDataItemResponse.aidl new file mode 100644 index 00000000..1c22d749 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetDataItemResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable GetDataItemResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetFdForAssetResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetFdForAssetResponse.aidl new file mode 100644 index 00000000..d12974ff --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetFdForAssetResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable GetFdForAssetResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetLocalNodeResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetLocalNodeResponse.aidl new file mode 100644 index 00000000..da6b6ae3 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/GetLocalNodeResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable GetLocalNodeResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/PutDataRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/PutDataRequest.aidl new file mode 100644 index 00000000..5714b4cf --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/PutDataRequest.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable PutDataRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/PutDataResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/PutDataResponse.aidl new file mode 100644 index 00000000..4f0723f5 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/PutDataResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable PutDataResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/RemoveListenerRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/RemoveListenerRequest.aidl new file mode 100644 index 00000000..4e5f7d98 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/RemoveListenerRequest.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable RemoveListenerRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/SendMessageResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/SendMessageResponse.aidl new file mode 100644 index 00000000..296f5439 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/SendMessageResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable SendMessageResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/StorageInfoResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/StorageInfoResponse.aidl new file mode 100644 index 00000000..66ce05ac --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/StorageInfoResponse.aidl @@ -0,0 +1,3 @@ +package com.google.android.gms.wearable; + +parcelable StorageInfoResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl new file mode 100644 index 00000000..410fd09a --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl @@ -0,0 +1,29 @@ +package com.google.android.gms.wearable.internal; + +import com.google.android.gms.common.api.Status; +import com.google.android.gms.common.data.DataHolder; +import com.google.android.gms.wearable.DeleteDataItemsResponse; +import com.google.android.gms.wearable.GetConfigResponse; +import com.google.android.gms.wearable.GetConfigsResponse; +import com.google.android.gms.wearable.GetConnectedNodesResponse; +import com.google.android.gms.wearable.GetDataItemResponse; +import com.google.android.gms.wearable.GetFdForAssetResponse; +import com.google.android.gms.wearable.GetLocalNodeResponse; +import com.google.android.gms.wearable.PutDataResponse; +import com.google.android.gms.wearable.SendMessageResponse; +import com.google.android.gms.wearable.StorageInfoResponse; + +interface IWearableCallbacks { + void onGetConfigResponse(in GetConfigResponse response) = 1; + void onPutDataResponse(in PutDataResponse response) = 2; + void onGetDataItemResponse(in GetDataItemResponse response) = 3; + void onDataHolder(in DataHolder dataHolder) = 4; + void onDeleteDataItemsResponse(in DeleteDataItemsResponse response) = 5; + void onSendMessageResponse(in SendMessageResponse response) = 6; + void onGetFdForAssetResponse(in GetFdForAssetResponse response) = 7; + void onGetLocalNodeResponse(in GetLocalNodeResponse response) = 8; + void onGetConnectedNodesResponse(in GetConnectedNodesResponse response) = 9; + void onStatus(in Status status) = 10; + void onStorageInfoResponse(in StorageInfoResponse response) = 11; + void onGetConfigsResponse(in GetConfigsResponse response) = 12; +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl new file mode 100644 index 00000000..1c2eb92b --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl @@ -0,0 +1,5 @@ +package com.google.android.gms.wearable.internal; + +interface IWearableListener { + +} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl new file mode 100644 index 00000000..3bf532c0 --- /dev/null +++ b/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl @@ -0,0 +1,23 @@ +package com.google.android.gms.wearable.internal; + +import com.google.android.gms.wearable.AddListenerRequest; +import com.google.android.gms.wearable.ConnectionConfiguration; +import com.google.android.gms.wearable.PutDataRequest; +import com.google.android.gms.wearable.RemoveListenerRequest; +import com.google.android.gms.wearable.internal.IWearableCallbacks; +import com.google.android.gms.wearable.internal.IWearableService; + +interface IWearableService { + void getConfig(IWearableCallbacks callbacks) = 2; + void putData(IWearableCallbacks callbacks, in PutDataRequest request) = 5; + void getDataItem(IWearableCallbacks callbacks, in Uri uri) = 6; + void getDataItems(IWearableCallbacks callbacks) = 7; + void getLocalNode(IWearableCallbacks callbacks) = 13; + void getConnectedNodes(IWearableCallbacks callbacks) = 14; + void addListener(IWearableCallbacks callbacks, in AddListenerRequest request) = 15; + void removeListener(IWearableCallbacks callbacks, in RemoveListenerRequest request) = 16; + void putConfig(IWearableCallbacks callbacks, in ConnectionConfiguration config) = 19; + void getConfigs(IWearableCallbacks callbacks) = 21; + void getDataItemsByUri(IWearableCallbacks callbacks, in Uri uri, int i) = 39; + void deleteDataItems(IWearableCallbacks callbacks, in Uri uri) = 40; +} 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 b90a3f59..59208421 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 @@ -24,7 +24,7 @@ import org.microg.safeparcel.SafeParceled; public class CorpusStatus extends AutoSafeParcelable { @SafeParceled(1000) - private int versionCode = 2; + private int versionCode; @SafeParceled(1) public boolean found; @SafeParceled(2) @@ -38,5 +38,9 @@ public class CorpusStatus extends AutoSafeParcelable { @SafeParceled(6) public String g; + public CorpusStatus() { + versionCode = 2; + } + public static final Creator CREATOR = new AutoCreator(CorpusStatus.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 4d34120f..f82c8656 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 @@ -21,7 +21,7 @@ import org.microg.safeparcel.SafeParceled; public class PIMEUpdateResponse extends AutoSafeParcelable { @SafeParceled(1000) - private int versionCode = 1; + private int versionCode; @SafeParceled(1) private String b; @@ -33,6 +33,7 @@ public class PIMEUpdateResponse extends AutoSafeParcelable { public final PIMEUpdate[] updates; public PIMEUpdateResponse() { + versionCode = 1; this.bytes = null; this.updates = new PIMEUpdate[0]; } diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java index 9a77eb06..b45e8744 100644 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java +++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java @@ -24,7 +24,7 @@ import java.util.List; public class QuerySpecification extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode; + private int versionCode = 2; @SafeParceled(1) public final boolean b; //@SafeParceled(value = 2, subType = "TODO") @@ -43,7 +43,6 @@ public class QuerySpecification extends AutoSafeParcelable { public final int i; private QuerySpecification() { - versionCode = 2; b = false; c = null; d = null; diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java index 59c7244b..6f3619a9 100644 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java +++ b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java @@ -21,7 +21,7 @@ import org.microg.safeparcel.SafeParceled; public class SearchResults extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode = 2; + private int versionCode = 2; public static Creator CREATOR = new AutoCreator(SearchResults.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 d45addee..0c224091 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 @@ -21,7 +21,11 @@ import org.microg.safeparcel.SafeParceled; public class SuggestSpecification extends AutoSafeParcelable { @SafeParceled(1000) - private int versionCode = 2; + private int versionCode; + + public SuggestSpecification() { + versionCode = 2; + } public static final Creator CREATOR = new AutoCreator(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 e6f9476b..8b51c8aa 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 @@ -21,7 +21,7 @@ import org.microg.safeparcel.SafeParceled; public class SuggestionResults extends AutoSafeParcelable { @SafeParceled(1000) - private int versionCode = 2; + private int versionCode; @SafeParceled(1) public final String errorMessage; @@ -31,17 +31,20 @@ public class SuggestionResults extends AutoSafeParcelable { public final String[] s2; private SuggestionResults() { + versionCode = 2; errorMessage = null; s1 = s2 = null; } public SuggestionResults(String errorMessage) { + versionCode = 2; this.errorMessage = errorMessage; this.s1 = null; this.s2 = null; } public SuggestionResults(String[] s1, String[] s2) { + versionCode = 2; this.errorMessage = null; this.s1 = s1; this.s2 = s2; 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 1ce15b38..323bd223 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 @@ -21,17 +21,12 @@ import org.microg.safeparcel.SafeParceled; public class AccountChangeEventsRequest extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; @SafeParceled(2) private int i; @SafeParceled(3) private String s; - - private AccountChangeEventsRequest() { - versionCode = 1; - } - public static Creator CREATOR = new AutoCreator(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 fa37e5c5..bc68a42c 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 @@ -24,12 +24,11 @@ import java.util.List; public class AccountChangeEventsResponse extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; @SafeParceled(value = 2, subType = "com.google.android.gms.auth.AccountChangeEvent") private List events; public AccountChangeEventsResponse() { - versionCode = 1; events = new ArrayList(); } 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 2226936b..5334f1e5 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 @@ -11,12 +11,11 @@ import org.microg.safeparcel.SafeParceled; @PublicApi public class Scope extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; @SafeParceled(2) private final String scopeUri; private Scope() { - versionCode = -1; scopeUri = null; } @@ -24,7 +23,6 @@ public class Scope extends AutoSafeParcelable { * Creates a new scope with the given URI. */ public Scope(String scopeUri) { - versionCode = 1; this.scopeUri = scopeUri; } 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 49b637a1..cb918f5b 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 @@ -19,13 +19,12 @@ public final class Status extends AutoSafeParcelable implements Result { public static final Status CANCELED = new Status(STATUS_CODE_CANCELED); public static final Status SUCCESS = new Status(0); - private final int versionCode; + private int versionCode = 1; private final int statusCode; private final String statusMessage; private final PendingIntent resolution; private Status() { - versionCode = 1; statusCode = 0; statusMessage = null; resolution = null; @@ -40,7 +39,6 @@ public final class Status extends AutoSafeParcelable implements Result { } public Status(int statusCode, String statusMessage, PendingIntent resolution) { - this.versionCode = 1; this.statusCode = statusCode; this.statusMessage = statusMessage; this.resolution = resolution; 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 69641a16..80bbc234 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 @@ -31,7 +31,7 @@ import java.util.Arrays; public class GetServiceRequest extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 2; @SafeParceled(2) public final int serviceId; @@ -55,13 +55,11 @@ public class GetServiceRequest extends AutoSafeParcelable { public Account account; private GetServiceRequest() { - versionCode = 2; serviceId = -1; gmsVersion = Constants.MAX_REFERENCE_VERSION; } public GetServiceRequest(int serviceId) { - this.versionCode = 2; this.serviceId = serviceId; this.gmsVersion = Constants.MAX_REFERENCE_VERSION; } 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 52253aad..b5249b3e 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 @@ -86,7 +86,7 @@ public class LocationRequest extends AutoSafeParcelable { public static final int PRIORITY_NO_POWER = 105; @SafeParceled(1000) - private final int versionCode; + private int versionCode = 1; @SafeParceled(1) private int priority; @SafeParceled(2) @@ -105,7 +105,6 @@ public class LocationRequest extends AutoSafeParcelable { private long maxWaitTime; public LocationRequest() { - this.versionCode = 1; this.priority = PRIORITY_BALANCED_POWER_ACCURACY; this.interval = 3600000; this.fastestInterval = 600000; 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 ad578503..7fcd9079 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 @@ -16,7 +16,7 @@ public class LocationStatus extends AutoSafeParcelable { public static final int STATUS_LOCATION_DISABLED_IN_SETTINGS = 7; public static final int STATUS_IN_PROGRESS = 8; @SafeParceled(1000) - private final int versionCode; + private int versionCode = 1; @SafeParceled(1) int cellStatus; @SafeParceled(2) @@ -24,10 +24,6 @@ public class LocationStatus extends AutoSafeParcelable { @SafeParceled(3) long elapsedRealtimeNanos; - private LocationStatus() { - versionCode = 1; - } - @Override public boolean equals(Object o) { if (this == o) 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 8870ca74..a0d85e33 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 @@ -9,11 +9,7 @@ import org.microg.safeparcel.SafeParceled; public class AutocompleteFilter extends AutoSafeParcelable { @SafeParceled(1000) - private final int versionCode; - - private AutocompleteFilter() { - this.versionCode = 1; - } + private int versionCode = 1; public static final Creator CREATOR = new AutoCreator(AutocompleteFilter.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 eea28f6e..2b46a618 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 @@ -9,11 +9,7 @@ import org.microg.safeparcel.SafeParceled; public class UserAddedPlace extends AutoSafeParcelable { @SafeParceled(1000) - private final int versionCode; - - private UserAddedPlace() { - versionCode = 1; - } + private int versionCode = 1; public static final Creator CREATOR = new AutoCreator(UserAddedPlace.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 74642be6..fce36072 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 @@ -6,7 +6,7 @@ import org.microg.safeparcel.SafeParceled; public class PlacesParams extends AutoSafeParcelable { @SafeParceled(1000) - private final int versionCode; + private int versionCode = 1; @SafeParceled(1) public final String clientPackageName; @SafeParceled(2) @@ -17,7 +17,6 @@ public class PlacesParams extends AutoSafeParcelable { public final String gCoreClientName; private PlacesParams() { - versionCode = 1; clientPackageName = locale = accountName = gCoreClientName = null; } 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 717a7bdf..d2efd7e1 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 @@ -31,7 +31,7 @@ import java.util.Arrays; @PublicApi public final class CameraPosition extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; /** * The location that the camera is pointing at. */ @@ -61,7 +61,6 @@ public final class CameraPosition extends AutoSafeParcelable { */ private CameraPosition() { target = null; - versionCode = 1; zoom = tilt = bearing = 0; } @@ -81,7 +80,6 @@ public final class CameraPosition extends AutoSafeParcelable { */ public CameraPosition(LatLng target, float zoom, float tilt, float bearing) throws NullPointerException, IllegalArgumentException { - versionCode = 1; if (target == null) { throw new NullPointerException("null camera target"); } 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 ac434bca..8bd58e9d 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 @@ -26,7 +26,7 @@ import org.microg.safeparcel.SafeParceled; @PublicApi public final class LatLng extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; /** * Latitude, in degrees. This value is in the range [-90, 90]. */ @@ -43,7 +43,6 @@ public final class LatLng extends AutoSafeParcelable { * In fact, those are replaced by their real values later using SafeParcelUtil. */ private LatLng() { - versionCode = 1; latitude = longitude = 0; } @@ -56,7 +55,6 @@ public final class LatLng extends AutoSafeParcelable { * inclusive and +180 degrees exclusive. */ public LatLng(double latitude, double longitude) { - this.versionCode = 1; this.latitude = Math.max(-90, Math.min(90, latitude)); if ((-180 <= longitude) && (longitude < 180)) { this.longitude = longitude; 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 371505f4..648ccf7b 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 @@ -28,7 +28,7 @@ import java.util.Arrays; @PublicApi public final class LatLngBounds extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; /** * Southwest corner of the bound. */ @@ -45,7 +45,6 @@ public final class LatLngBounds extends AutoSafeParcelable { * In fact, those are replaced by their real values later using SafeParcelUtil. */ private LatLngBounds() { - this.versionCode = 1; southwest = northeast = null; } @@ -70,7 +69,6 @@ public final class LatLngBounds extends AutoSafeParcelable { if (northeast.latitude < southwest.latitude) throw new IllegalArgumentException("latitude of northeast corner must not be" + " lower than latitude of southwest corner"); - this.versionCode = 1; this.southwest = southwest; this.northeast = northeast; } 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 aa3b5013..5063bcdf 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 @@ -11,7 +11,7 @@ import org.microg.safeparcel.SafeParceled; @PublicApi public class Tile extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; /** * The width of the image encoded by {@link #data} in pixels. */ @@ -30,7 +30,6 @@ public class Tile extends AutoSafeParcelable { public final byte[] data; private Tile() { - versionCode = 1; width = height = 0; data = null; } @@ -45,7 +44,6 @@ public class Tile extends AutoSafeParcelable { * {@link android.graphics.BitmapFactory#decodeByteArray(byte[], int, int)}. */ public Tile(int width, int height, byte[] data) { - this.versionCode = 1; this.width = width; this.height = height; this.data = data; 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 68fdaade..70c967ec 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 @@ -18,6 +18,7 @@ package com.google.android.gms.maps.model; import android.os.IBinder; import android.os.RemoteException; + import com.google.android.gms.maps.model.internal.ITileProviderDelegate; import org.microg.gms.common.PublicApi; @@ -31,7 +32,7 @@ import org.microg.safeparcel.SafeParceled; public class TileOverlayOptions extends AutoSafeParcelable { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; /** * This is a IBinder to the {@link #tileProvider}, built using {@link ITileProviderDelegate}. */ @@ -49,7 +50,6 @@ public class TileOverlayOptions extends AutoSafeParcelable { * Creates a new set of tile overlay options. */ public TileOverlayOptions() { - versionCode = 1; } /** 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 3dc6b6ee..96758caf 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 @@ -24,7 +24,7 @@ import java.util.Date; public class LogEvent extends AutoSafeParcelable { @SafeParceled(1) - public final int versionCode; + private int versionCode = 1; @SafeParceled(2) public final long eventTime; @@ -36,7 +36,6 @@ public class LogEvent extends AutoSafeParcelable { public final byte[] data; private LogEvent() { - versionCode = 1; eventTime = -1; tag = null; data = null; 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 f35bf750..f524b62c 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 @@ -22,7 +22,7 @@ import org.microg.safeparcel.SafeParceled; public class PlayLoggerContext extends AutoSafeParcelable { @SafeParceled(1) - public final int versionCode; + private int versionCode = 1; @SafeParceled(2) public final String packageName; @@ -43,14 +43,12 @@ public class PlayLoggerContext extends AutoSafeParcelable { public final String logSourceName; private PlayLoggerContext() { - this.versionCode = 1; packageName = uploadAccount = logSourceName = null; logSource = loggingId = -1; logAndroidId = false; } public PlayLoggerContext(String packageName, int logSource, String uploadAccount, int loggingId, String logSourceName) { - this.versionCode = 1; this.packageName = packageName; this.logSource = logSource; this.uploadAccount = uploadAccount; diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java index 9ccfc30a..d1a93896 100644 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java +++ b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java @@ -22,7 +22,7 @@ import org.microg.safeparcel.SafeParceled; public class GetCorpusStatusRequest extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode; + private int versionCode = 1; @SafeParceled(1) public final String packageName; @@ -31,7 +31,6 @@ public class GetCorpusStatusRequest extends AutoSafeParcelable { public final String corpus; private GetCorpusStatusRequest() { - versionCode = 1; packageName = null; corpus = null; } diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java index 79f2846a..bbccbec9 100644 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java +++ b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java @@ -25,7 +25,7 @@ import org.microg.safeparcel.SafeParceled; public class GetCorpusStatusResponse extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode; + private int versionCode; @SafeParceled(1) public final Status status; @@ -34,13 +34,11 @@ public class GetCorpusStatusResponse extends AutoSafeParcelable { public final CorpusStatus corpusStatus; private GetCorpusStatusResponse() { - versionCode = 1; status = null; corpusStatus = null; } public GetCorpusStatusResponse(Status status, CorpusStatus corpusStatus) { - this.versionCode = 1; this.status = status; this.corpusStatus = corpusStatus; } diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java index 5cec94b3..b0f2b460 100644 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java +++ b/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java @@ -22,7 +22,7 @@ import org.microg.safeparcel.SafeParceled; public class RequestIndexingRequest extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode; + private int versionCode = 1; @SafeParceled(1) public final String packageName; @@ -34,7 +34,6 @@ public class RequestIndexingRequest extends AutoSafeParcelable { public final long sequenceNumber; private RequestIndexingRequest() { - versionCode = 1; packageName = null; corpus = null; sequenceNumber = 0; diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java index 024db887..7490f988 100644 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java +++ b/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java @@ -24,7 +24,7 @@ import org.microg.safeparcel.SafeParceled; public class RequestIndexingResponse extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode; + private int versionCode; @SafeParceled(1) public final Status status; @@ -33,13 +33,11 @@ public class RequestIndexingResponse extends AutoSafeParcelable { public final boolean scheduledIndexing; private RequestIndexingResponse() { - versionCode = 1; status = null; scheduledIndexing = false; } public RequestIndexingResponse(Status status, boolean scheduledIndexing) { - this.versionCode = 1; this.status = status; this.scheduledIndexing = scheduledIndexing; } diff --git a/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java index a58a7be6..e97779f1 100644 --- a/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java +++ b/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java @@ -25,7 +25,7 @@ import org.microg.safeparcel.SafeParceled; public class QueryResponse extends AutoSafeParcelable { @SafeParceled(1000) - public final int versionCode; + private int versionCode = 1; @SafeParceled(1) public final Status status; @@ -34,13 +34,11 @@ public class QueryResponse extends AutoSafeParcelable { public final SearchResults results; private QueryResponse() { - versionCode = 1; status = null; results = null; } public QueryResponse(Status status, SearchResults results) { - this.versionCode = 1; this.status = status; this.results = results; } diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/AddListenerRequest.java b/play-services-api/src/main/java/com/google/android/gms/wearable/AddListenerRequest.java new file mode 100644 index 00000000..3de65208 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/AddListenerRequest.java @@ -0,0 +1,45 @@ +/* + * 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.wearable; + +import android.content.IntentFilter; + +import com.google.android.gms.wearable.internal.IWearableListener; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class AddListenerRequest extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final IWearableListener listener; + @SafeParceled(3) + public final IntentFilter[] intentFilters; + + private AddListenerRequest() { + listener = null; + intentFilters = null; + } + + public AddListenerRequest(IWearableListener listener, IntentFilter[] intentFilters) { + this.listener = listener; + this.intentFilters = intentFilters; + } + + public static final Creator CREATOR = new AutoCreator(AddListenerRequest.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java b/play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java index 1539f85d..aebd7d49 100644 --- a/play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java @@ -1,4 +1,53 @@ package com.google.android.gms.wearable; -public class ConnectionConfiguration { +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class ConnectionConfiguration extends AutoSafeParcelable { + + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final String name; + @SafeParceled(3) + public final String address; + @SafeParceled(4) + public final int type; + @SafeParceled(5) + public final int role; + @SafeParceled(6) + public final boolean enabled; + @SafeParceled(7) + public boolean connected = false; + @SafeParceled(8) + public String peerNodeId; + @SafeParceled(9) + public boolean btlePriority = true; + @SafeParceled(10) + public String nodeId; + + private ConnectionConfiguration() { + name = address = null; + type = role = 0; + enabled = false; + } + + public ConnectionConfiguration(String name, String address, int type, int role, boolean enabled) { + this.name = name; + this.address = address; + this.type = type; + this.role = role; + this.enabled = enabled; + } + + public ConnectionConfiguration(String name, String address, int type, int role, boolean enabled, String nodeId) { + this.name = name; + this.address = address; + this.type = type; + this.role = role; + this.enabled = enabled; + this.nodeId = nodeId; + } + + public static final Creator CREATOR = new AutoCreator(ConnectionConfiguration.class); } diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/DeleteDataItemsResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/DeleteDataItemsResponse.java new file mode 100644 index 00000000..de727a00 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/DeleteDataItemsResponse.java @@ -0,0 +1,23 @@ +/* + * 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.wearable; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class DeleteDataItemsResponse extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator(DeleteDataItemsResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/GetConfigResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/GetConfigResponse.java new file mode 100644 index 00000000..a1435257 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/GetConfigResponse.java @@ -0,0 +1,41 @@ +/* + * 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.wearable; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class GetConfigResponse extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final int statusCode; + @SafeParceled(3) + public final ConnectionConfiguration connectionConfiguration; + + private GetConfigResponse() { + statusCode = 0; + connectionConfiguration = null; + } + + public GetConfigResponse(int statusCode, ConnectionConfiguration connectionConfiguration) { + this.statusCode = statusCode; + this.connectionConfiguration = connectionConfiguration; + } + + public static final Creator CREATOR = new AutoCreator(GetConfigResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/GetConfigsResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/GetConfigsResponse.java new file mode 100644 index 00000000..256aebdd --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/GetConfigsResponse.java @@ -0,0 +1,41 @@ +/* + * 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.wearable; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class GetConfigsResponse extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final int statusCode; + @SafeParceled(3) + public final ConnectionConfiguration[] configurations; + + private GetConfigsResponse() { + statusCode = 0; + configurations = null; + } + + public GetConfigsResponse(int statusCode, ConnectionConfiguration[] configurations) { + this.statusCode = statusCode; + this.configurations = configurations; + } + + public static final Creator CREATOR = new AutoCreator(GetConfigsResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/GetConnectedNodesResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/GetConnectedNodesResponse.java new file mode 100644 index 00000000..625b25ad --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/GetConnectedNodesResponse.java @@ -0,0 +1,45 @@ +/* + * 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.wearable; + +import com.google.android.gms.wearable.internal.NodeParcelable; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +import java.util.List; + +public class GetConnectedNodesResponse extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final int statusCode; + @SafeParceled(3) + public final List nodes; + + private GetConnectedNodesResponse() { + statusCode = 0; + nodes = null; + } + + public GetConnectedNodesResponse(int statusCode, List nodes) { + this.statusCode = statusCode; + this.nodes = nodes; + } + + public static final Creator CREATOR = new AutoCreator(GetConnectedNodesResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/GetDataItemResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/GetDataItemResponse.java new file mode 100644 index 00000000..a1ae10d6 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/GetDataItemResponse.java @@ -0,0 +1,43 @@ +/* + * 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.wearable; + +import com.google.android.gms.wearable.internal.DataItemParcelable; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class GetDataItemResponse extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final int statusCode; + @SafeParceled(3) + public final DataItemParcelable dataItem; + + private GetDataItemResponse() { + statusCode = 0; + dataItem = null; + } + + public GetDataItemResponse(int statusCode, DataItemParcelable dataItem) { + this.statusCode = statusCode; + this.dataItem = dataItem; + } + + public static final Creator CREATOR = new AutoCreator(GetDataItemResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/GetFdForAssetResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/GetFdForAssetResponse.java new file mode 100644 index 00000000..4f83e64c --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/GetFdForAssetResponse.java @@ -0,0 +1,23 @@ +/* + * 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.wearable; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class GetFdForAssetResponse extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator(GetFdForAssetResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/GetLocalNodeResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/GetLocalNodeResponse.java new file mode 100644 index 00000000..b99bb6b7 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/GetLocalNodeResponse.java @@ -0,0 +1,43 @@ +/* + * 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.wearable; + +import com.google.android.gms.wearable.internal.NodeParcelable; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class GetLocalNodeResponse extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final int statusCode; + @SafeParceled(3) + public final NodeParcelable node; + + private GetLocalNodeResponse() { + statusCode = 0; + node = null; + } + + public GetLocalNodeResponse(int statusCode, NodeParcelable node) { + this.statusCode = statusCode; + this.node = node; + } + + public static final Creator CREATOR = new AutoCreator(GetLocalNodeResponse.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 8b8503d9..1df9edf0 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 @@ -17,11 +17,17 @@ package com.google.android.gms.wearable; import android.net.Uri; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.Base64; + +import com.google.android.gms.wearable.internal.DataItemAssetParcelable; import org.microg.gms.common.PublicApi; import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; -import java.util.Collections; +import java.util.HashMap; import java.util.Map; /** @@ -31,19 +37,46 @@ import java.util.Map; public class PutDataRequest extends AutoSafeParcelable { public static final String WEAR_URI_SCHEME = "wear"; - private DataItem dataItem; + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + final Uri uri; + @SafeParceled(4) + private final Bundle assets; + @SafeParceled(5) + byte[] data; - private PutDataRequest(DataItem dataItem) { - this.dataItem = dataItem; + private PutDataRequest() { + uri = null; + assets = new Bundle(); + } + + private PutDataRequest(Uri uri) { + this.uri = uri; + assets = new Bundle(); + } + + public static PutDataRequest create(Uri uri) { + return new PutDataRequest(uri); } public static PutDataRequest create(String path) { - // TODO - return new PutDataRequest(null); + if (TextUtils.isEmpty(path)) { + throw new IllegalArgumentException("An empty path was supplied."); + } else if (!path.startsWith("/")) { + throw new IllegalArgumentException("A path must start with a single / ."); + } else if (path.startsWith("//")) { + throw new IllegalArgumentException("A path must start with a single / ."); + } else { + return create((new Uri.Builder()).scheme(WEAR_URI_SCHEME).path(path).build()); + } } public static PutDataRequest createFromDataItem(DataItem source) { - return new PutDataRequest(source); + PutDataRequest dataRequest = new PutDataRequest(source.getUri()); + dataRequest.data = source.getData(); + // TODO: assets + return dataRequest; } public static PutDataRequest createWithAutoAppendedId(String pathPrefix) { @@ -51,39 +84,42 @@ public class PutDataRequest extends AutoSafeParcelable { } public Asset getAsset(String key) { - // TODO - return null; + return assets.getParcelable(key); } public Map getAssets() { - // TODO - return Collections.emptyMap(); + Map map = new HashMap(); + assets.setClassLoader(DataItemAssetParcelable.class.getClassLoader()); + for (String key : assets.keySet()) { + map.put(key, (Asset) assets.getParcelable(key)); + } + return map; } public byte[] getData() { - return dataItem.getData(); + return data; } public Uri getUri() { - return dataItem.getUri(); + return uri; } public boolean hasAsset(String key) { - return dataItem.getAssets().containsKey(key); + return assets.containsKey(key); } public PutDataRequest putAsset(String key, Asset value) { - // TODO + assets.putParcelable(key, value); return this; } public PutDataRequest removeAsset(String key) { - // TODO + assets.remove(key); return this; } public PutDataRequest setData(byte[] data) { - // TODO + this.data = data; return this; } @@ -93,7 +129,10 @@ public class PutDataRequest extends AutoSafeParcelable { } public String toString(boolean verbose) { - return "PutDataRequest{data=" + dataItem + "}"; + return "PutDataRequest[data=" + (data == null ? "null" : Base64.encodeToString(data, Base64.NO_WRAP)) + + ", numAssets=" + getAssets().size() + + ", uri=" + uri + "]"; + // TODO: Verbose: dump all assets } public static final Creator CREATOR = new AutoCreator(PutDataRequest.class); diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataResponse.java new file mode 100644 index 00000000..f44f4319 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/PutDataResponse.java @@ -0,0 +1,43 @@ +/* + * 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.wearable; + +import com.google.android.gms.wearable.internal.DataItemParcelable; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class PutDataResponse extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final int statusCode; + @SafeParceled(3) + public final DataItemParcelable dataItem; + + private PutDataResponse() { + statusCode = 0; + dataItem = null; + } + + public PutDataResponse(int statusCode, DataItemParcelable dataItem) { + this.statusCode = statusCode; + this.dataItem = dataItem; + } + + public static final Creator CREATOR = new AutoCreator(PutDataResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/RemoveListenerRequest.java b/play-services-api/src/main/java/com/google/android/gms/wearable/RemoveListenerRequest.java new file mode 100644 index 00000000..6edc53f0 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/RemoveListenerRequest.java @@ -0,0 +1,39 @@ +/* + * 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.wearable; + +import com.google.android.gms.wearable.internal.IWearableListener; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +public class RemoveListenerRequest extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final IWearableListener listener; + + private RemoveListenerRequest() { + listener = null; + } + + public RemoveListenerRequest(IWearableListener listener) { + this.listener = listener; + } + + public static final Creator CREATOR = new AutoCreator(RemoveListenerRequest.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/SendMessageResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/SendMessageResponse.java new file mode 100644 index 00000000..570ab0ef --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/SendMessageResponse.java @@ -0,0 +1,23 @@ +/* + * 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.wearable; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class SendMessageResponse extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator(SendMessageResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/StorageInfoResponse.java b/play-services-api/src/main/java/com/google/android/gms/wearable/StorageInfoResponse.java new file mode 100644 index 00000000..42307d72 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/StorageInfoResponse.java @@ -0,0 +1,23 @@ +/* + * 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.wearable; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class StorageInfoResponse extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator(StorageInfoResponse.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java new file mode 100644 index 00000000..f124a627 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java @@ -0,0 +1,23 @@ +/* + * 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.wearable.internal; + +import org.microg.safeparcel.AutoSafeParcelable; + +public class DataItemAssetParcelable extends AutoSafeParcelable { + public static final Creator CREATOR = new AutoCreator(DataItemAssetParcelable.class); +} diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java new file mode 100644 index 00000000..f7c880e1 --- /dev/null +++ b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java @@ -0,0 +1,67 @@ +/* + * 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.wearable.internal; + +import android.net.Uri; +import android.os.Bundle; + +import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; + +import java.util.HashMap; +import java.util.Map; + +public class DataItemParcelable extends AutoSafeParcelable { + @SafeParceled(1) + private int versionCode = 1; + @SafeParceled(2) + public final Uri uri; + @SafeParceled(4) + private final Bundle assets; + @SafeParceled(5) + public byte[] data; + + private DataItemParcelable() { + uri = null; + assets = new Bundle(); + data = null; + } + + public DataItemParcelable(Uri uri) { + this(uri, new HashMap()); + } + + public DataItemParcelable(Uri uri, Map assets) { + this.uri = uri; + this.assets = new Bundle(); + for (String key : assets.keySet()) { + this.assets.putParcelable(key, assets.get(key)); + } + data = null; + } + + public Map getAssets() { + Map assets = new HashMap(); + this.assets.setClassLoader(DataItemAssetParcelable.class.getClassLoader()); + for (String key : this.assets.keySet()) { + assets.put(key, (DataItemAssetParcelable) this.assets.getParcelable(key)); + } + return assets; + } + + public static final Creator CREATOR = new AutoCreator(DataItemParcelable.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 6bdbce7f..6d9e071d 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 @@ -26,19 +26,17 @@ import org.microg.safeparcel.SafeParceled; */ public class NodeParcelable extends AutoSafeParcelable implements Node { @SafeParceled(1) - private final int versionCode; + private int versionCode = 1; @SafeParceled(2) private final String id; @SafeParceled(3) private final String displayName; private NodeParcelable() { - versionCode = 1; id = displayName = null; } public NodeParcelable(String id, String displayName) { - versionCode = 1; this.id = id; this.displayName = displayName; }