Merge "[sensor] Modernize codebase by replacing NULL with nullptr" (2ea14d2d) · Commits · e / os / android_frameworks_native-old

libs/sensor/Sensor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
		// If the sensor is protected by a permission we need to know if it is
		// a runtime one to determine whether we can use the permission cache.
		sp<IBinder> binder = defaultServiceManager()->getService(String16("permission"));
		if (binder != 0) {
		if (binder != nullptr) {
		sp<IPermissionController> permCtrl = interface_cast<IPermissionController>(binder);
		mRequiredPermissionRuntime = permCtrl->isRuntimePermission(
		String16(mRequiredPermission));

libs/sensor/SensorEventQueue.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ namespace android {
		// ----------------------------------------------------------------------------

		SensorEventQueue::SensorEventQueue(const sp<ISensorEventConnection>& connection)
		: mSensorEventConnection(connection), mRecBuffer(NULL), mAvailable(0), mConsumed(0),
		: mSensorEventConnection(connection), mRecBuffer(nullptr), mAvailable(0), mConsumed(0),
		mNumAcksToSend(0) {
		mRecBuffer = new ASensorEvent[MAX_RECEIVE_BUFFER_EVENT_COUNT];
		}
		@@ -82,9 +82,9 @@ ssize_t SensorEventQueue::read(ASensorEvent* events, size_t numEvents) {
		sp<Looper> SensorEventQueue::getLooper() const
		{
		Mutex::Autolock _l(mLock);
		if (mLooper == 0) {
		if (mLooper == nullptr) {
		mLooper = new Looper(true);
		mLooper->addFd(getFd(), getFd(), ALOOPER_EVENT_INPUT, NULL, NULL);
		mLooper->addFd(getFd(), getFd(), ALOOPER_EVENT_INPUT, nullptr, nullptr);
		}
		return mLooper;
		}
		@@ -97,7 +97,7 @@ status_t SensorEventQueue::waitForEvent() const
		int events;
		int32_t result;
		do {
		result = looper->pollOnce(-1, NULL, &events, NULL);
		result = looper->pollOnce(-1, nullptr, &events, nullptr);
		if (result == ALOOPER_POLL_ERROR) {
		ALOGE("SensorEventQueue::waitForEvent error (errno=%d)", errno);
		result = -EPIPE; // unknown error, so we make up one

libs/sensor/SensorManager.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ SensorManager& SensorManager::getInstanceForPackage(const String16& packageName)
		// to the wrong package and stats based on app ops may be slightly off.
		if (opPackageName.size() <= 0) {
		sp<IBinder> binder = defaultServiceManager()->getService(String16("permission"));
		if (binder != 0) {
		if (binder != nullptr) {
		const uid_t uid = IPCThreadState::self()->getCallingUid();
		Vector<String16> packages;
		interface_cast<IPermissionController>(binder)->getPackagesForUid(uid, packages);
		@@ -93,7 +93,7 @@ SensorManager& SensorManager::getInstanceForPackage(const String16& packageName)
		}

		SensorManager::SensorManager(const String16& opPackageName)
		: mSensorList(0), mOpPackageName(opPackageName), mDirectConnectionHandle(1) {
		: mSensorList(nullptr), mOpPackageName(opPackageName), mDirectConnectionHandle(1) {
		// okay we're not locked here, but it's not needed during construction
		assertStateLocked();
		}
		@@ -128,13 +128,13 @@ void SensorManager::sensorManagerDied() {
		Mutex::Autolock _l(mLock);
		mSensorServer.clear();
		free(mSensorList);
		mSensorList = NULL;
		mSensorList = nullptr;
		mSensors.clear();
		}

		status_t SensorManager::assertStateLocked() {
		bool initSensorManager = false;
		if (mSensorServer == NULL) {
		if (mSensorServer == nullptr) {
		initSensorManager = true;
		} else {
		// Ping binder to check if sensorservice is alive.
		@@ -164,7 +164,7 @@ status_t SensorManager::assertStateLocked() {
		size_t count = mSensors.size();
		mSensorList =
		static_cast<Sensor const*>(malloc(count sizeof(Sensor*)));
		LOG_ALWAYS_FATAL_IF(mSensorList == NULL, "mSensorList NULL");
		LOG_ALWAYS_FATAL_IF(mSensorList == nullptr, "mSensorList NULL");

		for (size_t i=0 ; i<count ; i++) {
		mSensorList[i] = mSensors.array() + i;
		@@ -222,7 +222,7 @@ Sensor const* SensorManager::getDefaultSensor(int type)
		}
		}
		}
		return NULL;
		return nullptr;
		}

		sp<SensorEventQueue> SensorManager::createEventQueue(String8 packageName, int mode) {
		@@ -232,10 +232,10 @@ sp<SensorEventQueue> SensorManager::createEventQueue(String8 packageName, int mo
		while (assertStateLocked() == NO_ERROR) {
		sp<ISensorEventConnection> connection =
		mSensorServer->createSensorEventConnection(packageName, mode, mOpPackageName);
		if (connection == NULL) {
		if (connection == nullptr) {
		// SensorService just died or the app doesn't have required permissions.
		ALOGE("createEventQueue: connection is NULL.");
		return NULL;
		return nullptr;
		}
		queue = new SensorEventQueue(connection);
		break;