Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hai Zhang
592485ea49 Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e am: a4b75fcbf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: I459525ea48e3778d2484b9a6989587e6c4790569
 2020-06-18 14:29:08 +00:00
TreeHugger Robot
0f629dad5f Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev am: d82080094e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11874469

Change-Id: I649ebe7c065d01e21c41e8ccd7bbb64f3ebb02d0
 2020-06-18 14:29:05 +00:00
TreeHugger Robot
5d9b2f3990 Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 am: 63a3be6b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759

Change-Id: Iaaafe3f9b70ed492e72ba85fff18fd05fcc74cc2
 2020-06-18 14:29:00 +00:00
TreeHugger Robot
2b5e8caa6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 384982ef62 -s ours am: 13034814ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a61f5456f856bec0e9fcbaf5daba921a38f81ef
 2020-06-18 14:29:00 +00:00
TreeHugger Robot
cab1e51196 Merge "Controls UI - Properly sort, and set default on seed" into rvc-dev am: f21036b4e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851787

Change-Id: Ice0e217bee32d297502388c1e61d89ae5786907a
 2020-06-18 14:28:53 +00:00
TreeHugger Robot
9d9b74e012 Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: 163686b1b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859

Change-Id: I404cfa16b540306c4bf5d036096476a5fe6c6845
 2020-06-18 14:28:51 +00:00
TreeHugger Robot
14d852adc6 Merge "Revert "Disable user animations on insets whose visible frame is empty"" into rvc-dev am: 11fcb1987a am: f79e0b0cb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883882

Change-Id: I9aa965d5571174c9f60574b1ff45a27e4a0dafed
 2020-06-18 14:28:43 +00:00
TreeHugger Robot
79b501a94d Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev am: 58fd58dea7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859734

Change-Id: If07bf976f240ad2c2608a25d11c95c59f89fd8b2
 2020-06-18 14:28:42 +00:00
Feng Cao
4e8a8e7787 Merge "Fix input method switch handling in autofill" into rvc-dev am: e710511e85 am: 324f4e0429 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855410

Change-Id: I7eee9af52c62533e42213e19d37ce5ecbc12e255
 2020-06-18 14:28:39 +00:00
TreeHugger Robot
c3356f00a9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 02f853ebe6 -s ours am: 5a10dc9fb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ca7d35d648688cf565ca7e0bc97e517b44e6c21
 2020-06-18 14:28:35 +00:00
Lucas Dupin
22d76d1f6b Merge "Fix clipping while scrolling" into rvc-dev am: 4c6f3ff3e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11889960

Change-Id: I6247a49a66fc2721d87c1bf4acf5870ef34c1e9e
 2020-06-18 14:28:31 +00:00
TreeHugger Robot
f1d9539cb6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 384982ef62 -s ours am: 13034814ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3810856e426fd67c34245840799259c7e48195fa
 2020-06-18 14:28:27 +00:00
Beth Thibodeau
de02830423 Merge "Make view intent immutable" into rvc-dev am: 80bf9c825a am: ed7a25fe40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869229

Change-Id: Ibcc892d4fb50e9a993bcef560cd05c8070877dfa
 2020-06-18 14:28:26 +00:00
Tiger Huang
baf9dd4cb9 Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev am: 126e671343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788480

Change-Id: I7eeb2c52b09424f3b0ff9ca24e161eeb41b88ef8
 2020-06-18 14:28:20 +00:00
Feng Cao
1c222686b4 Merge "Fix input method switch handling in autofill" into rvc-dev am: e710511e85 am: 324f4e0429 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855410

Change-Id: I34a80d170c4087f575170bc2e71cd04e535f50fd
 2020-06-18 14:28:17 +00:00
TreeHugger Robot
22a9589834 Merge "Document ACTION_WEBVIEW_SETTINGS possible unavailability" into rvc-dev am: 3b915e51e1 am: 2b1382ca07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602072

Change-Id: I33530f33daf403e35a07cc13df989c59f3db310d
 2020-06-18 14:28:11 +00:00
Beth Thibodeau
c59f54ab2a Merge "Make view intent immutable" into rvc-dev am: 80bf9c825a am: ed7a25fe40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869229

