Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,575 Commits 3 Branches 0 Tags
b4a01ef77a350a630c55f39e8239fa02ca5df9ff
Commit Graph

691575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b4a01ef77a Merge "Add a device config for FGS denied notification." into sc-dev am: e06a55ba9f am: 7e244f216d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14825247

Change-Id: I51c75d30b557c92f80abbcf7168e2898ef9b7726
 2021-06-24 18:23:50 +00:00
Stevie Kideckel
b6ac6c1980 Merge "Add a people tile state for dnd" into sc-dev am: e0dcf62f29 am: 6154c0e62e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080411

Change-Id: I2151f4549341ffaf8efcc7ecf194d556d56d0806
 2021-06-24 18:23:31 +00:00
TreeHugger Robot
f3fe4c2acc Merge "Change Owner" into sc-dev am: 5629eccbbc am: 73579f4d19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027119

Change-Id: I47b6a50f75ad7ef75ced3d0100ac3336f9160f81
 2021-06-24 18:21:58 +00:00
TreeHugger Robot
e6bdef0287 Merge "Reject invalid input." 2021-06-24 18:10:53 +00:00
TreeHugger Robot
7e244f216d Merge "Add a device config for FGS denied notification." into sc-dev am: e06a55ba9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14825247

Change-Id: Ic867b97aab21891c33badb6d3b10513688188c59
 2021-06-24 18:08:43 +00:00
Stevie Kideckel
6154c0e62e Merge "Add a people tile state for dnd" into sc-dev am: e0dcf62f29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080411

Change-Id: Iad7327b3c4cbdba584336dc4e41532a879f2e7ec
 2021-06-24 18:08:15 +00:00
TreeHugger Robot
73579f4d19 Merge "Change Owner" into sc-dev am: 5629eccbbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027119

Change-Id: Ia82a7d77d8f86294a1028307baab96356cfb4e73
 2021-06-24 18:07:44 +00:00
TreeHugger Robot
e06a55ba9f Merge "Add a device config for FGS denied notification." into sc-dev 2021-06-24 17:53:45 +00:00
Stevie Kideckel
e0dcf62f29 Merge "Add a people tile state for dnd" into sc-dev 2021-06-24 17:51:26 +00:00
TreeHugger Robot
5629eccbbc Merge "Change Owner" into sc-dev 2021-06-24 17:48:52 +00:00
Evan Chen
08c4c64157 Change Owner 
Change Owner from Eugene to the people who are currently working
with CDM.
Better to change the owner file under sc-dev first since there's
no owner file in AOSP.
Source of truth: /core/java/android/companion/OWNERS
Fix: 191984480
Change-Id: I737246128ca25e5efe2bdf59361a83cd6dc54c6b
 2021-06-24 17:48:40 +00:00
TreeHugger Robot
48b28a395c Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 am: 99078e846e am: dd484aa308 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: Ib2067bbd8cfbf44215676699aba6168fe6e75e29
 2021-06-24 17:43:05 +00:00
Beth Thibodeau
2518ba1cbb Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 am: 6c88b5be09 am: 5b2361a066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: I1f7a2cb25f312b06115aae7031e52a4b8649c93b
 2021-06-24 17:42:46 +00:00
TreeHugger Robot
5374738f5e Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 am: 8624f6b70d am: 6a05b5ca2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: Iefc590fad9111f4971f8b7607e3e94d427b8ef30
 2021-06-24 17:42:10 +00:00
Automerger Merge Worker
67f5e9adb3 Merge "Merge "Add flag for remote streams" into sc-dev am: f9343c8baf am: 1a491b2fdd" into sc-v2-dev-plus-aosp am: 7b1f2e8ade 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: I31e5923189d5399242956bfaec45776b1b8c5e1f
 2021-06-24 17:41:39 +00:00
TreeHugger Robot
bdd6723f8d Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 am: a14dabd03e am: d33ffade8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: I9899af08ddf3cfc0c592a72dbba28774e1635760
 2021-06-24 17:40:35 +00:00
Beth Thibodeau
1f55001b46 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 am: 5e4d9e6867 am: 756e4decd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: Ibaec16d8d5aa6167af5afb7b5ddd4ecb201fd7e3
 2021-06-24 17:40:13 +00:00
TreeHugger Robot
fe2cec2a9d Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 am: 02e5d4b594 am: 16b8091d33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: I473d68eb028d2e2bff8c93aa540ca4585adf15be
 2021-06-24 17:39:27 +00:00
Julia Reynolds
681a334fce Merge "Add flag for remote streams" into sc-dev am: f9343c8baf am: 9c3ec4b667 am: 955c22c926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: I24ee2379ba69f72e8a060c54c6b241dd953d09c9
 2021-06-24 17:37:39 +00:00
TreeHugger Robot
dd484aa308 Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 am: 99078e846e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: I9563217290ac29b8c9d49caa7f47d78d80e1b80a
 2021-06-24 17:23:40 +00:00
Beth Thibodeau
5b2361a066 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 am: 6c88b5be09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: I0d64ed838987696688b7a7fa1f7f26fa370f2b64
 2021-06-24 17:22:58 +00:00
TreeHugger Robot
6a05b5ca2b Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 am: 8624f6b70d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: I15c9a6327a5ec6dc8a93fb41dd99ecc6d401676e
 2021-06-24 17:22:30 +00:00
Automerger Merge Worker
7b1f2e8ade Merge "Merge "Add flag for remote streams" into sc-dev am: f9343c8baf am: 1a491b2fdd" into sc-v2-dev-plus-aosp 2021-06-24 17:22:09 +00:00
TreeHugger Robot
d33ffade8a Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 am: a14dabd03e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: If00f921708be0bed6a0efd5220b899466819dd47
 2021-06-24 17:22:03 +00:00
