Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
615,375 Commits 3 Branches 0 Tags
599aa30dd783f668f9449fe739abdcc04dea94de
Commit Graph

615375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu
d4dbfe6bf8 Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5 am: 2fd269494a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee05827a112e9ea8a6ab29fb7c00cea8e8b8a9bb
 2020-12-15 00:36:01 +00:00
Tianjie Xu
25ebb2bea4 Merge "Update the OWNERS file for locksettings" am: 14e70a6510 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528859

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie85bf84792a00f19abbb88f450ea4212dbbc7d48
 2020-12-15 00:31:48 +00:00
Jeff Sharkey
483f980afe Merge "Update the owner of recovery systems" am: 612b7e7d1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f4a9f7048850937e0355b18dfb483dedeb7f2e
 2020-12-15 00:28:55 +00:00
Tianjie Xu
14e70a6510 Merge "Update the OWNERS file for locksettings" 2020-12-15 00:27:34 +00:00
Jeff Sharkey
612b7e7d1d Merge "Update the owner of recovery systems" 2020-12-15 00:26:46 +00:00
Jeff Sharkey
305b2ce554 Merge "Add OTA team as the owner of recovery systems" am: 8ef2e0426a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528858

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb0064c6fcd6ba1c0b4a26b415541f1c55d7c231
 2020-12-15 00:25:33 +00:00
Tianjie
a809a05b92 Update the owner of recovery systems 
Use the same owner file from the services.

Test: build
Change-Id: I976c90c2fd16efe20ca3b944c6e45c30550e3226
 2020-12-14 16:24:12 -08:00
Sudheer Shanka
c1e764c571 Update owners for appsearch related code. 
Test: n/a
Change-Id: I165737471f6d0972deeec113bd773735cb080f57
 2020-12-14 16:23:26 -08:00
Eugene Susla
4b0feafeac Merge "Add API to query role privileges" 2020-12-15 00:21:52 +00:00
Jeff Sharkey
8ef2e0426a Merge "Add OTA team as the owner of recovery systems" 2020-12-15 00:19:48 +00:00
Tianjie
4fcc345921 Update the OWNERS file for locksettings 
Add rubinxu@ as the owner of reboot escrow related functionalities.

Test: build
Change-Id: Iadafb92c7c43c5002c15e843445931388440e0ba
 2020-12-15 00:18:35 +00:00
Mady Mellor
ff06288dd2 Merge "Expose NotificationManager#getBubblePreference" 2020-12-15 00:05:39 +00:00
Hyunyoung Song
00ea4c0484 Merge "Add new MANAGE_SEARCH_UI permission for the cts test" am: 243b768b24 am: 49f7265198 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527764

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I605595425af2b874aee23778458ff2711d4fad22
 2020-12-15 00:04:13 +00:00
Tianjie Xu
2fd269494a Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12512a441b330e062fe8e8d482a367e719c7d45d
 2020-12-15 00:03:48 +00:00
Fabian Kozynski
3c704df4b7 Prototype remove labels in QS 
Add flag to not show labels in QS. This also makes it show more rows.

Added a switch in customizer to toggle the setting.

Some visual issues when toggling (media player), fixed by collapsing and
reopening QS.

In user builds, can be toggled with:

`adb shell settings put secure sysui_remove_labels {0, 1}`

Test: manual
Change-Id: I750c53d918b2d9590ff86eed67d1932444390828
 2020-12-14 18:48:47 -05:00
Hyunyoung Song
49f7265198 Merge "Add new MANAGE_SEARCH_UI permission for the cts test" am: 243b768b24 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527764

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c1810a0e0e1cd0443d603e91455a2f9ce7e5c11
 2020-12-14 23:36:45 +00:00
Hyunyoung Song
243b768b24 Merge "Add new MANAGE_SEARCH_UI permission for the cts test" 2020-12-14 23:31:00 +00:00
Darryl L Johnson
9456572641 Add nullability annotations to device state XSD file. 
This adds nullable annotations to tags that can be null at runtime.

