Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,487 Commits 3 Branches 0 Tags
64939eeda12d8fe09dd53d74ca45f4b18cb67503
Commit Graph

651487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
64939eeda1 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8 am: 5b7b95fb26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: I5e3a12231aeac0fa331cdb9dfaac455d88ceed4d
 2021-06-17 13:25:08 +00:00
Mathew Inwood
dd7d22b8e0 Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c am: 6ea95fa4d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: If37f0a98a3977a8151ff3abe232802dc74e5c69b
 2021-06-17 13:25:01 +00:00
TreeHugger Robot
5b7b95fb26 Merge "KeyguardIndication text updates" into sc-dev am: 0ec737dab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986727

Change-Id: Iac5e780c9384467e4b4e3c97606397ff024111a3
 2021-06-17 13:10:43 +00:00
Mathew Inwood
6ea95fa4d2 Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: I2f671c19fdf58e3ad48ea1e28d33530bdd987263
 2021-06-17 13:10:34 +00:00
TreeHugger Robot
0ec737dab8 Merge "KeyguardIndication text updates" into sc-dev 2021-06-17 12:48:23 +00:00
Mathew Inwood
4d4f39980c Merge "Use non-logging compat framework calls" into sc-dev 2021-06-17 12:46:07 +00:00
Treehugger Robot
e92050f998 Merge "Add OWNERS for WM proto files" am: c14325dbdc am: 2bae704d44 am: 0eeb801d32 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: I5b2d9c0647bb7609ec3490fc848830174cbe942b
 2021-06-17 12:04:45 +00:00
Treehugger Robot
0eeb801d32 Merge "Add OWNERS for WM proto files" am: c14325dbdc am: 2bae704d44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: I6cf39d9e11453615e2b11962ee86be15746c31f4
 2021-06-17 11:52:00 +00:00
Automerger Merge Worker
9f66c6d658 Merge "Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d am: 598a69a010" into sc-v2-dev-plus-aosp 2021-06-17 11:34:40 +00:00
Pavel Grafov
8f60dc8738 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d am: 598a69a010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Ib19835e7777c84463f4e9b5c2f1e2f682e3a9540
 2021-06-17 11:34:35 +00:00
Pavel Grafov
dc26adc8d4 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d am: 89af5adc32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: I76fc956eed1c56008b4b70693b9bea706c5f2dac
 2021-06-17 11:34:34 +00:00
Treehugger Robot
2bae704d44 Merge "Add OWNERS for WM proto files" am: c14325dbdc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1738299

Change-Id: Ie6b2b1971984c4b39f39f981030b59a67caf955b
 2021-06-17 11:27:09 +00:00
Pavel Grafov
598a69a010 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Iaa914228355a0ede419b63afdc844e62f0b65e62
 2021-06-17 11:16:45 +00:00
Pavel Grafov
89af5adc32 Merge "More debug for security loggin broadcast" into sc-dev am: 6f5fe9271d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002450

Change-Id: Ib378a9ac45565ff1a82d6db7bd6e963a1a235ccc
 2021-06-17 11:16:24 +00:00
Treehugger Robot
c14325dbdc Merge "Add OWNERS for WM proto files" 2021-06-17 11:09:39 +00:00
Pavel Grafov
6f5fe9271d Merge "More debug for security loggin broadcast" into sc-dev 2021-06-17 11:04:37 +00:00
Bram Bonné
fef87a600f Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d am: 1a482e6be6 am: 54592ead98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: I18d32426091f2a198df5d632d5f0d9509c38b49c
 2021-06-17 10:43:47 +00:00
Bram Bonné
54592ead98 Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d am: 1a482e6be6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: Iffc3c6abbd6b215f530723c5dc420e368bb7eb2d
 2021-06-17 10:25:53 +00:00
Bram Bonné
1a482e6be6 Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" am: 32d031336d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737554

Change-Id: Id64cca5d9eb784c28320f335c1c912be8da12847
 2021-06-17 09:58:34 +00:00
Robin Lee
5033b844a7 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e am: e62779a673 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: Ie228ed2e45fc779d1e633631e436e3bbabd57ecf
 2021-06-17 09:54:56 +00:00