Julia Reynolds
41055ec514 Merge "Add flag for remote streams" into sc-dev am: f9343c8baf am: 1a491b2fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: Id3afc8d061633533ca288047aa1d50671ffeccd0
 2021-06-24 17:21:55 +00:00
Beth Thibodeau
756e4decd6 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 am: 5e4d9e6867 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: If5d0063779da933f5819d8d80b9e1ed065dfa036
 2021-06-24 17:21:53 +00:00
TreeHugger Robot
16b8091d33 Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 am: 02e5d4b594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: I1c36700a2813af243f7c83ebe9d8330f30cde981
 2021-06-24 17:21:33 +00:00
Julia Reynolds
955c22c926 Merge "Add flag for remote streams" into sc-dev am: f9343c8baf am: 9c3ec4b667 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: Ic2cd0b5c29b65c9ddcbaeb761e80cc0d46a52463
 2021-06-24 17:21:17 +00:00
TreeHugger Robot
dfe52188d9 Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 am: b844d72268 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: Ic13f145689bc92b247b01c8772be27a829b688dd
 2021-06-24 17:20:03 +00:00
Beth Thibodeau
d2750541ce Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 am: 0f58cc4cc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: I4ca67e544e05cfc05671fa7927966841116b6f39
 2021-06-24 17:19:51 +00:00
TreeHugger Robot
2515357704 Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 am: 67ca8fb7ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: I2189198a0a7aed3b29d224206b0aaf61236d0d5f
 2021-06-24 17:18:54 +00:00
Julia Reynolds
4cb7e4ccec Merge "Add flag for remote streams" into sc-dev am: f9343c8baf am: 6a6f07c54c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: I593d1ba5bc9a7553accfa8e143b72341c65d9b86
 2021-06-24 17:17:39 +00:00
TreeHugger Robot
b844d72268 Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: Icfa757398b223c4c761039a20123ac8a66d63ea8
 2021-06-24 17:11:35 +00:00
TreeHugger Robot
99078e846e Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: Ic3e2b30209c57ff56914eeaa45f227cff87865db
 2021-06-24 17:11:15 +00:00
TreeHugger Robot
a14dabd03e Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: I37547f2548931a17e3d22ef83637245ff8539a4f
 2021-06-24 17:08:52 +00:00
Beth Thibodeau
5e4d9e6867 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: I2e7c75fc6ec59facacfc7dc62306551d07425d44
 2021-06-24 17:08:32 +00:00
TreeHugger Robot
02e5d4b594 Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: Ibfd2d52236dc09b39fc84e89c7378ef878bb2d52
 2021-06-24 17:07:56 +00:00
Julia Reynolds
9c3ec4b667 Merge "Add flag for remote streams" into sc-dev am: f9343c8baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: I797d6afde52e17526676d301a90fb11015866a1e
 2021-06-24 17:07:44 +00:00
TreeHugger Robot
dc9a03db06 Merge "Delay unmuting sensor when device is unlocked" into sc-dev 2021-06-24 17:06:40 +00:00
TreeHugger Robot
6a12d74177 Merge "Save one notifyColorListeners() call" into sc-dev am: 8c9039fca8 am: 67ddeb5472 am: 5f8d51f1f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079478

Change-Id: I87bd0f69095c1a8042c178f8762b19271f2b4edb
 2021-06-24 17:05:33 +00:00
Beth Thibodeau
0f58cc4cc7 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: I6b2be59c1a2e10532e1be2063aaf8b50767dc210
 2021-06-24 17:04:37 +00:00
TreeHugger Robot
67ca8fb7ee Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: Ic5f8f914c3c3310b4ff7332d2968c04581ffdb91
 2021-06-24 17:03:42 +00:00
Beth Thibodeau
6c88b5be09 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: Ibf39f07b0042f1a7756828da32bc7edf88b40351
 2021-06-24 17:03:27 +00:00
TreeHugger Robot
8624f6b70d Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: I5b29f713ab56216c483f2956a59305268a415f63
 2021-06-24 17:02:57 +00:00
TreeHugger Robot
75438f79c0 Merge "Save one notifyColorListeners() call" into sc-dev am: 8c9039fca8 am: f74dae13a4 am: 56f3f41814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079478

Change-Id: I67257b2abe825d99c5bd769722f5c105e178c9f8
 2021-06-24 17:02:49 +00:00
Beth Thibodeau
e9408eaf89 Merge "Use notification action to stop recording" into sc-dev 2021-06-24 17:02:18 +00:00
Julia Reynolds
1a491b2fdd Merge "Add flag for remote streams" into sc-dev am: f9343c8baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: Iddeb33d674d421855ea44ddc583f97ebc965bf28
 2021-06-24 17:02:12 +00:00
Julia Reynolds
6a6f07c54c Merge "Add flag for remote streams" into sc-dev am: f9343c8baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: I99d5bc79336ac77268635828c8b38f78836b4879
 2021-06-24 17:01:43 +00:00
TreeHugger Robot
5f8d51f1f7 Merge "Save one notifyColorListeners() call" into sc-dev am: 8c9039fca8 am: 67ddeb5472 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079478

Change-Id: I15938e9d9cbe37ec9e8f8e417f511a4f0a01a433
 2021-06-24 16:53:38 +00:00
TreeHugger Robot
56f3f41814 Merge "Save one notifyColorListeners() call" into sc-dev am: 8c9039fca8 am: f74dae13a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079478

Change-Id: Ia22784478c9e385427eecd3435f4ceb9ea137081
 2021-06-24 16:52:52 +00:00