From abc25e3679a9de2625eadf3e3050a6973f7a6c71 Mon Sep 17 00:00:00 2001 From: Dan Egnor Date: Wed, 13 May 2009 19:22:08 -0700 Subject: [PATCH] Add intent for gservices override, and handle empty arguments properly in the "am" utility. --- cmds/am/am | 2 +- core/java/android/provider/Settings.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmds/am/am b/cmds/am/am index a5b13f9eb5ae0..c823634982420 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 "$@" diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 14ef8108ad5d3..ed5520d1b69c6 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2171,6 +2171,13 @@ public final class Settings { 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 @@ public final class Settings { return "android-" + Long.toHexString(androidId); } } -