Fixes: 175130179
Test: Manual - view generated java API
Change-Id: If9d032a5eff452ddbaa28050b474051fd66db424
 2020-12-14 15:30:06 -08:00
Tianjie Xu
a258be9df5 Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8d09a821357e06539bc2c71ad8c22587dac0176
 2020-12-14 23:25:48 +00:00
Tianjie
221cad235d Add OTA team as the owner of recovery systems 
The RecoverySystem mostly handles OTA update and interactions with
the recovery mode. Add the ota team as the owner.

Test: build
Change-Id: I81bae46d919ea70f04729d34b62d4a569541d914
 2020-12-14 15:23:42 -08:00
Wale Ogunwale
6facc82fe8 Merge "Rename splitscreen package to legacysplitscreen" 2020-12-14 23:06:47 +00:00
Tianjie Xu
6083210d17 Merge changes Icf10d577,Ia9d3cae7 
* changes:
  Factor out a class to store the rebootEscrow key
  Add namespace in DeviceConfig to support ota teams's features
 2020-12-14 22:58:46 +00:00
Diego Vela
badc7a9249 Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94ec am: 1f9067267a am: 1e02d710bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdd9fef3e5b32ec70d542a0e3e8533d328d4641f
 2020-12-14 22:56:15 +00:00
Diego Vela
af9f1737b0 Merge "Revert "Add <uses-library> information."" am: 3ecd90395a am: 529e76109f am: 5b3715a184 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia065e23238f4c29cd98b26b78e6a2761e773665d
 2020-12-14 22:55:50 +00:00
Treehugger Robot
93b8b32e8b Merge "Add ytai and elaurent to SoundTriggerService OWNERS" am: c1fca8e84e am: 619b06b95f am: 3133db8b96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee1f63773d57627867156ab7704ce9a69a7aeabf
 2020-12-14 22:55:09 +00:00
Ryan Mitchell
2455674831 [automerger skipped] Merge changes from topic "inc-hard-am" am: 314863c132 am: 18e538f72d am: 513b4cf013 -s ours 
am skip reason: Change-Id Icb295186b85e1edcdcebc1d746f7ff0d6ef66829 with SHA-1 016f9e65e4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fd9e8cbdfd62c1d63dab5a013e6e61859a9a573
 2020-12-14 22:54:48 +00:00
Ryan Mitchell
9e6770a6b2 [automerger skipped] Set resource id correctly when resolve fails am: e7ab62723a am: 9e78098e85 am: ccd5ca9bc4 -s ours 
am skip reason: Change-Id Iad1760c0e246da1a4bf64d1c2ec60bb08da32d06 with SHA-1 43d2f21d62 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02c14357286dd07440a2e8451987df99df6f82cb
 2020-12-14 22:54:40 +00:00
Ryan Mitchell
f9b55b35f7 [automerger skipped] Revert^2 "libandroidfw hardening for IncFs" am: 80094e39f9 am: ab46005fe8 am: c85f216055 -s ours 
am skip reason: Change-Id I02d4890d181655dfd0a14c188468db512559d27b with SHA-1 db21f09a8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id33d83cd4f80168b51023802a4aa0cfe082278eb
 2020-12-14 22:54:32 +00:00
Mårten Kongstad
6757e49ae0 [automerger skipped] idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh am: ec7e7f5622 am: 54c5257fb1 am: d45dec21e3 -s ours 
am skip reason: Change-Id I571cb46bb2ca09a244dc7b609a8bb0ffe01a6e2a with SHA-1 ba437e8a61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I589d81100d9e302d3e504866bcf27c6a7c0ae1df
 2020-12-14 22:54:25 +00:00
Mårten Kongstad
03c4d8bbd9 [automerger skipped] idmap2: remove the 'scan' command am: 6532483950 am: 29e7a4394a am: 28b23286d5 -s ours 
am skip reason: Change-Id Iae073c13ce64b5db48f22f7e723bc8c0c5fcd2c9 with SHA-1 3abb504a08 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I874c06a113cbb179af6ee63bdb0b758c5987b245
 2020-12-14 22:54:10 +00:00
