ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Ignore ro.adb.secure in user builds."

Browse source
This commit is contained in:
Elliott Hughes 2015-06-19 20:24:18 +00:00 • committed by Gerrit Code Review
commit 21ba889ade
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/Android.mk
View file

@ -238,12 +238,11 @@ LOCAL_CFLAGS := \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
-Wno-deprecated-declarations \ -Wno-deprecated-declarations \
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_NO_AUTH=$(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)),1,0)
LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1
endif
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1
LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1
endif endif
LOCAL_MODULE := adbd LOCAL_MODULE := adbd

4
adb/adb.cpp
View file

@ -431,9 +431,9 @@ void handle_packet(apacket *p, atransport *t)
parse_banner(reinterpret_cast<const char*>(p->data), t); parse_banner(reinterpret_cast<const char*>(p->data), t);
if (HOST || !auth_enabled) { if (HOST || !auth_required) {
handle_online(t); handle_online(t);
if(!HOST) send_connect(t); if (!HOST) send_connect(t);
} else { } else {
send_auth_request(t); send_auth_request(t);
} }

2
adb/adb_auth.cpp
View file

@ -28,7 +28,7 @@
#include "adb.h" #include "adb.h"
#include "transport.h" #include "transport.h"
int auth_enabled = 0; bool auth_required = true;
void send_auth_request(atransport *t) void send_auth_request(atransport *t)
{ {

2
adb/adb_auth.h
View file

@ -19,7 +19,7 @@
#include "adb.h" #include "adb.h"
extern int auth_enabled; extern bool auth_required;
int adb_auth_keygen(const char* filename); int adb_auth_keygen(const char* filename);
void adb_auth_verified(atransport *t); void adb_auth_verified(atransport *t);

7
adb/daemon/main.cpp
View file

@ -125,11 +125,12 @@ int adbd_main(int server_port) {
// descriptor will always be open. // descriptor will always be open.
adbd_cloexec_auth_socket(); adbd_cloexec_auth_socket();
auth_enabled = property_get_bool("ro.adb.secure", 0) != 0; if (ALLOW_ADBD_NO_AUTH && property_get_bool("ro.adb.secure", 0) == 0) {
if (auth_enabled) { auth_required = false;
adbd_auth_init();
} }
adbd_auth_init();
// Our external storage path may be different than apps, since // Our external storage path may be different than apps, since
// we aren't able to bind mount after dropping root. // we aren't able to bind mount after dropping root.
const char* adb_external_storage = getenv("ADB_EXTERNAL_STORAGE"); const char* adb_external_storage = getenv("ADB_EXTERNAL_STORAGE");