diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 8 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 3329025..abb1871 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -630,7 +630,9 @@ public final class AssetManager implements AutoCloseable { public final int addAssetPath(String path) { synchronized (this) { int res = addAssetPathNative(path); - makeStringBlocks(mStringBlocks); + if (mStringBlocks != null) { + makeStringBlocks(mStringBlocks); + } return res; } } @@ -650,7 +652,9 @@ public final class AssetManager implements AutoCloseable { synchronized (this) { int res = addOverlayPathNative(idmapPath, themeApkPath, resApkPath, targetPkgPath, prefixPath); - makeStringBlocks(mStringBlocks); + if (mStringBlocks != null) { + makeStringBlocks(mStringBlocks); + } return res; } } diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 0dd4b40..03ce768 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -513,6 +513,9 @@ <!-- Operating volatage for wifi radio. 0 by default--> <integer translatable="false" name="config_wifi_operating_voltage_mv">0</integer> + <!-- Wifi framework supports ECBM mode --> + <bool translatable="false" name="config_wifi_ecbm_mode_change">true</bool> + <!-- Flag indicating whether the we should enable the automatic brightness in Settings. Software implementation will be used if config_hardware_auto_brightness_available is not set --> <bool name="config_automatic_brightness_available">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1173069..834980f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -293,6 +293,7 @@ <java-symbol type="bool" name="config_useFixedVolume" /> <java-symbol type="bool" name="config_forceDefaultOrientation" /> <java-symbol type="bool" name="config_wifi_batched_scan_supported" /> + <java-symbol type="bool" name="config_wifi_ecbm_mode_change" /> <java-symbol type="bool" name="config_enableMultiUserUI"/> <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/> <java-symbol type="bool" name="config_hasRecents" /> |