Merge changes I4011db5c,I622bc5fa

* changes:
  less logging
  A system setting for "advanced settings."

core/java/android/content/Intent.java

@@ -1907,6 +1907,21 @@ public class Intent implements Parcelable, Cloneable {
     public static final String ACTION_HDMI_AUDIO_PLUG =
             "android.intent.action.HDMI_AUDIO_PLUG";
 
+    /**
+     * <p>Broadcast Action: The user has switched on advanced settings in the settings app:</p>
+     * <ul>
+     *   <li><em>state</em> - A boolean value indicating whether the settings is on or off.</li>
+     * </ul>
+     *
+     * <p class="note">This is a protected intent that can only be sent
+     * by the system.
+     *
+     * @hide
+     */
+    //@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+    public static final String ACTION_ADVANCED_SETTINGS_CHANGED
+            = "android.intent.action.ADVANCED_SETTINGS";
+
     /**
      * Broadcast Action: An outgoing call is about to be placed.
      *

core/java/android/provider/Settings.java

@@ -1102,6 +1102,18 @@ public final class Settings {
          */
         public static final int END_BUTTON_BEHAVIOR_DEFAULT = END_BUTTON_BEHAVIOR_SLEEP;
 
+        /**
+         * Is advanced settings mode turned on. 0 == no, 1 == yes
+         * @hide
+         */
+        public static final String ADVANCED_SETTINGS = "advanced_settings";
+
+        /**
+         * ADVANCED_SETTINGS default value.
+         * @hide
+         */
+        public static final int ADVANCED_SETTINGS_DEFAULT = 0;
+
         /**
          * Whether Airplane Mode is on.
          */