Merge tag 'android-12.0.0_r18' into staging/lineage-19.0_merge-android-12.0.0_r18
Android 12.0.0 release 18 * tag 'android-12.0.0_r18' of https://android.googlesource.com/platform/packages/apps/Settings: (155 commits) Update "Mobile network standby" attribute label into "Mobile network" Add location check for Wifi Scanning notify message Import translations. DO NOT MERGE ANYWHERE Update UWB toggle display after lifecycle events. The Network name is not same as statusbar at SIM Edit page For Internet Picker - Information about Wi-Fi scanning when Wi-Fi is off Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Add WIFI_SCANNING_SETTINGS action to Settings Add String for information about Wi-Fi scanning when Wi-Fi is off. [Settings] Crash when resetting downloaded eSIM Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE Import translations. DO NOT MERGE ANYWHERE BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog ... Conflicts: res/values-as/strings.xml res/values-kk/strings.xml res/xml/mobile_network_settings.xml src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java Change-Id: Ia3410877d7548fd29a641e169ab79db7e8ff2ee6
Loading
Please register or sign in to comment