fix: use generated proxy for BT GATT, eliminating manual parcel writes

xaionaro@dx.center · xaionaro@dx.center · commit 6eb99fb14c3f · 2026-03-30T00:42:18.000Z
diff --git a/examples/ble_sensor_collector/main.go b/examples/ble_sensor_collector/main.go
@@ -26,7 +26,6 @@ import (
 	"github.com/AndroidGoLab/binder/binder"
 	"github.com/AndroidGoLab/binder/binder/versionaware"
 	"github.com/AndroidGoLab/binder/kernelbinder"
-	"github.com/AndroidGoLab/binder/parcel"
 	"github.com/AndroidGoLab/binder/servicemanager"
 )
 
@@ -178,37 +177,16 @@ func main() {
 
 	spy := &gattSpy{registeredCh: make(chan int32, 1)}
 	gattCallback := genBluetooth.NewBluetoothGattCallbackStub(spy)
+	gattProxy := genBluetooth.NewBluetoothGattProxy(gattBinder)
 
-	// registerClient via raw transaction (the generated proxy may not
-	// handle all the complex parameters correctly).
-	code, err := gattBinder.ResolveCode(ctx, genBluetooth.DescriptorIBluetoothGatt, "registerClient")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "resolve registerClient: %v\n", err)
-		os.Exit(1)
-	}
+	// ParcelUuid for the app identifier (placeholder; the actual UUID
+	// value is not significant for GATT client registration).
+	appID := genOs.ParcelUuid{}
 
-	data := parcel.New()
-	data.WriteInterfaceToken(genBluetooth.DescriptorIBluetoothGatt)
-	data.WriteInt32(1) // non-null ParcelUuid
-	data.WriteInt64(0x0000180000001000)
-	data.WriteInt64(-9223371485494954757)
-	binder.WriteBinderToParcel(ctx, data, gattCallback.AsBinder(), transport)
-	data.WriteBool(false)
-	data.WriteInt32(0)
-	attr := shellAttribution()
-	data.WriteInt32(1)
-	attr.MarshalParcel(data)
-
-	reply, err := gattBinder.Transact(ctx, code, 0, data)
-	if err != nil {
+	if err := gattProxy.RegisterClient(ctx, appID, gattCallback, false, 0, shellAttribution()); err != nil {
 		fmt.Fprintf(os.Stderr, "registerClient: %v\n", err)
 		os.Exit(1)
 	}
-	if statusErr := binder.ReadStatus(reply); statusErr != nil {
-		fmt.Fprintf(os.Stderr, "registerClient status: %v\n", statusErr)
-		fmt.Fprintf(os.Stderr, "Hint: AIDL version mismatch — the BT stack may not expect AttributionSource.\n")
-		return
-	}
 
 	select {
 	case status := <-spy.registeredCh:
diff --git a/tests/e2e/bluetooth_gatt_test.go b/tests/e2e/bluetooth_gatt_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/AndroidGoLab/binder/android/content"
 	genOs "github.com/AndroidGoLab/binder/android/os"
 	"github.com/AndroidGoLab/binder/binder"
-	"github.com/AndroidGoLab/binder/parcel"
 )
 
 // ---------------------------------------------------------------------------
@@ -192,34 +191,14 @@ func TestBluetoothGATT_FullPipeline(t *testing.T) {
 			require.NotNil(t, gattBinder, "GetBluetoothGatt returned nil")
 			t.Logf("IBluetoothGatt handle: %d", gattBinder.Handle())
 
-			code := resolveCode(ctx, t, gattBinder,
-				genBluetooth.DescriptorIBluetoothGatt, "registerClient")
+			gattProxy := genBluetooth.NewBluetoothGattProxy(gattBinder)
 
 			spy := &gattCallbackSpy{registeredCh: make(chan int32, 1)}
 			gattCallback := genBluetooth.NewBluetoothGattCallbackStub(spy)
 
-			data := parcel.New()
-			defer data.Recycle()
-			data.WriteInterfaceToken(genBluetooth.DescriptorIBluetoothGatt)
-			data.WriteInt32(1) // non-null ParcelUuid
-			data.WriteInt64(0x0000180000001000)
-			data.WriteInt64(-9223371485494954757)
-			binder.WriteBinderToParcel(ctx, data, gattCallback.AsBinder(), transport)
-			data.WriteBool(false)
-			data.WriteInt32(0)
-			attr := shellAttribution()
-			data.WriteInt32(1)
-			attr.MarshalParcel(data)
-
-			regReply, err := gattBinder.Transact(ctx, code, 0, data)
+			appID := genOs.ParcelUuid{}
+			err = gattProxy.RegisterClient(ctx, appID, gattCallback, false, 0, shellAttribution())
 			requireOrSkip(t, err)
-			if statusErr := binder.ReadStatus(regReply); statusErr != nil {
-				// AIDL version mismatch: the server may not expect
-				// AttributionSource (e.g., older BT stack). Skip
-				// rather than fail — the proxy call is correct per
-				// the AIDL spec, but the device's version differs.
-				requireOrSkip(t, statusErr)
-			}
 
 			select {
 			case status := <-spy.registeredCh:
