diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2011-05-03 10:57:50 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <github@cerqueira.org> | 2011-11-18 00:14:44 +0000 |
| commit | f518a59fb0b3ebcc03aa063a8c13fd7ad62d4390 (patch) | |
| tree | 42229114b824a9b056a7c3f31ed32809837cd8f9 | |
| parent | 57b1db5f9a9696195acb1f5ac19a70258a897839 (diff) | |
| download | frameworks_base-f518a59fb0b3ebcc03aa063a8c13fd7ad62d4390.zip frameworks_base-f518a59fb0b3ebcc03aa063a8c13fd7ad62d4390.tar.gz frameworks_base-f518a59fb0b3ebcc03aa063a8c13fd7ad62d4390.tar.bz2 | |
Allow a target to specify its own mobile iface name
Fixes lack of traffic indicators when the interface isn't named
"rmnet0"
Change-Id: I68247cd2765cb4fe1bfeb0ec77e0a7a71ed3df44a
| -rw-r--r-- | core/jni/Android.mk | 4 | ||||
| -rw-r--r-- | core/jni/android_net_TrafficStats.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 59a03e7..a83fd65 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -242,6 +242,10 @@ endif LOCAL_MODULE:= libandroid_runtime +ifneq ($(BOARD_MOBILEDATA_INTERFACE_NAME),) + LOCAL_CFLAGS += -DMOBILE_IFACE_NAME='$(BOARD_MOBILEDATA_INTERFACE_NAME)' +endif + include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp index 7a61432..1e3cf6d 100644 --- a/core/jni/android_net_TrafficStats.cpp +++ b/core/jni/android_net_TrafficStats.cpp @@ -64,6 +64,9 @@ static jlong readNumber(char const* filename) { } static const char* mobile_iface_list[] = { +#ifdef MOBILE_IFACE_NAME + MOBILE_IFACE_NAME, +#endif "rmnet0", "rmnet1", "rmnet2", |