Add adb root hooks (f8904e1d) · Commits · e / os / android_system_core

adb/Android.bp

+11 −0

Original line number	Diff line number	Diff line
		@@ -415,6 +415,7 @@ cc_library {
		target: {
		android: {
		srcs: [
		":adbrootservice_aidl",
		"daemon/abb_service.cpp",
		"daemon/framebuffer_service.cpp",
		"daemon/mdns.cpp",
		@@ -423,22 +424,32 @@ cc_library {
		"daemon/restart_service.cpp",
		"daemon/set_verity_enable_state_service.cpp",
		],
		cflags: [
		"-Wno-exit-time-destructors",
		],
		static_libs: [
		"libavb_user",
		],
		shared_libs: [
		"libbinder",
		"libbootloader_message",
		"libmdnssd",
		"libext4_utils",
		"libfec",
		"libfs_mgr",
		"libselinux",
		"libutils",
		],
		},
		recovery: {
		exclude_srcs: [
		":adbrootservice_aidl",
		"daemon/abb_service.cpp",
		],
		exclude_shared_libs: [
		"libbinder",
		"libutils",
		],
		},
		},
		}

+35 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,12 @@
		#include <android-base/stringprintf.h>
		#include <log/log_properties.h>

		#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)
		#include <android/adbroot/IADBRootService.h>
		#include <binder/IServiceManager.h>
		#include <utils/String16.h>
		#endif

		#include "adb_io.h"
		#include "adb_unique_fd.h"

		@@ -33,10 +39,39 @@ void restart_root_service(unique_fd fd) {
		WriteFdExactly(fd.get(), "adbd is already running as root\n");
		return;
		}

		#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)
		android::sp<android::IBinder> binder =
		android::defaultServiceManager()->getService(android::String16("adbroot_service"));
		if (!binder) {
		LOG(ERROR) << "Failed to get service: adbroot_service";
		return;
		}

		android::sp<android::adbroot::IADBRootService> service =
		android::adbroot::IADBRootService::asInterface(binder);
		if (!service) {
		LOG(ERROR) << "Failed to get adbroot_service interface";
		return;
		}
		#endif

		#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)
		bool enabled;
		if (auto status = service->getEnabled(&enabled); !status.isOk()) {
		#endif
		if (!__android_log_is_debuggable()) {
		WriteFdExactly(fd.get(), "adbd cannot run as root in production builds\n");
		return;
		}
		#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)
		}
		if (!enabled) {
		WriteFdExactly(fd, "ADB Root access is disabled by system setting - "
		"enable in Settings -> System -> Developer options\n");
		return;
		}
		#endif

		LOG(INFO) << "adbd restarting as root";
		android::base::SetProperty("service.adb.root", "1");