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

Commit cf1a9bb8 authored by Gaurav Bhola's avatar Gaurav Bhola Committed by Automerger Merge Worker
Browse files

Merge "Add a new boolean resource to reset the AirPlane mode after during... 

Merge "Add a new boolean resource to reset the AirPlane mode after during boot." into sc-v2-dev am: f89a8fde

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401462

Change-Id: Ic23eddad3f5bf76802407e23bb842bf96c0b9a02
parents 6837ea26 f89a8fde

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -5134,4 +5134,10 @@ 
        <item>@array/config_mainBuiltInDisplayWaterfallCutout</item>

        <item>@array/config_secondaryBuiltInDisplayWaterfallCutout</item>

    </array>



    <!-- Whether the airplane mode should be reset when device boots in non-safemode after exiting

         from safemode.

         This flag should be enabled only when the product does not have any UI to toggle airplane

         mode like automotive devices.-->

    <bool name="config_autoResetAirplaneMode">false</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2217,6 +2217,7 @@ 
  <java-symbol type="string" name="config_primaryLocationTimeZoneProviderPackageName" />

  <java-symbol type="bool" name="config_enableSecondaryLocationTimeZoneProvider" />

  <java-symbol type="string" name="config_secondaryLocationTimeZoneProviderPackageName" />

  <java-symbol type="bool" name="config_autoResetAirplaneMode" />



  <java-symbol type="layout" name="resolver_list" />

  <java-symbol type="id" name="resolver_list" />

services/java/com/android/server/SystemServer.java

+3 −0
Original line number Diff line number Diff line
@@ -1587,6 +1587,9 @@ public final class SystemServer implements Dumpable { 
            // all listeners have the chance to react with special handling.

            Settings.Global.putInt(context.getContentResolver(),

                    Settings.Global.AIRPLANE_MODE_ON, 1);

        } else if (context.getResources().getBoolean(R.bool.config_autoResetAirplaneMode)) {

            Settings.Global.putInt(context.getContentResolver(),

                    Settings.Global.AIRPLANE_MODE_ON, 0);

        }



        StatusBarManagerService statusBar = null;