commit 088f29f55eebc6862a4cb5dddeaefacf24f74d95
author Jeff Sharkey <jsharkey@android.com> Sun Aug 05 14:55:04 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Mon Aug 06 14:48:49 2012 -0700
tree c641ced2808f01868c146699259d09f3c6f10363
parent 216c181e76ee11a47a0b2a180f9af96740ab38ad

Cleaner controls between Vpn and init services.

Change-Id: I35edf054f4a1190f7fb7b4c48ee832e899c9528b

services/java/com/android/server/connectivity/Vpn.java

diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index d788eba..1232846 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -25,7 +25,6 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
@@ -39,7 +38,7 @@
 import android.os.ParcelFileDescriptor;
 import android.os.Process;
 import android.os.SystemClock;
-import android.os.SystemProperties;
+import android.os.SystemService;
 import android.util.Log;
 
 import com.android.internal.R;
@@ -485,8 +484,7 @@
 
                 // Wait for the daemons to stop.
                 for (String daemon : mDaemons) {
-                    String key = "init.svc." + daemon;
-                    while (!"stopped".equals(SystemProperties.get(key, "stopped"))) {
+                    while (!SystemService.isStopped(daemon)) {
                         checkpoint(true);
                     }
                 }
@@ -519,11 +517,10 @@
 
                     // Start the daemon.
                     String daemon = mDaemons[i];
-                    SystemProperties.set("ctl.start", daemon);
+                    SystemService.start(daemon);
 
                     // Wait for the daemon to start.
-                    String key = "init.svc." + daemon;
-                    while (!"running".equals(SystemProperties.get(key))) {
+                    while (!SystemService.isRunning(daemon)) {
                         checkpoint(true);
                     }
 
@@ -579,8 +576,7 @@
                     // Check if a running daemon is dead.
                     for (int i = 0; i < mDaemons.length; ++i) {
                         String daemon = mDaemons[i];
-                        if (mArguments[i] != null && !"running".equals(
-                                SystemProperties.get("init.svc." + daemon))) {
+                        if (mArguments[i] != null && !SystemService.isRunning(daemon)) {
                             throw new IllegalStateException(daemon + " is dead");
                         }
                     }
@@ -647,7 +643,7 @@
                 // Kill the daemons if they fail to stop.
                 if (mInfo.state == LegacyVpnInfo.STATE_INITIALIZING) {
                     for (String daemon : mDaemons) {
-                        SystemProperties.set("ctl.stop", daemon);
+                        SystemService.stop(daemon);
                     }
                 }