Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dcefe38 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix misc-macro-parentheses warnings in sensorservice and... 

Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE." am: bb261bf4 am: dea1b682 am: 22c661db
am: 40063530

* commit '40063530':
  Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.

Change-Id: Id2a32c37264ea6dd879e852f0b6df737852fb3e2
parents 57803e76 40063530

include/binder/IInterface.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ protected: 




#define CHECK_INTERFACE(interface, data, reply)                         \

    if (!data.checkInterface(this)) { return PERMISSION_DENIED; }       \

    if (!(data).checkInterface(this)) { return PERMISSION_DENIED; }     \





// ----------------------------------------------------------------------

services/sensorservice/SensorService.h

+2 −2
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ 
#define IGNORE_HARDWARE_FUSION  false

#define DEBUG_CONNECTIONS   false

// Max size is 100 KB which is enough to accept a batch of about 1000 events.

#define MAX_SOCKET_BUFFER_SIZE_BATCHED 100 * 1024

#define MAX_SOCKET_BUFFER_SIZE_BATCHED (100 * 1024)

// For older HALs which don't support batching, use a smaller socket buffer size.

#define SOCKET_BUFFER_SIZE_NON_BATCHED 4 * 1024

#define SOCKET_BUFFER_SIZE_NON_BATCHED (4 * 1024)



#define SENSOR_REGISTRATIONS_BUF_SIZE 20