diff options
| -rwxr-xr-x | cmds/am/am | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -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 14ef810..ed5520d 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); } } - |