Diego Vela
1e02d710bc Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94ec am: 1f9067267a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic44dcdcd401dd1afd9d31ba6bc5afb4d36cdb4de
 2020-12-14 22:38:34 +00:00
TreeHugger Robot
027e0e0deb Merge "Handle mismatched task root on Activity resume and stop" 2020-12-14 22:35:00 +00:00
Adam He
165fe1918b Merge "Unify and clarify divergent flows e.g. where augmented autofill or inline autofill is triggered." 2020-12-14 22:28:32 +00:00
Diego Vela
5b3715a184 Merge "Revert "Add <uses-library> information."" am: 3ecd90395a am: 529e76109f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2984abcaceffc7ac70581095ec1a6ae00af204e8
 2020-12-14 22:25:47 +00:00
Treehugger Robot
3133db8b96 Merge "Add ytai and elaurent to SoundTriggerService OWNERS" am: c1fca8e84e am: 619b06b95f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527771

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88480f3b47abadd72915797092e6f169fa5da551
 2020-12-14 22:25:31 +00:00
Ryan Mitchell
513b4cf013 Merge changes from topic "inc-hard-am" am: 314863c132 am: 18e538f72d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0492ba88186aa970d33b76f04d9814d9aedbdd8f
 2020-12-14 22:25:08 +00:00
Ryan Mitchell
ccd5ca9bc4 Set resource id correctly when resolve fails am: e7ab62723a am: 9e78098e85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25318a316ae24d3f587009c688f7e830b7c00c2b
 2020-12-14 22:25:06 +00:00
Ryan Mitchell
c85f216055 Revert^2 "libandroidfw hardening for IncFs" am: 80094e39f9 am: ab46005fe8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2c3cc5e4e7dc5b0622da41953f6c3d29780ef1
 2020-12-14 22:25:02 +00:00
Mårten Kongstad
d45dec21e3 idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh am: ec7e7f5622 am: 54c5257fb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8788d5ea573be5ee3c006ab7512f822e407af2c1
 2020-12-14 22:24:53 +00:00
Mårten Kongstad
28b23286d5 idmap2: remove the 'scan' command am: 6532483950 am: 29e7a4394a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519907

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04d797b558efe44e763b96b01dc4870e7cc4960b
 2020-12-14 22:24:51 +00:00
Diego Vela
1f9067267a Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic983f3dd9c32bbb9dbd98fd6bee282d5bb43f055
 2020-12-14 22:24:06 +00:00
Lyn Han
a7527663ca Merge "Round notif corners on swipe" 2020-12-14 22:20:38 +00:00
TreeHugger Robot
b064501919 Merge "Minor improvements on DPMS classes:" 2020-12-14 22:15:00 +00:00
Diego Vela
6e35bf94ec Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
TreeHugger Robot
dfbda02fed Merge "Add SystemBatteryConsumer" 2020-12-14 22:07:09 +00:00
Diego Vela
51800d2a4b Revert^2 "Add <uses-library> information." 
6db09a0ad9

Change-Id: I81b0a1228b73b9b4fc8116d1eb3134e5d04a76cd
 2020-12-14 22:05:04 +00:00
Lyn Han
26c610692b Merge "Remove anchor scrolling" 2020-12-14 22:04:50 +00:00
Diego Vela
529e76109f Merge "Revert "Add <uses-library> information."" am: 3ecd90395a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b973ca854b399d1dfc97b13cdfac9aff60f9b15
 2020-12-14 21:59:32 +00:00
Lyn Han
1d52d80ee3 Merge "Disable notification background drawing" 2020-12-14 21:52:27 +00:00
Treehugger Robot
4af7c21be5 Merge "Add resources owners to core/jni and split-select" am: 2991744d47 am: 578171d320 am: 550156c202 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc1ed6c2245fe72e73b7aa046bf35d1e419bd2d1
 2020-12-14 21:50:18 +00:00