From 86e93ffa2df41f83b6819081d8720dd564920e08 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 4 Sep 2014 16:51:37 +0800
Subject: [PATCH] try to fix #114

---
 src/main/AndroidManifest.xml                             | 6 ++----
 .../com/github/shadowsocks/ShadowsocksVpnService.scala   | 9 ---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index cfcce211..3c368e13 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="69"
-    android:versionName="2.2.1">
+    android:versionCode="70"
+    android:versionName="2.2.2">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -75,14 +75,12 @@
 
     <service
         android:name=".ShadowsocksNatService"
-        android:process=":proxy"
         android:exported="false">
     </service>
 
     <service
         android:name=".ShadowsocksVpnService"
         android:label="@string/app_name"
-        android:process=":vpn"
         android:permission="android.permission.BIND_VPN_SERVICE"
         android:exported="false">
       <intent-filter>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index a0944a16..1836e8f5 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -370,15 +370,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     notificationManager.cancel(1)
   }
 
-  override def onStartCommand(intent: Intent, flags: Int, startId: Int): Int =
-  {
-    Service.START_STICKY
-  }
-
-  override def onTaskRemoved(intent: Intent) {
-    stopRunner()
-  }
-
   override def stopBackgroundService() {
     stopRunner()
   }