Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gaurav Bhola
2021-07-30 18:45:00 +00:00
committed by Android (Google) Code Review
parent a50aa7c835 f8faf50234
commit f89a8fdefc
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/values/config.xml
View File

@@ -5134,4 +5134,10 @@
<item>@array/config_mainBuiltInDisplayWaterfallCutout</item> <item>@array/config_mainBuiltInDisplayWaterfallCutout</item>
<item>@array/config_secondaryBuiltInDisplayWaterfallCutout</item> <item>@array/config_secondaryBuiltInDisplayWaterfallCutout</item>
</array> </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> </resources>

1
core/res/res/values/symbols.xml
View File

@@ -2217,6 +2217,7 @@
<java-symbol type="string" name="config_primaryLocationTimeZoneProviderPackageName" /> <java-symbol type="string" name="config_primaryLocationTimeZoneProviderPackageName" />
<java-symbol type="bool" name="config_enableSecondaryLocationTimeZoneProvider" /> <java-symbol type="bool" name="config_enableSecondaryLocationTimeZoneProvider" />
<java-symbol type="string" name="config_secondaryLocationTimeZoneProviderPackageName" /> <java-symbol type="string" name="config_secondaryLocationTimeZoneProviderPackageName" />
<java-symbol type="bool" name="config_autoResetAirplaneMode" />
<java-symbol type="layout" name="resolver_list" /> <java-symbol type="layout" name="resolver_list" />
<java-symbol type="id" name="resolver_list" /> <java-symbol type="id" name="resolver_list" />

3
services/java/com/android/server/SystemServer.java
View File

@@ -1586,6 +1586,9 @@ public final class SystemServer implements Dumpable {
// all listeners have the chance to react with special handling. // all listeners have the chance to react with special handling.
Settings.Global.putInt(context.getContentResolver(), Settings.Global.putInt(context.getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON, 1); 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; StatusBarManagerService statusBar = null;