Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e18b02cc authored by Dan Egnor's avatar Dan Egnor Committed by The Android Open Source Project
Browse files

am abc25e36: Add intent for gservices override, and handle empty arguments... 

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

Merge commit 'abc25e36'

* commit 'abc25e36':
  Add intent for gservices override, and handle empty arguments properly
parents 695c518a abc25e36

cmds/am/am

+1 −1
Original line number Diff line number Diff line
@@ -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

+7 −1
Original line number Diff line number Diff line
@@ -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);

    }

}