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

683134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
c7ce11cd64 Merge changes I61c84693,I929428f7 am: e6b79e2923 am: d00c6818dd am: 83bdc37516 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925501

Change-Id: Iaa43c34d7e80328dd17db09332dff98e227223be
 2022-01-14 17:59:06 +00:00
Baligh Uddin
e41bc47450 Merge "Add OWNERS block to manage slippage during migration." am: d2a5e78d7c am: 36d9a8ca34 am: 23bc103152 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1950196

Change-Id: I9a2de5b8edc28e49429e89c96e861d8ba910d312
 2022-01-14 17:58:49 +00:00
William Escande
d21cf5f8d9 Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" am: 2d39eb02ca am: dc198a070d am: 744cd007db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933145

Change-Id: I651585b35f2cf307caf48a2ddb78adafdfc64405
 2022-01-14 17:57:44 +00:00
Benedict Wong
83bdc37516 Merge changes I61c84693,I929428f7 am: e6b79e2923 am: d00c6818dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925501

Change-Id: I5e2ee0259f73c43f93049dbd8ab369a708d31112
 2022-01-14 17:42:44 +00:00
Baligh Uddin
23bc103152 Merge "Add OWNERS block to manage slippage during migration." am: d2a5e78d7c am: 36d9a8ca34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1950196

Change-Id: I05f6207e66382dbbe512eb11f8296b1dffacab1f
 2022-01-14 17:42:26 +00:00
William Escande
744cd007db Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" am: 2d39eb02ca am: dc198a070d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933145

Change-Id: Iabc35b74ac6b52c6c4a1d45d6694600f1539d050
 2022-01-14 17:42:02 +00:00
Benedict Wong
d00c6818dd Merge changes I61c84693,I929428f7 am: e6b79e2923 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925501

Change-Id: I5b080cd402df4aff505d4b512966326d845119be
 2022-01-14 17:25:14 +00:00
Baligh Uddin
36d9a8ca34 Merge "Add OWNERS block to manage slippage during migration." am: d2a5e78d7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1950196

Change-Id: Id11d9d83ac11ae4a5ab5a7a0dbbddde61b5d5bdb
 2022-01-14 17:24:22 +00:00
William Escande
dc198a070d Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" am: 2d39eb02ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933145

Change-Id: I08e3c3ce2c67543d7df1062e81a1b4609a925f99
 2022-01-14 17:23:48 +00:00
Benedict Wong
e6b79e2923 Merge changes I61c84693,I929428f7 
* changes:
  Expose entry/exit bandwidth criteria APIs for VCN templates
  Add minimum required bandwidth to network templates
 2022-01-14 17:12:13 +00:00
Anton Hansson
392bc3d409 Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80 am: 081048aff1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796

Change-Id: Ibfc755f0d745ed056eedc36b586ee36b595c077e
 2022-01-14 17:09:44 +00:00
Baligh Uddin
d2a5e78d7c Merge "Add OWNERS block to manage slippage during migration." 2022-01-14 17:02:50 +00:00
William Escande
2d39eb02ca Merge "Add BtProfileConnectionInfo.a2dpSinkInfo" 2022-01-14 17:02:46 +00:00
Baligh Uddin
0a9e952f1d Add OWNERS block to manage slippage during migration. 
BUG: 196026708
Test: TH
Change-Id: Ib9d939f11240857affcf34cbb5b6265640c7ba82
 2022-01-14 16:58:35 +00:00
Anton Hansson
081048aff1 Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796

Change-Id: I564a443788f94a01c452b9a68d0317bd799ca0a9
 2022-01-14 16:56:44 +00:00
Anton Hansson
17ac2e2d80 Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796

Change-Id: I68e1421057a3dea0aa51bdc62059c3476c0d7637
 2022-01-14 16:41:43 +00:00
Anton Hansson
0b0c098d36 Merge "Improve how "likely an AOSP change" is detected" 2022-01-14 16:24:07 +00:00
Fabian Kozynski
33b835cb67 Merge "Fix disable flag in QSBH" into sc-v2-dev am: c09887ba23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16615507

Change-Id: Ic11e6ade65421ce9db1f4876a9c1811789481ca2
 2022-01-14 15:34:11 +00:00
Fabian Kozynski
c09887ba23 Merge "Fix disable flag in QSBH" into sc-v2-dev 2022-01-14 15:18:01 +00:00
Etienne Ruffieux
1f6d26d5cb Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am: 77b596f2bf am: e1e07765ba am: 6198337c7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946687

Change-Id: Ief519c4bdf208680b8e4a3ab2bc3cced6a4b9f53
 2022-01-14 09:24:56 +00:00
Etienne Ruffieux
6198337c7a Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am: 77b596f2bf am: e1e07765ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946687

Change-Id: I297ceab43df23b6ac1cb5a5f54f6e7b02872ee74
 2022-01-14 09:13:28 +00:00
Etienne Ruffieux
e1e07765ba Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am: 77b596f2bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946687

Change-Id: Id907f63c981505f9e202ea7c15be11b9fa5aaefb
 2022-01-14 09:01:55 +00:00
Etienne Ruffieux
77b596f2bf Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" 2022-01-14 08:43:13 +00:00
Maria Yang
976b3f65d8 Merge "Handle setAllowedCarriers() with empty list of carriers" into sc-v2-dev am: d36f3eb795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631291

Change-Id: I8eff763b63b01f78fd36dd942dfa923d47198398
 2022-01-14 06:13:41 +00:00
Maria Yang
d36f3eb795 Merge "Handle setAllowedCarriers() with empty list of carriers" into sc-v2-dev 2022-01-14 05:58:10 +00:00
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