From: Martin Vajnar Date: Fri, 9 Nov 2018 19:20:30 +0000 (+0100) Subject: Android Shape: Fix possible memory leaks X-Git-Url: http://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/0ae5263d19ed1c3157205e35e837ff01d0de194a Android Shape: Fix possible memory leaks Fixe as per https://developer.android.com/reference/android/content/ContextWrapper#getApplicationContext() --- diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java index 557482d..8a13a39 100644 --- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java +++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/PublisherActivity.java @@ -104,7 +104,7 @@ public class PublisherActivity extends Activity { SHAPE_HEIGHT = (int) (this.getWindowManager().getDefaultDisplay().getHeight() * 45 / BoxType.DESTINATION_HEIGHT); // From Robot_Demo project. - wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); + wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); wifiLock = (WifiLock) wifiManager.createWifiLock(( (android.os.Build.VERSION.SDK_INT >= 12) ? WifiManager.WIFI_MODE_FULL_HIGH_PERF diff --git a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java index 0478f4d..adf735c 100644 --- a/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java +++ b/orte/contrib/shape_android/src/org/ocera/orte/shape_android/SettingsActivity.java @@ -45,7 +45,7 @@ public class SettingsActivity extends PreferenceActivity super.onCreate(savedInstanceState); addPreferencesFromResource(R.layout.activity_settings); - WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); EditTextPreference pref = (EditTextPreference) findPreference("prefManagers"); //TODO should be done in respect to @strings