Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
683,102 Commits 3 Branches 0 Tags
2ade4ba3bb162ded47dcda876ab8528edc460a88
Commit Graph

683102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Saccone
2ade4ba3bb Merge "Sets OWNERS file for wm tests." am: 3589d051db am: 641c2f0ee4 am: de526b720d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933230

Change-Id: Ic33d03e033ea4ab169b161bbef912710ac1fbec1
 2022-01-14 05:21:56 +00:00
Sam Saccone
de526b720d Merge "Sets OWNERS file for wm tests." am: 3589d051db am: 641c2f0ee4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933230

Change-Id: I46540116f14feaebe5838a2f906b8127c81a8297
 2022-01-14 05:05:06 +00:00
Sam Saccone
641c2f0ee4 Merge "Sets OWNERS file for wm tests." am: 3589d051db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933230

Change-Id: Ie37c4f1f2da45e37270bd6573d113f83623a12fc
 2022-01-14 04:53:36 +00:00
Sam Saccone
3589d051db Merge "Sets OWNERS file for wm tests." 2022-01-14 04:31:03 +00:00
Sooraj Sasindran
a490c7ebf1 Merge "Add ril constant for slicing config change" am: daa74af0eb am: a646471f5e am: 00c7c02c46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945429

Change-Id: I959aba7b1d9b0e87442893a6da266bea49dc3295
 2022-01-14 04:15:51 +00:00
Sooraj Sasindran
00c7c02c46 Merge "Add ril constant for slicing config change" am: daa74af0eb am: a646471f5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945429

Change-Id: Iee799b0ff8601ed66090bf47f1457aca4b05919c
 2022-01-14 03:54:32 +00:00
Sooraj Sasindran
a646471f5e Merge "Add ril constant for slicing config change" am: daa74af0eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945429

Change-Id: I105048624f2c21a0e0c98ad16fe38f58bd3ade3b
 2022-01-14 03:38:30 +00:00
Sooraj Sasindran
daa74af0eb Merge "Add ril constant for slicing config change" 2022-01-14 03:18:42 +00:00
Henry Fang
9aa0ab03fd Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0 am: f1cec5bb49 am: 8dd3756132 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580304

Change-Id: I202504be0cb134605adc4d6eeebebaa86602cd43
 2022-01-14 02:55:10 +00:00
Henry Fang
8dd3756132 Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0 am: f1cec5bb49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580304

Change-Id: I47124be32f498066fbba206c0274f852e4782abf
 2022-01-14 02:35:25 +00:00
TreeHugger Robot
1f89946fde Merge "[RESTRICT AUTOMERGE] Dimming on an embedded TaskFragment vs. parent Task" into sc-v2-dev am: 446346bc4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16622052

Change-Id: Ib733e752fc33e6b1595beac3756ec764d54695f4
 2022-01-14 02:29:00 +00:00
Louis Chang
bdc5641726 [RESTRICT AUTOMERGE] Dimming on an embedded TaskFragment vs. parent Task am: 66a576b409 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16622052

Change-Id: I32bda7781d759bb3e97a159c944638f8338bb904
 2022-01-14 02:28:46 +00:00
Henry Fang
f1cec5bb49 Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580304

Change-Id: I1110c02b5944d58503bef8e959a42e49c5d7f164
 2022-01-14 02:17:39 +00:00
TreeHugger Robot
446346bc4e Merge "[RESTRICT AUTOMERGE] Dimming on an embedded TaskFragment vs. parent Task" into sc-v2-dev 2022-01-14 02:15:22 +00:00
Henry Fang
764afbbae0 Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" 2022-01-14 01:53:31 +00:00
Rahul Sabnis
1f48a76478 Merge "Temporarily comment out usages of PropertyInvalidatedCache in Bluetooth code while it is pending migration to module-utils" am: 325365b74d am: 17d16a9f73 am: 280c0e9cfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1947703

Change-Id: I0baca5b82b90633a4932aece978b1b0616cf331c
 2022-01-14 01:51:55 +00:00
Rahul Sabnis
280c0e9cfb Merge "Temporarily comment out usages of PropertyInvalidatedCache in Bluetooth code while it is pending migration to module-utils" am: 325365b74d am: 17d16a9f73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1947703

Change-Id: Id6ee3117bf3b17928c1ae38806aca91f116863ec
 2022-01-14 01:40:10 +00:00