Change-Id: I3099a50d79b13eaa2905f4363dc04bbef01e9337
 2020-06-18 14:28:09 +00:00
Mark Chien
b64f7fd66d Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 36806fa822 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: I06154325294f31d3f742d38e8f5eea1ff2190a88
 2020-06-18 14:28:08 +00:00
TreeHugger Robot
2f2272f3c9 Merge "Document ACTION_WEBVIEW_SETTINGS possible unavailability" into rvc-dev am: 3b915e51e1 am: 2b1382ca07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602072

Change-Id: I35b673e11889114a27d9fdacd4e959df051eada9
 2020-06-18 14:27:59 +00:00
Nikita Ioffe
89ebd1cf4f Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a am: daf5ff9053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518

Change-Id: I23077472847ec9c99cb1b6cf073b5cd7be2f4707
 2020-06-18 14:27:50 +00:00
Nikita Ioffe
f3d620b58e Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a am: daf5ff9053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518

Change-Id: Ifafb02253175d21d0841fc8ab64c476be3fc6ec5
 2020-06-18 14:27:48 +00:00
John Reck
148d57b968 Merge "Revert "Drop max texture cache size from 12x to 5x"" into rvc-dev am: 556fe0b9e5 am: 1b5d8a8b26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838959

Change-Id: Iecc2bbaa659f5a8bbf28835aade69bd56d6513fc
 2020-06-18 14:27:39 +00:00
John Reck
f30bd2dfa1 Merge "Revert "Drop max texture cache size from 12x to 5x"" into rvc-dev am: 556fe0b9e5 am: 1b5d8a8b26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838959

Change-Id: Id739c9ac3d31671e47af41a915742c529f33e25b
 2020-06-18 14:27:38 +00:00
TreeHugger Robot
c03bbfcb7f Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886117

Change-Id: Id6f675c98987ee088d18ce10339732f600ae6f00
 2020-06-18 14:27:38 +00:00
Patrick Baumann
e518db7cd3 Pre-cache filter results am: 0192f737ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817533

Change-Id: I26ef5e55e9e18d29563b73975576a9305c1f2175
 2020-06-18 14:27:35 +00:00
TreeHugger Robot
bd856cf508 Merge "Implementation of sharding for procstats atoms" into rvc-dev am: 26dfdc587f am: 69a7a599ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859725

Change-Id: Icfb8f34a60a7af83763730adbbbb09422206e716
 2020-06-18 14:27:31 +00:00
TreeHugger Robot
faefdc733d Merge "Implementation of sharding for procstats atoms" into rvc-dev am: 26dfdc587f am: 69a7a599ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859725

Change-Id: I19c8c394f6ce4b60043e2a16e4c39c03bd2c6370
 2020-06-18 14:27:27 +00:00
Yara Hassan
2baffca0d6 Add westworld logging for CCAPI data share am: faf50e11cb am: 74da01288d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818613

Change-Id: Ic06da24db5a41a91300f6bd686d7dd934d108b09
 2020-06-18 14:27:15 +00:00
Yara Hassan
0da160920c Add westworld logging for CCAPI data share am: faf50e11cb am: 74da01288d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818613

Change-Id: Ic74aac1f373ee56f803d34065c2a18125fe80e58
 2020-06-18 14:27:10 +00:00
Ruslan Tkhakokhov
05b564a10e Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fbdb am: d39b0a73b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867444

Change-Id: If1ed3524d771f53bf91c5844ef9beea5eeff872f
 2020-06-18 14:27:07 +00:00
Ruslan Tkhakokhov
a10bcc557d Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fbdb am: d39b0a73b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867444

Change-Id: I8d3f0854d3e5391dc2713b0913c390b3429619a4
 2020-06-18 14:27:03 +00:00
TreeHugger Robot
64bba6ab51 Merge "Check resolved override bounds for attaching IME to activity" into rvc-dev am: 4e11c2445b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881940

Change-Id: I6e8041dacb486eec946eccfbc1ac9141eab11fef
 2020-06-18 14:27:03 +00:00
Winson Chung
3bf6bb4330 Merge "Add additional tracing for nav button backgrounds" into rvc-dev am: e184e6c819 am: d302eb4fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869885

Change-Id: I90b3e22b18f731e04b4dd10e071e8112a6d08b57
 2020-06-18 14:26:55 +00:00
