diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-09-20 11:00:23 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-09-20 11:00:23 +0200 |
| commit | cfe800509413a00fa51f491574b25773ee20dffd (patch) | |
| tree | b336db06a4f8e8beccaa91b6c0e17026ca831cdc /app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | |
| parent | 7e7c1454f9a6d45b0f1ccf4e0242f814089d25a8 (diff) | |
| parent | 7780f13af9ad5a58d3f87ff4cc76ded6e79e59f5 (diff) | |
Merge branch 'feature/Restart-the-service-after-being-unexpectedly-killed-by-Android-#5934' into develop
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/LaunchVPN.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java index 3f80eef0..a424a489 100644 --- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -113,6 +113,7 @@ public class LaunchVPN extends Activity { } } + @Override protected void onActivityResult (int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); |