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

Commit e8be6625 authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge \\"Increase sensor registration log size\\" into nyc-mr1-dev am: 6118fb85 

am: 26af1e04

Change-Id: I17f8653afdc18ef0690f8b7a129b474fbed4ecfe
parents 0dac6179 26af1e04

services/sensorservice/SensorService.cpp

+7 −7
Original line number Diff line number Diff line
@@ -435,15 +435,15 @@ status_t SensorService::dump(int fd, const Vector<String16>& args) { 
                    continue;

                }

                if (reg_info.mActivated) {

                   result.appendFormat("%02d:%02d:%02d activated package=%s handle=0x%08x "

                           "samplingRate=%dus maxReportLatency=%dus\n",

                           reg_info.mHour, reg_info.mMin, reg_info.mSec,

                           reg_info.mPackageName.string(), reg_info.mSensorHandle,

                           reg_info.mSamplingRateUs, reg_info.mMaxReportLatencyUs);

                   result.appendFormat("%02d:%02d:%02d activated handle=0x%08x "

                           "samplingRate=%dus maxReportLatency=%dus package=%s\n",

                           reg_info.mHour, reg_info.mMin, reg_info.mSec, reg_info.mSensorHandle,

                           reg_info.mSamplingRateUs, reg_info.mMaxReportLatencyUs,

                           reg_info.mPackageName.string());

                } else {

                   result.appendFormat("%02d:%02d:%02d de-activated package=%s handle=0x%08x\n",

                   result.appendFormat("%02d:%02d:%02d de-activated handle=0x%08x package=%s\n",

                           reg_info.mHour, reg_info.mMin, reg_info.mSec,

                           reg_info.mPackageName.string(), reg_info.mSensorHandle);

                           reg_info.mSensorHandle, reg_info.mPackageName.string());

                }

                currentIndex = (currentIndex - 1 + SENSOR_REGISTRATIONS_BUF_SIZE) %

                        SENSOR_REGISTRATIONS_BUF_SIZE;

services/sensorservice/SensorService.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
// For older HALs which don't support batching, use a smaller socket buffer size.

#define SOCKET_BUFFER_SIZE_NON_BATCHED (4 * 1024)



#define SENSOR_REGISTRATIONS_BUF_SIZE 20

#define SENSOR_REGISTRATIONS_BUF_SIZE 200



namespace android {

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