Winson Chung
7e89f5325b Merge "Add additional tracing for nav button backgrounds" into rvc-dev am: e184e6c819 am: d302eb4fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869885

Change-Id: Ifb502a2c071ba7880efd0c9b9a7cdcecce626370
 2020-06-18 14:26:53 +00:00
Lucas Dupin
2ef3210f10 Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf18309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887489

Change-Id: I78c7f31b90543aa46206c920a5e84465c17fb3a7
 2020-06-18 14:26:53 +00:00
Matt Casey
1af3accc24 Merge "Dismiss screenshot UI on back gesture/button." into rvc-dev am: 50886ed9a2 am: d20f039ec7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11875978

Change-Id: Iece90054bbf449e37317aa5bdcce68a84fee5887
 2020-06-18 14:26:45 +00:00
Matt Casey
0b8a1270c1 Merge "Dismiss screenshot UI on back gesture/button." into rvc-dev am: 50886ed9a2 am: d20f039ec7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11875978

Change-Id: Icfe3ad6083aa0da74b9b881c9b71e0a26ea6b4ba
 2020-06-18 14:26:39 +00:00
Lucas Dupin
e03e835164 Merge "fix issue where players would be wrongly dismissed" into rvc-dev am: 7d985f792c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887440

Change-Id: I945e8c8b2220c14ba7717e6b3c68318f99a2ca23
 2020-06-18 14:26:36 +00:00
Lucas Dupin
0c6e01702b Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820

Change-Id: Ib961eec96af375e61e28e1757f5deb6a8439d173
 2020-06-18 14:26:24 +00:00
Pete Bentley
2eaeb17d84 Merge commit '0ac895d970e70a1300efb853802f4d2b3443ee22' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/base into merge_conflict am: 2ed26021b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11900924

Change-Id: I666b2f2043ca4ae3546e6bc3b7b89ba6552dce50
 2020-06-18 14:26:19 +00:00
Pete Bentley
0e97ad5b0b [automerger skipped] Merge commit '0ac895d970e70a1300efb853802f4d2b3443ee22' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/base into merge_conflict am: 2ed26021b2 -s ours 
am skip reason: Change-Id I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e with SHA-1 bdabcc36f3 is in history

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

Change-Id: I4deb3483352d955859b7264dd604c2100b4b2f88
 2020-06-18 14:26:14 +00:00
Tingting Wang
5454e69665 Merge "Add CP2 general usage counters to westworld logs." into rvc-dev am: 6d4e262aa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855701

Change-Id: I14a70615551d9c3103261db13a8ce859fa0a96b4
 2020-06-18 14:26:14 +00:00
Nikita Dubrovsky
56055f7dd0 Merge "Dataset authentication for Augmented Autofill" into rvc-dev am: 74c6b2a668 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825429

Change-Id: I933d85f7d722cb3677f5dd92c7e5d649bc828acc
 2020-06-18 14:25:48 +00:00
Tony Huang
fb8f2ae018 Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833785

Change-Id: I01534a22744be9ab39eaea6aeea2a6d1ad417f87
 2020-06-18 14:25:37 +00:00
Mark Chien
4e8de47ed1 Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: Ida5076888f61e8e472e853ce1ee58f8106dacbb2
 2020-06-18 14:25:17 +00:00
Kevin Chyn
f1f2fa9e04 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: I15ee8c3dbafd40dec5ba6e62a9d94c1dc1a5bc20
 2020-06-18 14:25:03 +00:00
Josh Tsuji
26e26c5e9f Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049

Change-Id: I3b0efb28c5053269617f6f9bfd8d79acd3b2aca0
 2020-06-18 14:24:54 +00:00
Hayden Gomes
ecea6e9950 Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I1092479277df8a9da366a8b609eb234f33ceb984
 2020-06-18 14:24:40 +00:00
Hai Zhang
a4b75fcbf4 Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: I8656e646a04b61e7fb71d8e2e8eeffc8ebc98cb1
 2020-06-18 14:23:25 +00:00
TreeHugger Robot
63a3be6b5f Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759

Change-Id: Iaf583e1e6e5778c08dcc70c194a13cc3bde8d5d7
 2020-06-18 14:23:15 +00:00