Pedro Loureiro
0149616a62 [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 am: e7fc2de4db -s ours 
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 29365193de is already in history

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

Change-Id: I34d8b82c1fbd38d5f7f14a20eed81773c68cab74
 2021-06-17 09:54:44 +00:00
Robin Lee
bafa8e9bc9 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e am: 1cf93a9d11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I72406cc132af1d2020ec8e5651009a61507b4ccf
 2021-06-17 09:46:50 +00:00
Pedro Loureiro
f9ef640fa6 [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 -s ours am: 255c7ee3bc -s ours 
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 4f09b85b38 is already in history

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

Change-Id: Ibc3834a135dc7c4b7a85c3ce19bf1a9208550592
 2021-06-17 09:46:42 +00:00
Bram Bonné
32d031336d Merge "Allow app's targetSDK to overwrite SELINUX_LATEST_CHANGES SDK" 2021-06-17 09:42:31 +00:00
Robin Lee
e62779a673 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I2190061b00390c02b26da5debf659e8cba218b82
 2021-06-17 09:38:36 +00:00
Pedro Loureiro
e7fc2de4db Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14964833

Change-Id: If8f4fa456affcd57e6ba51b5894e284325d93fd9
 2021-06-17 09:37:58 +00:00
Robin Lee
1cf93a9d11 Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev am: 8766e5c15e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974997

Change-Id: I61cd8295d32795d7cd454a49040a7668510780ed
 2021-06-17 09:36:46 +00:00
Pedro Loureiro
255c7ee3bc [automerger skipped] Merge "Run bpfmt on api/Android.bp" into sc-dev am: 2ae1e25b80 -s ours 
am skip reason: Merged-In I4c7b49e6b5f9b3bec2aba305f8a6eb5e1d0561de with SHA-1 4f09b85b38 is already in history

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

Change-Id: I6d6e1be77c248c3bb01130a79b93db203bb74844
 2021-06-17 09:36:05 +00:00
Robin Lee
8766e5c15e Merge "SystemUI: add GlobalActionsComponent for tv [1/1]" into sc-dev 2021-06-17 09:30:28 +00:00
Pedro Loureiro
2ae1e25b80 Merge "Run bpfmt on api/Android.bp" into sc-dev 2021-06-17 09:19:38 +00:00
Charles Chen
d74a3afec9 Add OWNERS for WM proto files 
Bug: 190684677
Test: upload check
Change-Id: Iba1516bc1fb23ac8bf3126c42350b8ea82bfe62b
 2021-06-17 16:57:30 +08:00
Riddle Hsu
a74b169a84 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev am: 5b24daa483 am: f6af926483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963622

Change-Id: I6f20415d13874631d9253a39b862c944d49c925d
 2021-06-17 07:34:40 +00:00
Riddle Hsu
c5b36eeb8f Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev am: 5b24daa483 am: 90107ce368 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963622

Change-Id: I9a4696f1806dca9d9f21b9804c6e5b44fb46cf89
 2021-06-17 07:34:20 +00:00
Riddle Hsu
90107ce368 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev am: 5b24daa483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963622

Change-Id: I0781d94548c2019ff3d048355679ca0e378595e3
 2021-06-17 07:19:36 +00:00
Riddle Hsu
f6af926483 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev am: 5b24daa483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963622

Change-Id: I994643a46fb1f92b89db524f7bc234c224c2c56f
 2021-06-17 07:18:59 +00:00
Riddle Hsu
5b24daa483 Merge "Generalize the condition to take task snapshot when entering AOD" into sc-dev 2021-06-17 07:07:30 +00:00
Jerry Chang
9e99428724 Merge changes from topic "b/179251684" into sc-v2-dev am: 38eacbf713 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880637

Change-Id: I5be27f43f77db480a52daca297d8a0b0bef75101
 2021-06-17 04:53:48 +00:00
Jerry Chang
38eacbf713 Merge changes from topic "b/179251684" into sc-v2-dev 
* changes:
  Make system bars appearence logic more generic (2/N)
  Make system bars appearence logic more generic (1/N)
 2021-06-17 04:37:26 +00:00
Ryan Lin
63258254b4 Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4c1 am: f99dd7c560 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: Ifd3ef4c592ca91d74c86c32b2e7c01aa4ed731b2
 2021-06-17 02:14:52 +00:00
Kevin Chyn
41437d35ea Merge "Launch action to admin component when button clicked" into sc-dev am: b2e3ba68b0 am: 836a64118e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980524

Change-Id: Ibbb12097c407dca8ed7c827ae4ba651dd2de4dd2
 2021-06-17 02:14:42 +00:00
Kevin Chyn
077b530d75 Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 am: 54e4260153 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: I0a04a860eb6f190326effa390781333a755938fd
 2021-06-17 02:14:07 +00:00
Ryan Lin
f4ab8f4258 Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4c1 am: b6bfa26864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: I621d60c7ca0f651479c86a49eef7d152252f9af4
 2021-06-17 02:06:53 +00:00
Kevin Chyn
bd956cbc7f Merge "Launch action to admin component when button clicked" into sc-dev am: b2e3ba68b0 am: cb32c76bac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980524

Change-Id: I59802a7d5f6f489531c84a40c4ac9b05ea413984
 2021-06-17 02:06:34 +00:00
Kevin Chyn
f64e108968 Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 am: e4cf95d54e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: Id429244dc874fcd31bb0741daf01c35a753b31d5
 2021-06-17 02:05:25 +00:00
Yunfan Chen
5cc5855633 Merge "Layout status/nav bar and decor window as normal window" into sc-v2-dev am: 56aad85b0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14732017

Change-Id: Idb326a2a0063e01aa72e862c89b2f0ff4adc2fc4
 2021-06-17 02:04:54 +00:00
Ryan Lin
f99dd7c560 Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: Iba87631c80911e4fbdb9c86c0ed2be75b622ca2c
 2021-06-17 02:02:33 +00:00
Ryan Lin
b6bfa26864 Merge "Fix incorrect magnification border after rotation" into sc-dev am: 9da336b4c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909658

Change-Id: Ifeb346220dbd930d840e21f1da6af976696c4c2b
 2021-06-17 02:02:11 +00:00
Kevin Chyn
cb32c76bac Merge "Launch action to admin component when button clicked" into sc-dev am: b2e3ba68b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980524

Change-Id: I066cf1a2d31bbba2818f0764b8cfa6afcf2efd6e
 2021-06-17 02:01:45 +00:00
Kevin Chyn
836a64118e Merge "Launch action to admin component when button clicked" into sc-dev am: b2e3ba68b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14980524

Change-Id: Ie1fa71d8ae969c138acde7ba9b2255435865cdb3
 2021-06-17 02:01:44 +00:00
Kevin Chyn
e4cf95d54e Merge "Add BiometricActionDisabledByAdminController" into sc-dev am: c3e64b14c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972616

Change-Id: I8108f8e41d50480cd3f9aced676ba13da0a37a34
 2021-06-17 02:01:23 +00:00