| author | Chaomin Zheng <chaomin.zheng@amlogic.com> | 2017-08-14 11:16:37 (GMT) |
|---|---|---|
| committer | Chaomin Zheng <chaomin.zheng@amlogic.com> | 2017-08-16 08:56:47 (GMT) |
| commit | 76b31d2b081029c62503b5dd95119d7dc09c6bae (patch) | |
| tree | ddb765bc588d16730ed930acab0f5d6db400c970 | |
| parent | 4ca96dbb5524029905723cda1b4e4b0407c03f7b (diff) | |
| download | pppoe-76b31d2b081029c62503b5dd95119d7dc09c6bae.zip pppoe-76b31d2b081029c62503b5dd95119d7dc09c6bae.tar.gz pppoe-76b31d2b081029c62503b5dd95119d7dc09c6bae.tar.bz2 | |
PPPoE:intergrate pppoe modules[2/5]
PD# 146472
generate amlogic files to vendor
Change-Id: Ibb68fa5ea4aa6285b2d8d3626ff739214d148d4b
| -rw-r--r-- | java/Android.mk | 4 | ||||
| -rw-r--r-- | java/src/com/droidlogic/pppoe/PppoeStateTracker.java | 32 | ||||
| -rw-r--r-- | jni/Android.mk | 6 |
3 files changed, 27 insertions, 15 deletions
diff --git a/java/Android.mk b/java/Android.mk index dbd7cc0..32e53e4 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -20,5 +20,9 @@ LOCAL_MODULE := droidlogic.frameworks.pppoe LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_MODULE_TAGS := optional +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif + include $(BUILD_JAVA_LIBRARY) diff --git a/java/src/com/droidlogic/pppoe/PppoeStateTracker.java b/java/src/com/droidlogic/pppoe/PppoeStateTracker.java index 21c0b40..bc85d8b 100644 --- a/java/src/com/droidlogic/pppoe/PppoeStateTracker.java +++ b/java/src/com/droidlogic/pppoe/PppoeStateTracker.java @@ -235,9 +235,11 @@ public class PppoeStateTracker /*implements NetworkStateTracker*/ { } public void StartPolling() { - Slog.i(TAG, "start monitoring"); - mMonitor.startMonitoring(); - Slog.i(TAG, "end monitoring"); + if (mServiceStarted) { + Slog.i(TAG, "start monitoring"); + mMonitor.startMonitoring(); + Slog.i(TAG, "end monitoring"); + } } //@Override public boolean isAvailable() { @@ -247,19 +249,21 @@ public class PppoeStateTracker /*implements NetworkStateTracker*/ { //@Override public boolean reconnect() { - Slog.i(TAG, ">>>reconnect"); - try { - if (mEM.getPppoeState() != PppoeManager.PPPOE_STATE_DISABLED ) { - // maybe this is the first time we run, so set it to enabled - mEM.setPppoeEnabled(true); - if (!mEM.pppoeConfigured()) { - mEM.pppoeSetDefaultConf(); + if (mServiceStarted) { + Slog.i(TAG, ">>>reconnect"); + try { + if (mEM.getPppoeState() != PppoeManager.PPPOE_STATE_DISABLED ) { + // maybe this is the first time we run, so set it to enabled + mEM.setPppoeEnabled(true); + if (!mEM.pppoeConfigured()) { + mEM.pppoeSetDefaultConf(); + } + return resetInterface(); } - return resetInterface(); + } catch (UnknownHostException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - } catch (UnknownHostException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } return false; diff --git a/jni/Android.mk b/jni/Android.mk index 3ce7c94..30799c2 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -11,9 +11,13 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ libgui \ - libnativehelper + libnativehelper \ + libandroid_runtime LOCAL_MODULE := libpppoe +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK) +LOCAL_PROPRIETARY_MODULE := true +endif include $(BUILD_SHARED_LIBRARY) |