TreeHugger Robot
|
e771ff3fcc
|
Merge "Improve javadocs for new S constants" into sc-dev am: 456fb2e78b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13984189
Change-Id: I6f86f1f087221e5957c904472d49353d0e91ffda
|
2021-03-31 13:59:48 +00:00 |
|
TreeHugger Robot
|
456fb2e78b
|
Merge "Improve javadocs for new S constants" into sc-dev
|
2021-03-31 13:49:46 +00:00 |
|
Kholoud Mohamed
|
c0034d4084
|
[automerger skipped] Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038 am: fb7b92801f am: b2cbf35643 -s ours am: bdbd44ff47 -s ours
am skip reason: skip tag Change-Id I3cf624f063ba582bc8d3b6aeeb11a46a2ab37636 with SHA-1 ca6813867a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652461
Change-Id: I2eee3920d76c93b9d819785890be0036fab90d4c
|
2021-03-31 13:44:13 +00:00 |
|
Kholoud Mohamed
|
db07f2de31
|
[automerger skipped] Merge "Remove no longer needed QUERY_USERS permission" am: 0969f50292 am: 1a47316d2e am: 2438eafdd4 -s ours am: 378238f057 -s ours
am skip reason: skip tag Change-Id I4e050d6ea7df08ba789021fd06e8c4cf8936dfe9 with SHA-1 1c1cc6c250 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652456
Change-Id: Ib3982dbb9c6a95371d64917e11b6c97dbc410883
|
2021-03-31 13:43:54 +00:00 |
|
Marvin Ramin
|
45c7a35015
|
[automerger skipped] Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb am: 8ecef70ef9 am: 10331099c0 -s ours am: 35f0ce72ad -s ours
am skip reason: skip tag Change-Id I870850724a35315a0057e248182fba5568c79253 with SHA-1 3f313a10cc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095
Change-Id: I47a6fdb0303e9e96a4819e263a2865e83ebe9515
|
2021-03-31 13:41:15 +00:00 |
|
Venkatarama NG. Avadhani
|
368a03d37d
|
[automerger skipped] HDMICEC: Set common callback logic for shell cmd am: 571f0de1ff am: 9289aeed8c am: 5f763baa38 -s ours am: 5363794224 -s ours
am skip reason: skip tag Change-Id I194b7886f0a15cd7fafa6f43dec9b5a02c55b06e with SHA-1 1995809e80 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555094
Change-Id: I31d8e7ff64a62f6f81416bd109dc189a739426c0
|
2021-03-31 13:41:09 +00:00 |
|
Kholoud Mohamed
|
bdbd44ff47
|
[automerger skipped] Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038 am: fb7b92801f am: b2cbf35643 -s ours
am skip reason: skip tag Change-Id I3cf624f063ba582bc8d3b6aeeb11a46a2ab37636 with SHA-1 ca6813867a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652461
Change-Id: Iddf2890b128f8f801d83dc917f0656cf7780fde8
|
2021-03-31 13:27:31 +00:00 |
|
Kholoud Mohamed
|
378238f057
|
[automerger skipped] Merge "Remove no longer needed QUERY_USERS permission" am: 0969f50292 am: 1a47316d2e am: 2438eafdd4 -s ours
am skip reason: skip tag Change-Id I4e050d6ea7df08ba789021fd06e8c4cf8936dfe9 with SHA-1 1c1cc6c250 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652456
Change-Id: I2f524d82de4b5165ae2e075856d609f1b44205fd
|
2021-03-31 13:27:03 +00:00 |
|
Marvin Ramin
|
35f0ce72ad
|
[automerger skipped] Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb am: 8ecef70ef9 am: 10331099c0 -s ours
am skip reason: skip tag Change-Id I870850724a35315a0057e248182fba5568c79253 with SHA-1 3f313a10cc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095
Change-Id: I7f3c00b6187e2e1d959cc06ff6846ad530caa379
|
2021-03-31 13:26:08 +00:00 |
|
Venkatarama NG. Avadhani
|
5363794224
|
[automerger skipped] HDMICEC: Set common callback logic for shell cmd am: 571f0de1ff am: 9289aeed8c am: 5f763baa38 -s ours
am skip reason: skip tag Change-Id I194b7886f0a15cd7fafa6f43dec9b5a02c55b06e with SHA-1 1995809e80 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555094
Change-Id: If70e699f5abb89a8093883e178d86683c5660bf1
|
2021-03-31 13:25:59 +00:00 |
|
Riddle Hsu
|
604ed0a184
|
Merge "Use last reported configuration for apps that are going-away" into sc-dev am: 08d26fa3a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048289
Change-Id: I820b8abc05c38bab4375bcba8f9540ce0970e191
|
2021-03-31 13:21:55 +00:00 |
|
Michael Wright
|
01d7d0c8b2
|
Merge "Actually report resonant frequency and Q factor for vibrators." into sc-dev am: 68ac14c4a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033763
Change-Id: I9f01f655fbc55ca8fe4abc709d29f31e71e9dfbc
|
2021-03-31 13:21:45 +00:00 |
|
Wei Sheng Shih
|
22b7e19bac
|
Merge "Prevent the decor view to be visible again after exit animation finish." into sc-dev am: ef355db3ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929088
Change-Id: I3a7899a1b484b1c072f040d253aa030d198524df
|
2021-03-31 13:21:15 +00:00 |
|
Riddle Hsu
|
08d26fa3a0
|
Merge "Use last reported configuration for apps that are going-away" into sc-dev
|
2021-03-31 13:09:55 +00:00 |
|
Michael Wright
|
68ac14c4a6
|
Merge "Actually report resonant frequency and Q factor for vibrators." into sc-dev
|
2021-03-31 13:04:02 +00:00 |
|
Wei Sheng Shih
|
ef355db3ec
|
Merge "Prevent the decor view to be visible again after exit animation finish." into sc-dev
|
2021-03-31 12:56:38 +00:00 |
|
Flavio Fiszman
|
36a5158800
|
Merge "Change People Tile config activity layout" into sc-dev am: 79b3f0520c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13996771
Change-Id: I5d79b5fb81ba08dda107da47ce290dd982cabb43
|
2021-03-31 12:53:44 +00:00 |
|
Kholoud Mohamed
|
b2cbf35643
|
Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038 am: fb7b92801f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652461
Change-Id: I5f3ff92cd2091cde4146d429951cec4e2659b16b
|
2021-03-31 12:46:32 +00:00 |
|
Kholoud Mohamed
|
2438eafdd4
|
Merge "Remove no longer needed QUERY_USERS permission" am: 0969f50292 am: 1a47316d2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652456
Change-Id: I7cbb1d9b86e2ce750dfcdb8e0f13759029d0f62c
|
2021-03-31 12:46:10 +00:00 |
|
Marvin Ramin
|
10331099c0
|
Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb am: 8ecef70ef9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095
Change-Id: Id7a880e757b78f22dd4987d38aef00a6ad6051c7
|
2021-03-31 12:45:35 +00:00 |
|
Venkatarama NG. Avadhani
|
5f763baa38
|
HDMICEC: Set common callback logic for shell cmd am: 571f0de1ff am: 9289aeed8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555094
Change-Id: I925df88e5d64a2cfaa2bbd160f12c118e118a650
|
2021-03-31 12:45:31 +00:00 |
|
Flavio Fiszman
|
79b3f0520c
|
Merge "Change People Tile config activity layout" into sc-dev
|
2021-03-31 12:32:51 +00:00 |
|
Kholoud Mohamed
|
bd327e074c
|
[automerger skipped] Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62 am: 06179bfbd8 am: 5efda0886d -s ours am: 89096eea16 -s ours
am skip reason: skip tag Change-Id If1bfcb1341402717fec74cc704caa7e1eb18fa2e with SHA-1 63a2278e0b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: Ia5e462875ec5fd43ac0f39a1c54b7ee7b742ac86
|
2021-03-31 12:20:57 +00:00 |
|
Kholoud Mohamed
|
b5acdaccd7
|
[automerger skipped] Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f am: cbebf234e2 -s ours am: cede725795 -s ours
am skip reason: skip tag Change-Id I8a2a49aa45704d8991e9cf3689b5259442fb1db3 with SHA-1 5e7b121444 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093
Change-Id: I6051e5b81147ca5af43ddfcf643cfdd1b258c87f
|
2021-03-31 12:20:33 +00:00 |
|
Anton Hansson
|
78a8f0d378
|
[automerger skipped] Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86 am: 556944ee49 -s ours am: 1a737c45cc -s ours
am skip reason: skip tag Change-Id I74f20b37d23370e258e7fc7130e28c5312abf46c with SHA-1 0de31fe1e2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658122
Change-Id: I41e22ef24667eb4d2d53f2b865969d91a7ee4d78
|
2021-03-31 12:20:14 +00:00 |
|
Kholoud Mohamed
|
fb7b92801f
|
Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c5019038
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652461
Change-Id: I2bd05e7f6f7d5b4981ce47d94500aa723c06a2b6
|
2021-03-31 12:17:32 +00:00 |
|
Kholoud Mohamed
|
1a47316d2e
|
Merge "Remove no longer needed QUERY_USERS permission" am: 0969f50292
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652456
Change-Id: Ie996ba1238501c02f77217c500f86f39835f4758
|
2021-03-31 12:13:36 +00:00 |
|
Marvin Ramin
|
8ecef70ef9
|
Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095
Change-Id: Ia4f2fe5536215dda7a359a5015b4cb4992d46bf8
|
2021-03-31 12:08:26 +00:00 |
|
Kholoud Mohamed
|
89096eea16
|
[automerger skipped] Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62 am: 06179bfbd8 am: 5efda0886d -s ours
am skip reason: skip tag Change-Id If1bfcb1341402717fec74cc704caa7e1eb18fa2e with SHA-1 63a2278e0b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: I2f37b3fe1856c47cbceeb52893c828bbc1509e9b
|
2021-03-31 12:07:47 +00:00 |
|
Kholoud Mohamed
|
cede725795
|
[automerger skipped] Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f am: cbebf234e2 -s ours
am skip reason: skip tag Change-Id I8a2a49aa45704d8991e9cf3689b5259442fb1db3 with SHA-1 5e7b121444 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093
Change-Id: Idce06f26f46d5842e657e0ec5cece709c5863e30
|
2021-03-31 12:06:44 +00:00 |
|
Anton Hansson
|
1a737c45cc
|
[automerger skipped] Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86 am: 556944ee49 -s ours
am skip reason: skip tag Change-Id I74f20b37d23370e258e7fc7130e28c5312abf46c with SHA-1 0de31fe1e2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658122
Change-Id: I79fab0b97a30cf0ccf542aaac27ecf840ad3620a
|
2021-03-31 12:05:53 +00:00 |
|
Venkatarama NG. Avadhani
|
9289aeed8c
|
HDMICEC: Set common callback logic for shell cmd am: 571f0de1ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555094
Change-Id: I21369f60791fc65b79a54241693d83d4eac6e1db
|
2021-03-31 12:02:59 +00:00 |
|
Chalard Jean
|
f39e75fe5a
|
Merge changes Id7ee1bd3,I5ea44a94 into sc-dev am: 59634a7fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14010221
Change-Id: Id5d01b0862b25d5380b16dc6f4f8d42406a447b5
|
2021-03-31 11:43:00 +00:00 |
|
Anton Hansson
|
b37f5f1e3f
|
Merge "Delete framework-updatable-sources filegroup" into sc-dev am: a154af8881
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049086
Change-Id: Iba9534df6fd7aeb8db1e9b3b888d8bdccb986474
|
2021-03-31 11:42:24 +00:00 |
|
Chalard Jean
|
59634a7fc7
|
Merge changes Id7ee1bd3,I5ea44a94 into sc-dev
* changes:
[NS08] Expose public NetworkScore API
[NS07] Add the rest of the scoring policy
|
2021-03-31 11:42:19 +00:00 |
|
Kholoud Mohamed
|
c29c883d14
|
Merge "Remove silent provisioning hack from DPMS" into sc-dev am: 0c6dd4d8e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018893
Change-Id: I37b99a1a391b1f4359677d797a5873fadfc1aedf
|
2021-03-31 11:41:59 +00:00 |
|
Jason Chang
|
e237d2b224
|
Merge "Apply "Dominant Palette A - 800" color to the background of One-Handed mode" into sc-dev am: dfe477f26d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14011906
Change-Id: I9e1c5362cc3333d1ca2bfa3fd2cea5cd0606d315
|
2021-03-31 11:41:02 +00:00 |
|
TreeHugger Robot
|
64f70c962f
|
[automerger skipped] Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into mainline-prod am: 21f28e69e1 -s ours am: c6a4ff2641 -s ours
am skip reason: skip tag Change-Id I3303bb14516f07a55d82a16b59c111ab3f8b0389 with SHA-1 8fdfd46218 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049945
Change-Id: I7eaa3076e3e2d3c65703414d6447b5481a9e1756
|
2021-03-31 11:40:43 +00:00 |
|
TreeHugger Robot
|
f1c849335e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7735cb4771 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14037017
Change-Id: If56af94c15d0c8e23f507cd258a1312304e204b5
|
2021-03-31 11:40:06 +00:00 |
|
Anton Hansson
|
a154af8881
|
Merge "Delete framework-updatable-sources filegroup" into sc-dev
|
2021-03-31 11:36:40 +00:00 |
|
Kholoud Mohamed
|
0c6dd4d8e2
|
Merge "Remove silent provisioning hack from DPMS" into sc-dev
|
2021-03-31 11:30:36 +00:00 |
|
Kholoud Mohamed
|
71c5019038
|
Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS"
|
2021-03-31 11:29:12 +00:00 |
|
Jason Chang
|
dfe477f26d
|
Merge "Apply "Dominant Palette A - 800" color to the background of One-Handed mode" into sc-dev
|
2021-03-31 11:29:11 +00:00 |
|
Kholoud Mohamed
|
0969f50292
|
Merge "Remove no longer needed QUERY_USERS permission"
|
2021-03-31 11:28:40 +00:00 |
|
Kholoud Mohamed
|
5efda0886d
|
Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62 am: 06179bfbd8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: Ie24548086d23070ac0bef7b96f777e4da1cda152
|
2021-03-31 11:28:34 +00:00 |
|
Kholoud Mohamed
|
cbebf234e2
|
Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093
Change-Id: Ida36341fdbff976ae4b60ab71d78195facb36621
|
2021-03-31 11:28:08 +00:00 |
|
Marvin Ramin
|
c46402e0eb
|
Merge changes from topic "hdmi_sam_shell_cmd"
* changes:
HDMICEC: Add setsystemaudiomode shell command
HDMICEC: Set common callback logic for shell cmd
|
2021-03-31 11:27:24 +00:00 |
|
Anton Hansson
|
556944ee49
|
Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658122
Change-Id: I9608abaf2ea697d453c802f66beae0c3c6e55680
|
2021-03-31 11:27:22 +00:00 |
|
TreeHugger Robot
|
c6a4ff2641
|
[automerger skipped] Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into mainline-prod am: 21f28e69e1 -s ours
am skip reason: skip tag Change-Id I3303bb14516f07a55d82a16b59c111ab3f8b0389 with SHA-1 8fdfd46218 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049945
Change-Id: Ifab31b0e5609ded3e7a571a1b576477b9912af04
|
2021-03-31 11:26:50 +00:00 |
|
TreeHugger Robot
|
7735cb4771
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2021-03-31 11:17:08 +00:00 |
|