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

Commit 6b3460db authored Nov 22, 2022 by Devin Moore Committed by Automerger Merge Worker Nov 22, 2022

fakeservicemanager: Add a clear() method am: 8cc776ae am: d90caf0b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2308645

Change-Id: Ie1f345b1cab5350e97ea745d9377a25a14e61b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ac2bc826 d90caf0b

libs/fakeservicemanager/ServiceManager.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,4 +106,8 @@ std::vector<IServiceManager::ServiceDebugInfo> ServiceManager::getServiceDebugIn
	std::vector<IServiceManager::ServiceDebugInfo> ret;		std::vector<IServiceManager::ServiceDebugInfo> ret;
	return ret;		return ret;
	}		}

			void ServiceManager::clear() {
			mNameToService.clear();
			}
	} // namespace android		} // namespace android

libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,9 @@ public:

	std::vector<IServiceManager::ServiceDebugInfo> getServiceDebugInfo() override;		std::vector<IServiceManager::ServiceDebugInfo> getServiceDebugInfo() override;

			// Clear all of the registered services
			void clear();

	private:		private:
	std::map<String16, sp<IBinder>> mNameToService;		std::map<String16, sp<IBinder>> mNameToService;
	};		};

libs/fakeservicemanager/test_sm.cpp

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,15 @@ TEST(AddService, HappyOverExistingService) {
	IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT), OK);		IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT), OK);
	}		}

			TEST(AddService, HappyClearAddedService) {
			auto sm = new ServiceManager();
			EXPECT_EQ(sm->addService(String16("foo"), getBinder(), false /allowIsolated/,
			IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT), OK);
			EXPECT_NE(sm->getService(String16("foo")), nullptr);
			sm->clear();
			EXPECT_EQ(sm->getService(String16("foo")), nullptr);
			}

	TEST(GetService, HappyHappy) {		TEST(GetService, HappyHappy) {
	auto sm = new ServiceManager();		auto sm = new ServiceManager();
	sp<IBinder> service = getBinder();		sp<IBinder> service = getBinder();