Merge "[BootAnimation] Modernize codebase by replacing NULL with nullptr" (0f3b0953) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+23 −23

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ static constexpr size_t TEXT_POS_LEN_MAX = 16;

		BootAnimation::BootAnimation(sp<Callbacks> callbacks)
		: Thread(false), mClockEnabled(true), mTimeIsAccurate(false),
		mTimeFormat12Hour(false), mTimeCheckThread(NULL), mCallbacks(callbacks) {
		mTimeFormat12Hour(false), mTimeCheckThread(nullptr), mCallbacks(callbacks) {
		mSession = new SurfaceComposerClient();

		std::string powerCtl = android::base::GetProperty("sys.powerctl", "");
		@@ -156,7 +156,7 @@ void BootAnimation::binderDied(const wp<IBinder>&)
		status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,
		const char* name) {
		Asset* asset = assets.open(name, Asset::ACCESS_BUFFER);
		if (asset == NULL)
		if (asset == nullptr)
		return NO_INIT;
		SkBitmap bitmap;
		sk_sp<SkData> data = SkData::MakeWithoutCopy(asset->getBuffer(false),
		@@ -234,7 +234,7 @@ status_t BootAnimation::initTexture(FileMap* map, int* width, int* height)
		case kN32_SkColorType:
		if (!mUseNpotTextures && (tw != w \|\| th != h)) {
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,
		GL_UNSIGNED_BYTE, 0);
		GL_UNSIGNED_BYTE, nullptr);
		glTexSubImage2D(GL_TEXTURE_2D, 0,
		0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, p);
		} else {
		@@ -246,7 +246,7 @@ status_t BootAnimation::initTexture(FileMap* map, int* width, int* height)
		case kRGB_565_SkColorType:
		if (!mUseNpotTextures && (tw != w \|\| th != h)) {
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,
		GL_UNSIGNED_SHORT_5_6_5, 0);
		GL_UNSIGNED_SHORT_5_6_5, nullptr);
		glTexSubImage2D(GL_TEXTURE_2D, 0,
		0, 0, w, h, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, p);
		} else {
		@@ -304,10 +304,10 @@ status_t BootAnimation::readyToRun() {

		EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);

		eglInitialize(display, 0, 0);
		eglInitialize(display, nullptr, nullptr);
		eglChooseConfig(display, attribs, &config, 1, &numConfigs);
		surface = eglCreateWindowSurface(display, config, s.get(), NULL);
		context = eglCreateContext(display, config, NULL, NULL);
		surface = eglCreateWindowSurface(display, config, s.get(), nullptr);
		context = eglCreateContext(display, config, nullptr, nullptr);
		eglQuerySurface(display, surface, EGL_WIDTH, &w);
		eglQuerySurface(display, surface, EGL_HEIGHT, &h);

		@@ -671,7 +671,7 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)
		// Parse the description file
		for (;;) {
		const char* endl = strstr(s, "\n");
		if (endl == NULL) break;
		if (endl == nullptr) break;
		String8 line(s, endl - s);
		const char* l = line.string();
		int fps = 0;
		@@ -699,8 +699,8 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)
		part.count = count;
		part.pause = pause;
		part.path = path;
		part.audioData = NULL;
		part.animation = NULL;
		part.audioData = nullptr;
		part.animation = nullptr;
		if (!parseColor(color, part.backgroundColor)) {
		SLOGE("> invalid color '#%s'", color);
		part.backgroundColor[0] = 0.0f;
		@@ -716,9 +716,9 @@ bool BootAnimation::parseAnimationDesc(Animation& animation)
		part.playUntilComplete = false;
		part.count = 1;
		part.pause = 0;
		part.audioData = NULL;
		part.audioData = nullptr;
		part.animation = loadAnimation(String8(SYSTEM_BOOTANIMATION_FILE));
		if (part.animation != NULL)
		if (part.animation != nullptr)
		animation.parts.add(part);
		}
		s = ++endl;
		@@ -731,7 +731,7 @@ bool BootAnimation::preloadZip(Animation& animation)
		{
		// read all the data structures
		const size_t pcount = animation.parts.size();
		void *cookie = NULL;
		void *cookie = nullptr;
		ZipFileRO* zip = animation.zip;
		if (!zip->startIteration(&cookie)) {
		return false;
		@@ -739,7 +739,7 @@ bool BootAnimation::preloadZip(Animation& animation)

		ZipEntryRO entry;
		char name[ANIM_ENTRY_NAME_MAX];
		while ((entry = zip->nextEntry(cookie)) != NULL) {
		while ((entry = zip->nextEntry(cookie)) != nullptr) {
		const int foundEntryName = zip->getEntryFileName(entry, name, ANIM_ENTRY_NAME_MAX);
		if (foundEntryName > ANIM_ENTRY_NAME_MAX \|\| foundEntryName == -1) {
		SLOGE("Error fetching entry file name");
		@@ -762,7 +762,7 @@ bool BootAnimation::preloadZip(Animation& animation)
		if (path == animation.parts[j].path) {
		uint16_t method;
		// supports only stored png files
		if (zip->getEntryInfo(entry, &method, NULL, NULL, NULL, NULL, NULL)) {
		if (zip->getEntryInfo(entry, &method, nullptr, nullptr, nullptr, nullptr, nullptr)) {
		if (method == ZipFileRO::kCompressStored) {
		FileMap* map = zip->createEntryFileMap(entry);
		if (map) {
		@@ -800,7 +800,7 @@ bool BootAnimation::preloadZip(Animation& animation)
		for (size_t frameIdx = 0; frameIdx < part.frames.size(); frameIdx++) {
		const char* endl = strstr(trimDataStr, "\n");
		// No more trimData for this part.
		if (endl == NULL) {
		if (endl == nullptr) {
		break;
		}
		String8 line(trimDataStr, endl - trimDataStr);
		@@ -927,7 +927,7 @@ bool BootAnimation::playAnimation(const Animation& animation)
		glBindTexture(GL_TEXTURE_2D, 0);

		// Handle animation package
		if (part.animation != NULL) {
		if (part.animation != nullptr) {
		playAnimation(*part.animation);
		if (exitPending())
		break;
		@@ -1001,7 +1001,7 @@ bool BootAnimation::playAnimation(const Animation& animation)
		spec.tv_nsec = (now + delay) % 1000000000;
		int err;
		do {
		err = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &spec, NULL);
		err = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &spec, nullptr);
		} while (err<0 && errno == EINTR);
		}

		@@ -1090,13 +1090,13 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn)
		if (mLoadedFiles.indexOf(fn) >= 0) {
		SLOGE("File \"%s\" is already loaded. Cyclic ref is not allowed",
		fn.string());
		return NULL;
		return nullptr;
		}
		ZipFileRO *zip = ZipFileRO::open(fn);
		if (zip == NULL) {
		if (zip == nullptr) {
		SLOGE("Failed to open animation zip \"%s\": %s",
		fn.string(), strerror(errno));
		return NULL;
		return nullptr;
		}

		Animation *animation = new Animation;
		@@ -1107,7 +1107,7 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn)

		parseAnimationDesc(*animation);
		if (!preloadZip(*animation)) {
		return NULL;
		return nullptr;
		}


		@@ -1135,7 +1135,7 @@ bool BootAnimation::updateIsTimeAccurate() {
		}

		FILE* file = fopen(LAST_TIME_CHANGED_FILE_PATH, "r");
		if (file != NULL) {
		if (file != nullptr) {
		long long lastChangedTime = 0;
		fscanf(file, "%lld", &lastChangedTime);
		fclose(file);

cmds/bootanimation/audioplay.cpp

+22 −22

Original line number	Diff line number	Diff line
		@@ -39,14 +39,14 @@ namespace {
		using namespace android;

		// engine interfaces
		static SLObjectItf engineObject = NULL;
		static SLObjectItf engineObject = nullptr;
		static SLEngineItf engineEngine;

		// output mix interfaces
		static SLObjectItf outputMixObject = NULL;
		static SLObjectItf outputMixObject = nullptr;

		// buffer queue player interfaces
		static SLObjectItf bqPlayerObject = NULL;
		static SLObjectItf bqPlayerObject = nullptr;
		static SLPlayItf bqPlayerPlay;
		static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue;
		static SLMuteSoloItf bqPlayerMuteSolo;
		@@ -89,7 +89,7 @@ void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
		}

		bool hasPlayer() {
		return (engineObject != NULL && bqPlayerObject != NULL);
		return (engineObject != nullptr && bqPlayerObject != nullptr);
		}

		// create the engine and output mix objects
		@@ -97,7 +97,7 @@ bool createEngine() {
		SLresult result;

		// create engine
		result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL);
		result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
		if (result != SL_RESULT_SUCCESS) {
		ALOGE("slCreateEngine failed with result %d", result);
		return false;
		@@ -121,7 +121,7 @@ bool createEngine() {
		(void)result;

		// create output mix
		result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, NULL, NULL);
		result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, nullptr, nullptr);
		if (result != SL_RESULT_SUCCESS) {
		ALOGE("sl engine CreateOutputMix failed with result %d", result);
		return false;
		@@ -173,7 +173,7 @@ bool createBufferQueueAudioPlayer(const ChunkFormat* chunkFormat) {

		// configure audio sink
		SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
		SLDataSink audioSnk = {&loc_outmix, NULL};
		SLDataSink audioSnk = {&loc_outmix, nullptr};

		// create audio player
		const SLInterfaceID ids[3] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME, SL_IID_ANDROIDCONFIGURATION};
		@@ -236,7 +236,7 @@ bool createBufferQueueAudioPlayer(const ChunkFormat* chunkFormat) {
		(void)result;

		// register callback on the buffer queue
		result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, NULL);
		result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, nullptr);
		if (result != SL_RESULT_SUCCESS) {
		ALOGE("sl bqPlayerBufferQueue RegisterCallback failed with result %d", result);
		return false;
		@@ -261,7 +261,7 @@ bool parseClipBuf(const uint8_t* clipBuf, int clipBufSize, const ChunkFormat** o
		const uint8_t** oSoundBuf, unsigned* oSoundBufSize) {
		*oSoundBuf = clipBuf;
		*oSoundBufSize = clipBufSize;
		*oChunkFormat = NULL;
		*oChunkFormat = nullptr;
		const RiffWaveHeader* wavHeader = (const RiffWaveHeader)oSoundBuf;
		if (oSoundBufSize < sizeof(wavHeader) \|\| (wavHeader->riff_id != ID_RIFF) \|\|
		(wavHeader->wave_id != ID_WAVE)) {
		@@ -303,7 +303,7 @@ bool parseClipBuf(const uint8_t* clipBuf, int clipBufSize, const ChunkFormat** o
		}
		}

		if (*oChunkFormat == NULL) {
		if (*oChunkFormat == nullptr) {
		ALOGE("format not found in WAV file");
		return false;
		}
		@@ -435,7 +435,7 @@ void setPlaying(bool isPlaying) {

		SLresult result;

		if (NULL != bqPlayerPlay) {
		if (nullptr != bqPlayerPlay) {
		// set the player's state
		result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay,
		isPlaying ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_STOPPED);
		@@ -445,28 +445,28 @@ void setPlaying(bool isPlaying) {

		void destroy() {
		// destroy buffer queue audio player object, and invalidate all associated interfaces
		if (bqPlayerObject != NULL) {
		if (bqPlayerObject != nullptr) {
		CHATTY("destroying audio player");
		(*bqPlayerObject)->Destroy(bqPlayerObject);
		bqPlayerObject = NULL;
		bqPlayerPlay = NULL;
		bqPlayerBufferQueue = NULL;
		bqPlayerMuteSolo = NULL;
		bqPlayerVolume = NULL;
		bqPlayerObject = nullptr;
		bqPlayerPlay = nullptr;
		bqPlayerBufferQueue = nullptr;
		bqPlayerMuteSolo = nullptr;
		bqPlayerVolume = nullptr;
		}

		// destroy output mix object, and invalidate all associated interfaces
		if (outputMixObject != NULL) {
		if (outputMixObject != nullptr) {
		(*outputMixObject)->Destroy(outputMixObject);
		outputMixObject = NULL;
		outputMixObject = nullptr;
		}

		// destroy engine object, and invalidate all associated interfaces
		if (engineObject != NULL) {
		if (engineObject != nullptr) {
		CHATTY("destroying audio engine");
		(*engineObject)->Destroy(engineObject);
		engineObject = NULL;
		engineEngine = NULL;
		engineObject = nullptr;
		engineEngine = nullptr;
		}
		}

cmds/bootanimation/iot/iotbootanimation_main.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public:

		mBootAction = new BootAction();
		if (!mBootAction->init(library_path, mBootParameters)) {
		mBootAction = NULL;
		mBootAction = nullptr;
		}
		};