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

Commit fcdebf88 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I4011db5c,I622bc5fa 

* changes:
  less logging
  A system setting for "advanced settings."
parents 5e0ecb75 53859740

core/java/android/content/Intent.java

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

+12 −0
Original line number Diff line number Diff line
@@ -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.

         */

services/java/com/android/server/BatteryService.java

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ class BatteryService extends Binder { 
        intent.putExtra(BatteryManager.EXTRA_TECHNOLOGY, mBatteryTechnology);

        intent.putExtra(BatteryManager.EXTRA_INVALID_CHARGER, mInvalidCharger);



        if (true) {

        if (false) {

            Slog.d(TAG, "level:" + mBatteryLevel +

                    " scale:" + BATTERY_SCALE + " status:" + mBatteryStatus +

                    " health:" + mBatteryHealth +  " present:" + mBatteryPresent +