Commits · 50fb3a99b6ca6b103b40b08b66ea2ac457e3455e · e / os / android_frameworks_base · GitLab

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

This project is mirrored from https://github.com/LineageOS/android_frameworks_base.git. Pull mirroring updated Aug 23, 2025.

Aug 17, 2021
- [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"... · 50fb3a99
  Xin Li authored Aug 17, 2021
  50fb3a99
- Merge "Revert from .equals to == to prevent NPE." into sc-v2-dev am: 4152cab0 · 2802ddb6
  TreeHugger Robot authored Aug 17, 2021
  2802ddb6
- Merge "Revert from .equals to == to prevent NPE." into sc-v2-dev · 4152cab0
  TreeHugger Robot authored Aug 17, 2021
  
  4152cab0
- Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev am: 57f6f212 am: 0ee2fb3c · b2d91918
  Dave Mankoff authored Aug 17, 2021
  b2d91918
- [automerger skipped] Merge "Make foreground color selection in SmartReplyView... · 411e8810
  Jeff DeCew authored Aug 17, 2021
  411e8810
- [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · da406403
  TreeHugger Robot authored Aug 17, 2021
  da406403
- [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 23c9d53c
  TreeHugger Robot authored Aug 17, 2021
  23c9d53c
- Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev am: 57f6f212 am: 1f02f138 · 476df837
  Dave Mankoff authored Aug 17, 2021
  476df837
- Merge "Make foreground color selection in SmartReplyView and RemoteInputView... · 44a42d29
  Jeff DeCew authored Aug 17, 2021
  44a42d29
- [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"... · a75effc5
  Xin Li authored Aug 17, 2021
  a75effc5
- Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev am: 57f6f212 · 0ee2fb3c
  Dave Mankoff authored Aug 17, 2021
  0ee2fb3c
- Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev am: 57f6f212 · 1f02f138
  Dave Mankoff authored Aug 17, 2021
  1f02f138
- Merge "Make foreground color selection in SmartReplyView and RemoteInputView... · e5a0d109
  Jeff DeCew authored Aug 17, 2021
  e5a0d109
- Merge "Make foreground color selection in SmartReplyView and RemoteInputView... · 7945079a
  Jeff DeCew authored Aug 17, 2021
  7945079a
- Merge "Pause Primary Prox when Secondary Running." into sc-qpr1-dev · 57f6f212
  Dave Mankoff authored Aug 17, 2021
  
  57f6f212
- Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev · e5d33100
  TreeHugger Robot authored Aug 17, 2021
  
  e5d33100
- Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev · a7cf213c
  TreeHugger Robot authored Aug 17, 2021
  
  a7cf213c
- Merge "Make foreground color selection in SmartReplyView and RemoteInputView... · 0c43fe4e
  Jeff DeCew authored Aug 17, 2021
  0c43fe4e
- [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"... · 0595a3bf
  Xin Li authored Aug 17, 2021
  0595a3bf
- Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master · e7449820
  Xin Li authored Aug 17, 2021
  
  e7449820
- Merge "New APIs for immersive audio" into sc-v2-dev am: da474d3b · 23597d34
  Jean-Michel Trivi authored Aug 17, 2021
  23597d34
- Merge "New APIs for immersive audio" into sc-v2-dev · da474d3b
  Jean-Michel Trivi authored Aug 17, 2021
  
  da474d3b
- Merge "Auto adjust screen brightness when display state on while docked" into... · 69eeff45
  Beverly Tai authored Aug 17, 2021
  69eeff45
- Merge "Auto adjust screen brightness when display state on while docked" into... · f519f5ff
  Beverly Tai authored Aug 17, 2021
  f519f5ff
- Revert from .equals to == to prevent NPE. · 3c8936a8
  Dave Mankoff authored Aug 17, 2021
  3c8936a8
- Merge "Auto adjust screen brightness when display state on while docked" into... · da613e88
  Beverly Tai authored Aug 17, 2021
  da613e88
- Merge "Auto adjust screen brightness when display state on while docked" into... · 66d169e4
  Beverly Tai authored Aug 17, 2021
  66d169e4
- Merge "Auto adjust screen brightness when display state on while docked" into sc-qpr1-dev · b8769ea4
  Beverly Tai authored Aug 17, 2021
  
  b8769ea4
- Merge "1/N Move plugin loading into PluginInstanceManager." into sc-v2-dev am: 498d436d · 875d9179
  Dave Mankoff authored Aug 17, 2021
  875d9179
- Merge "1/N Move plugin loading into PluginInstanceManager." into sc-v2-dev · 498d436d
  Dave Mankoff authored Aug 17, 2021
  
  498d436d
- Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad am:... · 975e9651
  Treehugger Robot authored Aug 17, 2021
  975e9651
- Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad am: c6a9f2e8 am: 48cecd59 · d9f8d109
  Treehugger Robot authored Aug 17, 2021
  d9f8d109
- Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad am: c6a9f2e8 · 48cecd59
  Treehugger Robot authored Aug 17, 2021
  48cecd59
- Merge "Suppress AIDL warnings: untyped-collection" am: dee731ad · c6a9f2e8
  Treehugger Robot authored Aug 17, 2021
  c6a9f2e8
- Merge "Suppress AIDL warnings: untyped-collection" · dee731ad
  Treehugger Robot authored Aug 17, 2021
  
  dee731ad
- Merge "Add display specific brightness configurations" into sc-v2-dev am: ec29aa26 · 910c9e55
  Fiona Campbell authored Aug 17, 2021
  910c9e55
- Merge "Add display specific brightness configurations" into sc-v2-dev · ec29aa26
  Fiona Campbell authored Aug 17, 2021
  
  ec29aa26
- [automerger skipped] Fix lint error for those module used in mainline module... · 2ffab28e
  Edgar Wang authored Aug 17, 2021
  2ffab28e
- [automerger skipped] Fix lint error for those module used in mainline module... · bc2093f1
  Edgar Wang authored Aug 17, 2021
  bc2093f1
- Fix lint error for those module used in mainline module am: d56251ba am:... · a3380bcc
  Edgar Wang authored Aug 17, 2021
  a3380bcc