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

Skip to content
Unverified Commit d572da88 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r38' into staging/lineage-18.1_merge-android-11.0.0_r38

Android 11.0.0 Release 38 (RQ3A.210605.005)

* tag 'android-11.0.0_r38':
  Hide non-system overlay window on ActivityPicker
  Hide non-system overlay window on ActivityPicker
  Revert "Hide non-system overlay window on ActivityPicker"
  Hide non-system overlay window on ActivityPicker
  Prevent disconnecting admin-configured VPN
  Only display single line for title
  Revert "Only display single line for title"
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Hide edit menu if network is uneditable
  [DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"
  Import translations. DO NOT MERGE ANYWHERE
  Only display single line for title
  Hide non-system overlay window on ActivityPicker
  Hide non-system overlay window on ActivityPicker
  Hide non-system overlay window on ActivityPicker
  Hide non-system overlay window on ActivityPicker
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Prevent using invalid result uri during multi user image change
  Prevent using invalid result uri during multi user image change
  Prevent using invalid result uri during multi user image change
  Prevent using invalid result uri during multi user image change
  Prevent using invalid result uri during multi user image change
  Prevent using invalid result uri during multi user image change
  Only default APN type can make preference selectable.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [Telephony settings] Settings crashes when rotate screen in Preferred network type
  [Security Report] Fix Settings WifiScanModeActivity Overlaid issue
  Fix security issue
  [Security Report] Fix Settings WifiScanModeActivity Overlaid issue
  [Security Report] Fix Settings WifiScanModeActivity Overlaid issue
  [Security Report] Fix Settings WifiScanModeActivity Overlaid issue
  [Security Report] Fix Settings WifiScanModeActivity Overlaid issue
  Avoid wrong telephonymanager with wrong sub id.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add adaptive charging to the top level settings menu
  RESTRICT AUTOMERGE Update String
  RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
  RESTRICT AUTOMERGE Update String
  RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
  RESTRICT AUTOMERGE Update String
  RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
  RESTRICT AUTOMERGE Update String
  RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
  Fix robotests failure in connectivity settings
  Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice

Conflicts:
	res/values-fr-rCA/strings.xml

Change-Id: I37fe3c71cfe630fd9bd809e73a900ee63cd075ce
parents f26c1ec7 d6e4d156
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment