Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71'

* commit 'abc25e3679a9de2625eadf3e3050a6973f7a6c71':
  Add intent for gservices override, and handle empty arguments properly
This commit is contained in:
Dan Egnor
2009-05-15 13:31:55 -07:00
committed by The Android Open Source Project
parent 695c518a1b abc25e3679
commit e18b02cc2c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/am/am
View File

@@ -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 "$@"

8
core/java/android/provider/Settings.java
View File

@@ -2187,6 +2187,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();
@@ -3279,4 +3286,3 @@ public final class Settings {
return "android-" + Long.toHexString(androidId);
}
}