| author | Zhiwei Gong <zhiwei.gong@amlogic.com> | 2015-05-29 06:22:31 (GMT) |
|---|---|---|
| committer | zhiwei.gong <zhiwei.gong@amlogic.com> | 2015-05-29 07:36:36 (GMT) |
| commit | 9e0f7e2a6987e4733ec01705b4d28ac4274cec6b (patch) | |
| tree | d9cd064c5d9165d8f264ef4b8233e8b8f4f3d3c9 | |
| parent | 21c958fb00ee329b666c7a640e3084456a2438c7 (diff) | |
| download | PPPoE-9e0f7e2a6987e4733ec01705b4d28ac4274cec6b.zip PPPoE-9e0f7e2a6987e4733ec01705b4d28ac4274cec6b.tar.gz PPPoE-9e0f7e2a6987e4733ec01705b4d28ac4274cec6b.tar.bz2 | |
PD#106581:fix pppoe dialog Cause windows leaked
Change-Id: I3c411e753bd6cae72e668b5dcc5c005a7b927154
| -rw-r--r-- | src/com/droidlogic/PPPoE/PPPoEActivity.java | 19 | ||||
| -rw-r--r-- | src/com/droidlogic/PPPoE/PppoeConfigDialog.java | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/com/droidlogic/PPPoE/PPPoEActivity.java b/src/com/droidlogic/PPPoE/PPPoEActivity.java index 6be6d2d..2fdb31d 100644 --- a/src/com/droidlogic/PPPoE/PPPoEActivity.java +++ b/src/com/droidlogic/PPPoE/PPPoEActivity.java @@ -37,10 +37,7 @@ public class PPPoEActivity extends Activity { setContentView(R.layout.main); Log.d(TAG, "Create PppoeConfigDialog"); - mPppoeConfigDialog = new PppoeConfigDialog(this); mSystemControlManager = new SystemControlManager(this); - ConnectivityManager cm = (ConnectivityManager)this.getSystemService - ( Context.CONNECTIVITY_SERVICE); String eth_link = mSystemControlManager.readSysFs("/sys/class/ethernet/linkspeed"); if (eth_link.contains("unlink")) { Toast toast = Toast.makeText(this,this.getResources().getString(R.string.please_insert_the_cable),Toast.LENGTH_LONG); @@ -48,6 +45,9 @@ public class PPPoEActivity extends Activity { toast.show(); finish(); } + mPppoeConfigDialog = new PppoeConfigDialog(this); + ConnectivityManager cm = (ConnectivityManager)this.getSystemService + ( Context.CONNECTIVITY_SERVICE); NetworkInfo info = cm.getActiveNetworkInfo(); if (info != null) { @@ -65,8 +65,17 @@ public class PPPoEActivity extends Activity { Log.d(TAG, "GW: " + mPppoeInfo.getRouteAddr()); Log.d(TAG, "DNS: " + mPppoeInfo.getDnsAddr()); } + if (mPppoeConfigDialog != null) { + Log.d(TAG, "Show PppoeConfigDialog"); + mPppoeConfigDialog.show(); + } + } - Log.d(TAG, "Show PppoeConfigDialog"); - mPppoeConfigDialog.show(); + + @Override + public void onDestroy() { + if (mPppoeConfigDialog != null) + mPppoeConfigDialog.dismiss(); + mPppoeConfigDialog=null; } } diff --git a/src/com/droidlogic/PPPoE/PppoeConfigDialog.java b/src/com/droidlogic/PPPoE/PppoeConfigDialog.java index fa0c188..cefa8a2 100644 --- a/src/com/droidlogic/PPPoE/PppoeConfigDialog.java +++ b/src/com/droidlogic/PPPoE/PppoeConfigDialog.java @@ -355,6 +355,11 @@ public class PppoeConfigDialog extends AlertDialog implements DialogInterface.On mDial.setEnabled(false); } } + @Override + public void dismiss() { + Log.d(TAG, "dismiss"); + super.dismiss(); + } void showWaitDialog(int id) { |