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

Commit 8bfefbbb authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge \"Add global settings for cell radio state\" into nyc-mr1-dev 

am: d4ac4c77

Change-Id: I5698d08dcc6854ceffb08debecf3fa443750fab0
parents 2c0f1a87 d4ac4c77

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -9074,6 +9074,12 @@ public final class Settings { 
         */

        public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =

                "system_navigation_keys_enabled";



        /**

         * Whether cell is enabled/disabled

         * @hide

         */

        public static final String CELL_ON = "cell_on";

    }



    /**

telephony/java/com/android/internal/telephony/PhoneConstants.java

+10 −0
Original line number Diff line number Diff line
@@ -208,4 +208,14 @@ public class PhoneConstants { 
    public static final int AUTH_CONTEXT_EAP_SIM = 128;

    public static final int AUTH_CONTEXT_EAP_AKA = 129;

    public static final int AUTH_CONTEXT_UNDEFINED = -1;



    /**

     * Value for the global property CELL_ON

     *  0: Cell radio is off

     *  1: Cell radio is on

     *  2: Cell radio is off because airplane mode is enabled

     */

    public static final int CELL_OFF_FLAG = 0;

    public static final int CELL_ON_FLAG = 1;

    public static final int CELL_OFF_DUE_TO_AIRPLANE_MODE_FLAG = 2;

}