Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
517,091 Commits 3 Branches 0 Tags
89480557f4259f833ab7f9d95b9aeeecd944c422
Commit Graph

517091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
89480557f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 24761341ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01c8f014e300b9f76394b03ecfb50161ce6bf553
 2020-08-15 07:16:57 +00:00
TreeHugger Robot
24761341ad Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-15 07:07:41 +00:00
Bill Yi
5fec07e052 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I03057fd866fc5d48e876ac1ca0233db868d7c1a3
 2020-08-14 21:47:41 -07:00
Sudheer Shanka
eecca5adf0 Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 am: 1106a7e692 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634

Change-Id: I44eec10939863f6e15c907427d4c9acba0a43b28
 2020-08-14 18:37:05 +00:00
Brad Ebinger
dbf8777330 [automerger skipped] Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3 am: 8df35b81ca -s ours am: 2e111c7ec6 -s ours 
am skip reason: Change-Id I203b37d8e643c59d69aa26097d223fc4b3f8e332 with SHA-1 d3a397fe80 is in history

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

Change-Id: Ic582f6e6720aeeb992f66a63bc6fb068353ae4cc
 2020-08-14 18:36:29 +00:00
Etan Cohen
218558285d Merge "Fix WiFi + "x" stil visible" into rvc-d1-dev am: a270a22a23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12353922

Change-Id: I168bcaa850da1750b41789a7d693a326f008c741
 2020-08-14 18:34:48 +00:00
Etan Cohen
a270a22a23 Merge "Fix WiFi + "x" stil visible" into rvc-d1-dev 2020-08-14 18:25:34 +00:00
Sudheer Shanka
1106a7e692 Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634

Change-Id: I7e165638f017aca678acf8a014b797534bc8a153
 2020-08-14 18:06:06 +00:00
Brad Ebinger
2e111c7ec6 [automerger skipped] Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3 am: 8df35b81ca -s ours 
am skip reason: Change-Id I203b37d8e643c59d69aa26097d223fc4b3f8e332 with SHA-1 d3a397fe80 is in history

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

Change-Id: I624b886002238d1a19264867c9673f1c0759e079
 2020-08-14 18:02:27 +00:00
Sudheer Shanka
a6fa6fd808 Merge "Fix a minor typo." am: ffd7fdeba1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399634

Change-Id: I4de0e16c3f4ea2a7423b5dfee42da41a3da52e43
 2020-08-14 17:38:21 +00:00
Brad Ebinger
8df35b81ca Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397603

Change-Id: If0d9ec9ddc1139c4ae98f02446dd83873736536a
 2020-08-14 17:37:52 +00:00
Sudheer Shanka
ffd7fdeba1 Merge "Fix a minor typo." 2020-08-14 17:26:15 +00:00
Brad Ebinger
a8acd5c0c3 Merge "Remove IMS call logs that may leak PII" 2020-08-14 17:18:47 +00:00
Peter Collingbourne
3d24a7f05d Merge "Fix a TODO." am: 7bbc03b467 am: 26e004398f am: 40a71c83cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399574

Change-Id: I92ee9481dc83e540253059490f524677c38a2626
 2020-08-14 17:05:56 +00:00
Peter Collingbourne
40a71c83cb Merge "Fix a TODO." am: 7bbc03b467 am: 26e004398f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399574

Change-Id: I55ce7a0b31564b0e6859e974bef95cc60f43e7d8
 2020-08-14 16:48:15 +00:00
Peter Collingbourne
26e004398f Merge "Fix a TODO." am: 7bbc03b467 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399574

Change-Id: I58efe7c2f49d1c463026572c5eabad0f55c6a7e2
 2020-08-14 16:32:21 +00:00
Peter Collingbourne
7bbc03b467 Merge "Fix a TODO." 2020-08-14 16:19:45 +00:00
Sudheer Shanka
a3c16a2ee1 Fix a minor typo. 
Test: n/a
Change-Id: I79bf6d3a28fc4020508989537931e2f78f5a2a10
 2020-08-14 03:58:11 +00:00
Peter Collingbourne
c98cb888eb Fix a TODO. 
The allocator now supports M_HEAP_TAGGING_LEVEL_SYNC so
we can start using it here.

Bug: 135772972
Change-Id: I19b79e652ea9575fd49e5ff3bd02a80c4ec34ee4
 2020-08-13 19:34:30 -07:00
Treehugger Robot
25013a7e30 Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3 am: fbeb17c9ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399715

Change-Id: I918d86a0f93f9e5262e922ad4d3110e9856b38f1
 2020-08-14 01:36:25 +00:00
Treehugger Robot
fbeb17c9ae Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399715

Change-Id: Ifca888e568832dc25e46bccd72f135017b9638f4
 2020-08-14 01:25:12 +00:00
Treehugger Robot
9016cc88e3 Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399715

Change-Id: Ieb38a2506f125763f4df572ffd6e18a9c663f65e
 2020-08-14 01:08:09 +00:00
Treehugger Robot
f98e615b6d Merge "Update language to comply with Android's inclusive language guidance" 2020-08-14 00:53:57 +00:00
Jeff Tinker
0739a50dd1 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Change-Id: I8ca0bbfdc5ecbef3dc9ccff3ef40a14de4e9c6fc
 2020-08-13 16:07:08 -07:00
Brad Ebinger
a3fdb07988 Merge "Remove IMS call logs that may leak PII" into rvc-dev-plus-aosp am: 9e2226375a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12371985

