commit e18b02cc2c142fe5cf4a1c9753822876931b7da8
author Dan Egnor <egnor@google.com> Fri May 15 13:31:55 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri May 15 13:31:55 2009 -0700
tree 5d80c6be49c06b8abdb64ab229bdcb1588ab342f
parent 695c518a1b0bb291bb7f13622b5947e68dc0d3f7
parent abc25e3679a9de2625eadf3e3050a6973f7a6c71

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

Merge commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71'

* commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71':
  Add intent for gservices override, and handle empty arguments properly

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 79b4e97..ada4a20 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2187,6 +2187,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();
 
@@ -3279,4 +3286,3 @@
         return "android-" + Long.toHexString(androidId);
     }
 }
-