Rahul Sabnis
17d16a9f73 Merge "Temporarily comment out usages of PropertyInvalidatedCache in Bluetooth code while it is pending migration to module-utils" am: 325365b74d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1947703

Change-Id: I60428084a1c0d4d60a9f66c62b43002f930b8092
 2022-01-14 01:24:36 +00:00
Rahul Sabnis
325365b74d Merge "Temporarily comment out usages of PropertyInvalidatedCache in Bluetooth code while it is pending migration to module-utils" 2022-01-14 01:08:56 +00:00
Benedict Wong
a531e04a1a [automerger skipped] Merge "Listen for individual subscription mobile data toggles" into sc-v2-dev am: fe84f243b2 -s ours 
am skip reason: Merged-In I1e84c25f48eab90dca163eda809fc11d5d21bc31 with SHA-1 66896667a6 is already in history

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

Change-Id: I71f236570f39c22c0a3db5f94e8b3d961be4b7d1
 2022-01-14 00:58:01 +00:00
Benedict Wong
fe84f243b2 Merge "Listen for individual subscription mobile data toggles" into sc-v2-dev 2022-01-14 00:40:34 +00:00
Mariia Sandrikova
116f04b602 Merge changes from topic "revert-16468379-CXJTAENUWN" into sc-v2-dev am: 04ce06bb79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16571392

Change-Id: I49bb3a6e316d8a41436a66a51066658687173d49
 2022-01-13 22:56:15 +00:00
Mariia Sandrikova
a274e1a7d4 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." am: 7617679a61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16571392

Change-Id: I0adf2bf45c5f7d7349e9c0f180aea9d10f70645d
 2022-01-13 22:55:51 +00:00
Mariia Sandrikova
04ce06bb79 Merge changes from topic "revert-16468379-CXJTAENUWN" into sc-v2-dev 
* changes:
  DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..."
  DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control."
  DO NOT MERGE Revert "Log the CameraCompatControlEventReported atom."
 2022-01-13 22:41:22 +00:00
Michael Wachenschwanz
6dd4897088 Merge "Merge "Move PowerStatsLogger off of the main thread." am: 19041e21ab am: a4b7960b60 am: 7c7930e536 am: a3426965e2" into sc-v2-dev am: 95aa9b3447 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16622973

Change-Id: Ic3b5af0b898ef956c48fcfbb5660be54a93caabb
 2022-01-13 22:13:19 +00:00
Michael Wachenschwanz
95aa9b3447 Merge "Merge "Move PowerStatsLogger off of the main thread." am: 19041e21ab am: a4b7960b60 am: 7c7930e536 am: a3426965e2" into sc-v2-dev 2022-01-13 22:00:20 +00:00
Treehugger Robot
b7260a552a Merge "Add constants of VpnManager events" am: 3cca242ec3 am: b4c82c6f3a am: af3813a332 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899036

Change-Id: Id840c643ec44498eb5cd5d7e4646759e65670b29
 2022-01-13 20:31:13 +00:00
Treehugger Robot
af3813a332 Merge "Add constants of VpnManager events" am: 3cca242ec3 am: b4c82c6f3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899036

Change-Id: Ice03769725153f7cd4d2e8e5c4d7036733de6daa
 2022-01-13 20:20:17 +00:00
Treehugger Robot
b4c82c6f3a Merge "Add constants of VpnManager events" am: 3cca242ec3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899036

Change-Id: I8d18fa6821b0996824e4453abcc72eae6f61b578
 2022-01-13 19:54:58 +00:00
Treehugger Robot
3cca242ec3 Merge "Add constants of VpnManager events" 2022-01-13 19:40:03 +00:00
TreeHugger Robot
c374f3d80d Merge "Enforce system privilege for getGlobalProxyAdmin" into sc-v2-dev am: c826749c90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16622063

Change-Id: I803128a2f5c7959b0dca5a4174fc42b4cbd8b85a
 2022-01-13 19:00:12 +00:00
TreeHugger Robot
c826749c90 Merge "Enforce system privilege for getGlobalProxyAdmin" into sc-v2-dev 2022-01-13 18:41:34 +00:00
Evan Laird
125e2f636a Merge "Fix NetworkController no longer tracking userSetup" into sc-v2-dev am: 43c6f30d8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16488206

Change-Id: I637570722b3c92530bcd8500b22a620a600c1a41
 2022-01-13 18:09:12 +00:00
