Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,941 Commits 3 Branches 0 Tags
e03e835164fe8b2f1235d34c1dba729214a45ffa
Commit Graph

485941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TreeHugger Robot
163686b1b6 Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I9b0e3b74d2595b781abc1586e8b45ba68ea96049
 2020-06-18 14:19:18 +00:00
Pete Bentley
2ed26021b2 Merge commit '0ac895d970e70a1300efb853802f4d2b3443ee22' of persistent-https://googleplex-android.git.corp.google.com/platform/frameworks/base into merge_conflict 
Change-Id: Ia69d97ab86a7a37318fdb2512f4756d6ef438c0e
Merged-In: I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e
 2020-06-18 13:06:40 +01:00
TreeHugger Robot
f3cb058891 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-18 06:57:09 +00:00
TreeHugger Robot
810eadf348 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-18 06:00:14 +00:00
Bill Yi
58a260196c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ica8c64539b3d88b12cbe688b8bf25a964a46476c
 2020-06-18 00:39:21 +00:00
TreeHugger Robot
8858a01373 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-18 00:06:52 +00:00
TreeHugger Robot
75cb80445b Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 23:56:26 +00:00
Bill Yi
6edb8d4ade Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ic1193b06d2acec56da79464d49a5f2dab9b7b618
 2020-06-17 22:49:19 +00:00
Bill Yi
9eac6c4b17 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I8397e9d4cf89d20467ad71149fb804652fd0527f
 2020-06-17 21:33:52 +00:00
Bill Yi
ab406e1abb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I6e9b1d2703c42de62a498c3bf95d2e5d37770dbc
 2020-06-17 20:57:30 +00:00
TreeHugger Robot
11e5fdf1ee Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 16:55:56 +00:00
TreeHugger Robot
6e84264d63 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 16:49:56 +00:00
TreeHugger Robot
ac28b37ec6 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 16:34:42 +00:00
TreeHugger Robot
eafe9238fd Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 16:25:39 +00:00
TreeHugger Robot
0d4e9ecbc0 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 16:25:35 +00:00
TreeHugger Robot
2e8993121b Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-17 16:20:47 +00:00
Bill Yi
b732509d8b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ibae2ed36309ce1c7ab58a1ffd256a4d3ca7b7278
 2020-06-17 04:08:36 +00:00
Bill Yi
e98a257b3d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I7236d4f13701db3c06320f2884100747d71b0d63
 2020-06-17 03:45:42 +00:00
Lucas Dupin
7d985f792c Merge "fix issue where players would be wrongly dismissed" into rvc-dev 2020-06-17 03:31:16 +00:00
Lucas Dupin
01b07e368f Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev 2020-06-17 03:30:46 +00:00
Tingting Wang
6d4e262aa8 Merge "Add CP2 general usage counters to westworld logs." into rvc-dev 2020-06-17 03:30:01 +00:00
Nikita Dubrovsky
74c6b2a668 Merge "Dataset authentication for Augmented Autofill" into rvc-dev 2020-06-17 03:20:39 +00:00
Tony Huang
5ee6fd6f43 Merge "Let activity resume after bubbles expanded" into rvc-dev 2020-06-17 03:18:18 +00:00
Mark Chien
06b2e1cb17 Merge "Protect invalid entitlement app configuration" into rvc-dev 2020-06-17 02:29:34 +00:00
Bill Yi
7d71ebca99 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I24a05eb4e6edec94420ca49edf8441f936e3cea8
 2020-06-17 02:07:05 +00:00
Kevin Chyn
9cd814be2a Merge "Update biometric/keystore documentation" into rvc-dev 2020-06-17 01:43:09 +00:00