commit abc25e3679a9de2625eadf3e3050a6973f7a6c71
author Dan Egnor <egnor@google.com> Wed May 13 19:22:08 2009 -0700
committer Dan Egnor <egnor@google.com> Fri May 15 11:59:31 2009 -0700
tree f72e763ae34c1db2a78daffbdf928712b58a9d63
parent a38b427a7a6d2658dc3e3083bc6c263a3d4d7af3

Add intent for gservices override, and handle empty arguments properly
in the "am" utility.

cmds/am/am

diff --git a/cmds/am/am b/cmds/am/am
index a5b13f9..c823634 100755
--- a/cmds/am/am
+++ b/cmds/am/am
@@ -3,5 +3,5 @@
 #
 base=/system
 export CLASSPATH=$base/framework/am.jar
-exec app_process $base/bin com.android.commands.am.Am $*
+exec app_process $base/bin com.android.commands.am.Am "$@"
 

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 14ef810..ed5520d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2171,6 +2171,13 @@
         public static final String CHANGED_ACTION =
             "com.google.gservices.intent.action.GSERVICES_CHANGED";
 
+        /**
+         * Intent action to override Gservices for testing.  (Requires WRITE_GSERVICES permission.)
+         */
+        @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+        public static final String OVERRIDE_ACTION =
+            "com.google.gservices.intent.action.GSERVICES_OVERRIDE";
+
         private static volatile NameValueCache mNameValueCache = null;
         private static final Object mNameValueCacheLock = new Object();
 
@@ -3258,4 +3265,3 @@
         return "android-" + Long.toHexString(androidId);
     }
 }
-