Evan Laird
43c6f30d8d Merge "Fix NetworkController no longer tracking userSetup" into sc-v2-dev 2022-01-13 17:54:13 +00:00
Evan Laird
3b775bf7ad Fix NetworkController no longer tracking userSetup 
A previous refactor of DeviceProvisionedController removed the semantics
of getting a callback when adding a new listner. This change lets
NetworkController check the initial state after registering for updates,
and removes the doAnswer call from NetworkControllerBaseTest to mimic
this behavior

Also add the field to dumpsys

Test: manual; check `adb shell -n dumpsys activity service com.android.systemui/.SystemUIService | grep -A1 "NetworkController state:"`
Test: atest SystemUITests
Bug: 210512851
Change-Id: I82c8b15ad1b2d43494fa28178715ea0d0721fea7
 2022-01-13 17:53:31 +00:00
Sooraj Sasindran
a94d1bc5ac Merge "Use builder to pass profile network preference" am: e4c549ab09 am: b57fecf8a5 am: 0d235a7707 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904411

Change-Id: I840f82ec83d2d97598b6a41ddf5fd8807ee605d1
 2022-01-13 17:43:48 +00:00
Sooraj Sasindran
0d235a7707 Merge "Use builder to pass profile network preference" am: e4c549ab09 am: b57fecf8a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904411

Change-Id: I8dc0a34f264b92bdcdf702644bf3f0b6884f9468
 2022-01-13 17:33:10 +00:00
Sooraj Sasindran
b57fecf8a5 Merge "Use builder to pass profile network preference" am: e4c549ab09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904411

Change-Id: If88433db8dd8e8d7fe39903d06811d7015e85988
 2022-01-13 17:21:23 +00:00
Daeho Jeong
466a401850 Merge "Add smart idle maintenance service" am: 0134ac7710 am: e8d9b1d709 am: 926fe1c432 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936378

Change-Id: I6d6c5109ade1dc05ba16fef56f6e6a62a7dd13ae
 2022-01-13 17:20:04 +00:00
Daeho Jeong
926fe1c432 Merge "Add smart idle maintenance service" am: 0134ac7710 am: e8d9b1d709 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936378

Change-Id: I27a3323624e3bf8474bccdd84b6785d14221b8fd
 2022-01-13 17:09:13 +00:00
Sooraj Sasindran
e4c549ab09 Merge "Use builder to pass profile network preference" 2022-01-13 17:07:10 +00:00
Sooraj Sasindran
2dd968d7ef Add ril constant for slicing config change 
Add ril constant for slicing config change

Test: build
Bug: 194332512
Change-Id: I5e81a3ba9118537e3dba1c45a2db253ff5bbdc8b
 2022-01-13 17:00:34 +00:00
Daeho Jeong
e8d9b1d709 Merge "Add smart idle maintenance service" am: 0134ac7710 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936378

Change-Id: I58a8320c57bfdcc77e862b2d0693f67066826956
 2022-01-13 16:53:25 +00:00
Daeho Jeong
0134ac7710 Merge "Add smart idle maintenance service" 2022-01-13 16:38:04 +00:00
Pavel Grafov
bdc7f49a0a Merge "Check caller owns admin for per-admin getters." into sc-v2-dev am: 9c2972216e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576666

Change-Id: Ie7b895fc4f82c14813af565b09195d0fdba27ab0
 2022-01-13 15:58:19 +00:00
Pavel Grafov
9c2972216e Merge "Check caller owns admin for per-admin getters." into sc-v2-dev 2022-01-13 15:56:47 +00:00
Josh Tsuji
c31065140f Merge "Check if the SIM is secure before dispatching swipe to unlock." into sc-v2-dev am: bbfe4b8fcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16614131

Change-Id: Ie8aaefb62672346caad5e49eb887c717b68f4759
 2022-01-13 15:56:40 +00:00
Josh Tsuji
bbfe4b8fcd Merge "Check if the SIM is secure before dispatching swipe to unlock." into sc-v2-dev 2022-01-13 15:45:29 +00:00
Mariia Sandrikova
7617679a61 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." 
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I9ad876043fd61f708a8f468fffd1ef371bfa0866
 2022-01-13 15:21:38 +00:00
Aurimas Liutikas
aec26c4f68 DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control." 
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I318b89b87cd3b05a3f3dcd428e3d80fe81465011
 2022-01-13 15:16:51 +00:00