Commits · 7c4670ed542dd7d14ab0fbff28986e91575f05b8 · Farzin Kazemzadeh / platform_frameworks_base-old

Nov 04, 2023
- Merge "job: make charging constraint update criteria customizable" into main · 7c4670ed
  Chen Bai authored 1 year ago
  
  7c4670ed
Nov 03, 2023

Merge "Remove ability to inject aconfig flags." into main · 016b0c94
Dave Mankoff authored 1 year ago

016b0c94
Merge "Stop co-routines whenever the rest to unlock settings toggle is not enabled." into main · dd59a909
Chandru S authored 1 year ago

dd59a909
Merge "Cleanup flag that isn't used." into main · e2ca34f7
Aaron Liu authored 1 year ago

e2ca34f7

Merge "Prevent crash in AccountManager after profile removal." into... · 70867e35

Merge "Prevent crash in AccountManager after profile removal." into udc-qpr-dev am: b224624b am: 9083e3da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25246670

Change-Id: Ibe7d31d8f669d897a93b37c113deca47c5781d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

70867e35

Merge "Fix a typo." into main · 6fff5500
Treehugger Robot authored 1 year ago

6fff5500

Merge "Prevent crash in AccountManager after profile removal." into udc-qpr-dev am: · 9083e3da

Dmitry Dementyev authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25246670

Change-Id: I472b9b582279ba7cd9fe0121394cb9dd8fa599cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9083e3da

Merge "[flexiglass] Support for split layout bouncer." into main · 28938cfa
Ale Nijamkin authored 1 year ago

28938cfa
Merge "Add feature flag for BOOT_COMPLETED FGS restrictions" into main · bad148cc
Kunal Malhotra authored 1 year ago

bad148cc
Merge "Prevent crash in AccountManager after profile removal." into udc-qpr-dev · b224624b
Dmitry Dementyev authored 1 year ago

b224624b
Merge "Avoid holding lock while creating and starting storage session" into main · c06b33a8
Jahdiel Alvarez authored 1 year ago

c06b33a8

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · fef2c199

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 9bcac584 -s ours am: 357dee67 -s ours am: 4fc601ad -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I54240ef64daae5a10be303512ea4b12c701992dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fef2c199

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 89dfbd1a

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours am: 2dad5cb5 -s ours am: 555d03ae -s ours am: 3b2097c8 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: If25d0c5ffa5679aaa528edf98617afdfd8631cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

89dfbd1a

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · dda2749e

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 79f588f6 -s ours am: 147ba65e -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I7780faa5ac46e8c59d08c5fdc45097572fb8e941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dda2749e

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 83de4e67

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours am: 919358ba -s ours am: 39319781 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I861f72a9ebad302a35c8c518f1034f8b0240199d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

83de4e67

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 4fc601ad

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 9bcac584 -s ours am: 357dee67 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I0d9fffb2b34dab0ffa3e8150183970c09d0e187e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4fc601ad

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 3b2097c8

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours am: 2dad5cb5 -s ours am: 555d03ae -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I1bc7f99833a7a273dc23e347ef24dbb73ae04687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3b2097c8

Merge "Enable Partial Screenshare Enterprise Policy Flag" into main · 37e5f673
Daniel Akinola authored 1 year ago

37e5f673
Merge "Reorder the target preparers to install apps before test." into main · 9527d67c
Mateusz Cicheński authored 1 year ago

9527d67c

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · dc121ba2

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 679cb4f4 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I641fd53bf63a18d8ba79cf7368d6511b1a924236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

dc121ba2

[flexiglass] Support for split layout bouncer. · bf203344

Alejandro Nijamkin authored 1 year ago

We want to support a case where the layout of the bouncer is split such
that the message and emergency button appear on one side while the input
entry area appears on the other side. This CL achieves that.

Bug: 304630105
Test: See screenshots in bug
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Ib9c3a8e1bc030068eb386e50c39d230e2e13285b

bf203344

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · a8e8f946

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours am: 24feb6ef -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I779088c04442e0d686fe63b955f759178d2b6670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a8e8f946

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 147ba65e

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 79f588f6 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I4140807e148f2f4b57765d5ecc0d116cbc74dade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

147ba65e

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 39319781

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours am: 919358ba -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I4036ffe4c324cc0bc839836254bd249dae267630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

39319781

Add feature flag for BOOT_COMPLETED FGS restrictions · 7571316d
Kunal authored 1 year ago
```
Bug: 296558535
Test: builds
Change-Id: I70bb64f81db645a7c70e20b7507f06cd742ffe70
```
7571316d

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 357dee67

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours am: 9bcac584 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I4e013d7baed617bcfa422aa27570add38d194f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

357dee67

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 555d03ae

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours am: 2dad5cb5 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I6468d7490ce0b0059d16e9b8de514af5f630e617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

555d03ae

Merge "Keyguard migration, add aconfig flag for bottom area refactor" into main · 5f5f91a4
Brad Hinegardner authored 1 year ago

5f5f91a4

job: make charging constraint update criteria customizable · 171d5602

Chen Bai authored 1 year ago

Make JobScheduler's charging constraint update criteria customizable to
adapt devices other than phone.

The criterias are:
  1. BATTERY_CHARGING_STATE_UPDATE_DELAY
  2. (newly added) BATTERY_CHARGING_STATE_ENFORCE_LEVEL

Their default values are init by SettingsProvider
and configured by res/values/default.xml as:
  - def_battery_charging_state_update_delay_ms
  - def_battery_charging_state_enforce_level

Other device now can override the default values by defining them in
device overlay default.xml.

Test: go/wear-charging-constraints-verification
BUG: 258718987
BUG: 308679533
Change-Id: I5d329db0ab67df203353f18a5afa5f9a182b5867

171d5602

Merge "Stop biometric prompt dismissal animation from cancelling" into main · ff0bd87d
Diya Bera authored 1 year ago

ff0bd87d
Merge "Lower EJ execution limit to 10 minutes." into main · 5a57f77c
Kweku Adams authored 1 year ago

5a57f77c
Merge changes from topic "pointer-icon-refactor-mouse" into main · 8678d0ce
Prabir Pradhan authored 1 year ago
```
* changes:
  Address internal comments: Pointer icon refactor for mouse
  Pointer icon refactor for mouse (base)
```
8678d0ce
Merge "[flexiglass] Added isUserInputOngoing to transition model" into main · 34caab7a
Shawn Lee authored 1 year ago

34caab7a

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 9bcac584

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: Iab9de369096e0877b1f7ca3adf01bd61aaff6e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9bcac584

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 2dad5cb5

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I90249b20016deb7bf744cad0615a2a4551fdd547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2dad5cb5

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 679cb4f4

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: Ibe01967c2b0e359ad71422b390e474fe97e35868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

679cb4f4

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 24feb6ef

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I63bf945151000205750699eef7a93c13d793f528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

24feb6ef

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 79f588f6

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours am: 50569fde -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I914098eab6e0673cd145041bca951cd49d6d1b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

79f588f6

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 919358ba

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: d4717a4d -s ours am: 368857b6 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: I82128fca03ee075029bf86f3894cfc5a361936d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

919358ba

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start... · 50569fde

William Leshner authored 1 year ago

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c am: 65b870a2 -s ours am: d32ff467 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793



Change-Id: Ibfc94e3110d09f5e7c3a245774562693a1501b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

50569fde