diff options
author | Hung-ying Tyan <tyanh@google.com> | 2009-07-19 21:14:44 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-19 21:14:44 -0700 |
commit | 79b7c68d5a1979a67d1d5ec6b9229aaab79cad3e (patch) | |
tree | 13ea113b6eb2a20628c94f07d728ab21c315b5b0 /packages | |
parent | b8b117e1e7fffdeb245afd673068924b038d08d6 (diff) | |
parent | 2c53de69045557a51290b50dfda2ddb6c7d01912 (diff) | |
download | frameworks_base-79b7c68d5a1979a67d1d5ec6b9229aaab79cad3e.zip frameworks_base-79b7c68d5a1979a67d1d5ec6b9229aaab79cad3e.tar.gz frameworks_base-79b7c68d5a1979a67d1d5ec6b9229aaab79cad3e.tar.bz2 |
am 2c53de69: Stop a daemon before starting it
Merge commit '2c53de69045557a51290b50dfda2ddb6c7d01912'
* commit '2c53de69045557a51290b50dfda2ddb6c7d01912':
Stop a daemon before starting it
Diffstat (limited to 'packages')
-rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/AndroidServiceProxy.java | 7 | ||||
-rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/AndroidServiceProxy.java b/packages/VpnServices/src/com/android/server/vpn/AndroidServiceProxy.java index c6c9452..e4c070f 100644 --- a/packages/VpnServices/src/com/android/server/vpn/AndroidServiceProxy.java +++ b/packages/VpnServices/src/com/android/server/vpn/AndroidServiceProxy.java @@ -106,6 +106,13 @@ public class AndroidServiceProxy extends ProcessProxy { @Override protected void performTask() throws IOException { String svc = mServiceName; + Log.d(mTag, "----- Stop the daemon just in case: " + mServiceName); + SystemProperties.set(SVC_STOP_CMD, mServiceName); + if (!blockUntil(SVC_STATE_STOPPED, 5)) { + throw new IOException("cannot start service anew: " + svc + + ", it is still running"); + } + Log.d(mTag, "+++++ Start: " + svc); SystemProperties.set(SVC_START_CMD, svc); diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java index 7eb3287..32b8e51 100644 --- a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java +++ b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java @@ -57,6 +57,7 @@ public class VpnServiceBinder extends Service { public void onStart (Intent intent, int startId) { super.onStart(intent, startId); setForeground(true); + android.util.Log.d("VpnServiceBinder", "becomes a foreground service"); } public IBinder onBind(Intent intent) { |