Change-Id: I85f83f8591edc5d969cd63e262c54ef798d4ba78
 2020-08-13 22:57:07 +00:00
Brad Ebinger
9e2226375a Merge "Remove IMS call logs that may leak PII" into rvc-dev-plus-aosp 2020-08-13 22:50:53 +00:00
Steven Moreland
dda9aa4f65 Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 am: bf9f6b4f3b am: 96894457f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: I81e7566993bbc4a0791a734d667acf778abc8421
 2020-08-13 22:46:35 +00:00
Steven Moreland
96894457f7 Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 am: bf9f6b4f3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: Ie9c4dafb0ac9ad965dd51b9b789d2d41a7606a5d
 2020-08-13 22:28:19 +00:00
Florian Mayer
6fc6a67ec3 Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: e0d071525b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: If18870b493379666879316947b2f1664c1a4845f
 2020-08-13 22:05:36 +00:00
Steven Moreland
bf9f6b4f3b Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: Id846805fb7af354f3aabf7ad222f8f8bd87f0d53
 2020-08-13 22:04:30 +00:00
Florian Mayer
ddb152733c Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: I1b32adc87fbf770997fd6e10d44f8dce11b3e512
 2020-08-13 22:03:42 +00:00
Florian Mayer
e0d071525b Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: I7ee33c05511b22c1a3f22fb5864b7d1ffd38098e
 2020-08-13 21:43:47 +00:00
Florian Mayer
ba354cf97c Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: I58105c1a21eb5c6468e0c08a1237fbf0c84633f9
 2020-08-13 21:43:37 +00:00
Steven Moreland
6bfe7f9a26 Merge "ApplicationLoaders: improve classloader cache errs" 2020-08-13 21:26:19 +00:00
Florian Mayer
406dd94dd5 Merge "Do not leak dump objects." into rvc-dev 2020-08-13 21:02:33 +00:00
Sudheer Shanka
ee63631f2f [automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours 
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history

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

Change-Id: Ie4182d1002133522f7f08bfe1da1b33070bbcd0c
 2020-08-13 20:33:45 +00:00
Sudheer Shanka
a47e1f9a24 [automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours 
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history

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

Change-Id: I47ccfab7dd61ebd29360ed5bf012942f2547c0d0
 2020-08-13 20:17:25 +00:00
Sudheer Shanka
7f45a6fcc0 Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342

Change-Id: I234af0318651866983f9089e50e1edcd3e99b547
 2020-08-13 20:00:49 +00:00
Sudheer Shanka
bdfb45d841 Merge "Update language to comply with Android’s inclusive language guidance." 2020-08-13 19:46:49 +00:00
Grace Jia
300b3cce72 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: Ifc88640d6fb38e14a58ad802f520b0c0ee0b35b8
 2020-08-13 19:06:43 +00:00
Grace Jia
6a55cd1644 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I49034d851b111792fa54b3d2f236d56513bb00f9
 2020-08-13 18:46:06 +00:00
Brad Ebinger
d3a397fe80 Remove IMS call logs that may leak PII 
Bug: 160389340
Test: Check logs for PII
Change-Id: I203b37d8e643c59d69aa26097d223fc4b3f8e332
 2020-08-13 18:34:56 +00:00
Grace Jia
e40cfa60de Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I051c16bcaca7f30db5c62772a3d3f39c23f18304
 2020-08-13 18:21:29 +00:00
Grace Jia
329c6ff777 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." 2020-08-13 18:06:19 +00:00
Brad Ebinger
3678f55652 Remove IMS call logs that may leak PII 
Bug: 160389340
Test: Check logs for PII
Change-Id: I203b37d8e643c59d69aa26097d223fc4b3f8e332
Merged-In: I203b37d8e643c59d69aa26097d223fc4b3f8e332
 2020-08-13 17:46:45 +00:00
Steven Moreland
1997524011 ApplicationLoaders: improve classloader cache errs 
When zygote preloads a classloader, but at runtime, a different one is
used, we get an error and fallback. This error is improved in the
following ways:
- print the zip name with the shared libraries, so we know which library
  the error is for
- distinguish cached from runtime dependencies in the error message
  itself

Bug: 163886868
Test: N/A
Change-Id: I3f4c4078e9eb05b83058982afc7b7ea0822d1257
 2020-08-13 17:07:34 +00:00
Alison Cichowlas
86050129a0 [automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -s ours am: 0191494230 -s ours 
am skip reason: Change-Id If0c0b754a066b0ec439a866de3eae84caca7b793 with SHA-1 b18b59fd58 is in history

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

Change-Id: Id4adc4a5434dc140baabe46bb631939c59078d11
 2020-08-13 14:59:33 +00:00
Alison Cichowlas
0191494230 [automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -s ours 
am skip reason: Change-Id If0c0b754a066b0ec439a866de3eae84caca7b793 with SHA-1 b18b59fd58 is in history

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

Change-Id: Ifc81acb7fc6a1fa64db0bbbf66d5be817a7282a1
 2020-08-13 14:40:22 +00:00
Andrei-Valentin Onea
da9fd82cd3 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d am: 33afbc9347 am: 3c8464e035 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: I5459bb5b6cc8741b1128822fa9d5d1a11515df5f
 2020-08-13 14:35:20 +00:00
Alison Cichowlas
6ff4300aa1 Merge "Show the nearby chip for images and files too." am: bd8e5ae31c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397108

Change-Id: I38f79f585072673d40ae8d3dab72cdd838b92c2c
 2020-08-13 14:27:28 +00:00