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

Add intent for gservices override, and handle empty arguments properly

Browse Source 
in the "am" utility.
This commit is contained in:
Dan Egnor
2009-05-13 19:22:08 -07:00
parent a38b427a7a
commit abc25e3679
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 base=/system
export CLASSPATH=$base/framework/am.jar 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

@@ -2171,6 +2171,13 @@ public final class Settings {
public static final String CHANGED_ACTION = public static final String CHANGED_ACTION =
"com.google.gservices.intent.action.GSERVICES_CHANGED"; "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 volatile NameValueCache mNameValueCache = null;
private static final Object mNameValueCacheLock = new Object(); private static final Object mNameValueCacheLock = new Object();
@@ -3258,4 +3265,3 @@ public final class Settings {
return "android-" + Long.toHexString(androidId); return "android-" + Long.toHexString(androidId);
} }
} }