Wearable: Invoke callback on WearableService.getAllCapabilities()

Seems to fix #2118
microg · Feb 26, 2024 · 1cc7250 · 1cc7250
1 parent a628117
commit 1cc7250
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/play-services-wearable/core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java b/play-services-wearable/core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java
@@ -28,28 +28,7 @@
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.wearable.Asset;
 import com.google.android.gms.wearable.ConnectionConfiguration;
-import com.google.android.gms.wearable.internal.AddListenerRequest;
-import com.google.android.gms.wearable.internal.AddLocalCapabilityResponse;
-import com.google.android.gms.wearable.internal.AncsNotificationParcelable;
-import com.google.android.gms.wearable.internal.CapabilityInfoParcelable;
-import com.google.android.gms.wearable.internal.DeleteDataItemsResponse;
-import com.google.android.gms.wearable.internal.GetCapabilityResponse;
-import com.google.android.gms.wearable.internal.GetCloudSyncSettingResponse;
-import com.google.android.gms.wearable.internal.GetConfigResponse;
-import com.google.android.gms.wearable.internal.GetConfigsResponse;
-import com.google.android.gms.wearable.internal.GetConnectedNodesResponse;
-import com.google.android.gms.wearable.internal.GetDataItemResponse;
-import com.google.android.gms.wearable.internal.GetFdForAssetResponse;
-import com.google.android.gms.wearable.internal.GetLocalNodeResponse;
-import com.google.android.gms.wearable.internal.IChannelStreamCallbacks;
-import com.google.android.gms.wearable.internal.IWearableCallbacks;
-import com.google.android.gms.wearable.internal.IWearableService;
-import com.google.android.gms.wearable.internal.NodeParcelable;
-import com.google.android.gms.wearable.internal.PutDataRequest;
-import com.google.android.gms.wearable.internal.PutDataResponse;
-import com.google.android.gms.wearable.internal.RemoveListenerRequest;
-import com.google.android.gms.wearable.internal.RemoveLocalCapabilityResponse;
-import com.google.android.gms.wearable.internal.SendMessageResponse;
+import com.google.android.gms.wearable.internal.*;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -314,8 +293,9 @@ public void getConnectedCapability(IWearableCallbacks callbacks, String capabili
     }
 
     @Override
-    public void getConnectedCapaibilties(IWearableCallbacks callbacks, int nodeFilter) throws RemoteException {
+    public void getAllCapabilities(IWearableCallbacks callbacks, int nodeFilter) throws RemoteException {
         Log.d(TAG, "unimplemented Method: getConnectedCapaibilties: " + nodeFilter);
+        callbacks.onGetAllCapabilitiesResponse(new GetAllCapabilitiesResponse());
     }
 
     @Override

diff --git a/...ces-wearable/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl b/...ces-wearable/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl
@@ -35,7 +35,7 @@ interface IWearableService {
 
     // Capabilties
     void getConnectedCapability(IWearableCallbacks callbacks, String capability, int nodeFilter) = 41;
-    void getConnectedCapaibilties(IWearableCallbacks callbacks, int nodeFilter) = 42;
+    void getAllCapabilities(IWearableCallbacks callbacks, int nodeFilter) = 42;
     void addLocalCapability(IWearableCallbacks callbacks, String capability) = 45;
     void removeLocalCapability(IWearableCallbacks callbacks, String capability) = 46;
 

diff --git a/...le/src/main/java/com/google/android/gms/wearable/internal/GetAllCapabilitiesResponse.java b/...le/src/main/java/com/google/android/gms/wearable/internal/GetAllCapabilitiesResponse.java
@@ -19,8 +19,15 @@
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
 
+import java.util.List;
+
 public class GetAllCapabilitiesResponse extends AutoSafeParcelable {
-    @SafeParceled(1)
+    @Field(1)
     private int versionCode = 1;
-    public static final Creator<GetAllCapabilitiesResponse> CREATOR = new AutoCreator<GetAllCapabilitiesResponse>(GetAllCapabilitiesResponse.class);
+    @Field(2)
+    public int statusCode;
+    @Field(3)
+    public List<CapabilityInfoParcelable> capabilities;
+
+    public static final Creator<GetAllCapabilitiesResponse> CREATOR = findCreator(GetAllCapabilitiesResponse.class);
 }