Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
529,108 Commits 3 Branches 0 Tags
fdf0be5a247cc9d26b6192022cfbb047c2ee6a5f
Commit Graph

529108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
fdf0be5a24 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 5c62f01896 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

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

Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
 2020-09-14 21:50:56 +00:00
Bill Yi
5c62f01896 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

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

Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
 2020-09-14 21:18:54 +00:00
Bill Yi
938d3bb1f5 Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2020-09-14 05:33:38 +00:00
Junyu Lai
7e62609e37 Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df am: 8ea944d77a am: 1183f4a548 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I907b35a02c0957ae57f55ae960df1ff5fce0be8e
 2020-09-14 05:02:21 +00:00
Junyu Lai
1183f4a548 Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df am: 8ea944d77a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I4eb9d53d1136ba6e4b9e1fdb884e0920567db2f7
 2020-09-14 04:26:15 +00:00
Junyu Lai
8ea944d77a Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I19ffa2e0d367fecd0859e30c698612f3bdef99e4
 2020-09-14 03:52:33 +00:00
Junyu Lai
fc6fbde5df Merge "Handle lockdown VPN reset intent in ConnectivityService" 2020-09-14 03:14:51 +00:00
Bill Yi
75f38e0ff3 Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
 2020-09-13 07:58:42 -07:00
Treehugger Robot
d39fbcc29e Merge "Quiet excessive logging of missing lambdas during preload" am: 70b20ee0b8 am: 1f2781c323 am: f72a5498af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424919

Change-Id: Icaa3321c187b2c4f64fc7d56d9917fdb5b4e216b
 2020-09-11 21:16:58 +00:00
Treehugger Robot
f72a5498af Merge "Quiet excessive logging of missing lambdas during preload" am: 70b20ee0b8 am: 1f2781c323 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424919

Change-Id: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
 2020-09-11 20:39:22 +00:00
Treehugger Robot
1f2781c323 Merge "Quiet excessive logging of missing lambdas during preload" am: 70b20ee0b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424919

Change-Id: Ied248c50c7c3150604390c6cd4734d81e050d6fd
 2020-09-11 19:09:26 +00:00
Treehugger Robot
70b20ee0b8 Merge "Quiet excessive logging of missing lambdas during preload" 2020-09-11 18:45:03 +00:00
Chris Wailes
5d29f49b7b Quiet excessive logging of missing lambdas during preload 
This patch will change the logging behavior in the Zygote such that
lambdas from the preload list that aren't found during Zygote
initialization will be counted and a summary provided at the end rather
than logging them each individually.  These missing lambdas will only be
logged for userdebug builds.

Test: Compared logs before and after
Bug: 163602260
Change-Id: I4cd11d626d7e4f365c55f8458aac20cd442638ed
Merged-In: I4cd11d626d7e4f365c55f8458aac20cd442638ed
 2020-09-11 10:55:02 -07:00
Treehugger Robot
6671acef6e Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 am: 1ff037880a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: I4ec82de3182802b71ebe8c5a9ac2b9bdaaa58cdf
 2020-09-11 17:29:36 +00:00
Treehugger Robot
3f0535c610 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59 am: 19797c2dd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I727723ed6f0685b43b499453256ae3de8c7d65e5
 2020-09-11 17:29:18 +00:00
Treehugger Robot
1ff037880a Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: I03a1373dcc1cdcf0d73536d98d5205317183cdef
 2020-09-11 16:48:39 +00:00
Treehugger Robot
19797c2dd6 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I88f4bab6d15ae71456f85f51391c942dc9c8875f
 2020-09-11 16:48:21 +00:00
Treehugger Robot
927f0f7453 Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: If839338c8ea8a34afd896aac93e1118e8e2685bb
 2020-09-11 16:06:45 +00:00
Treehugger Robot
558a921d81 Merge "Update language to comply with Android's inclusive language guidance" 2020-09-11 15:57:59 +00:00
Treehugger Robot
333fdf8c59 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I7a106fa19d96b16e1c7a3ee05e6055abb624271e
 2020-09-11 15:50:07 +00:00
Treehugger Robot
ce7d32096e Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" 2020-09-11 15:14:07 +00:00
Lais Andrade
e5c953b7ec Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG: 162536543
Test: N/A
Change-Id: Ied240c486df4072ca6301511aa3419f746404afa
 2020-09-11 14:31:20 +00:00
Jeff Blattman
2ab3cc241e Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks 
The issue is that the VolumeDialogControllerImpl.C's mCallbackMap is
accessed from two different threads. Instrumentation shows that via
add() and remove() it is modified on the main thread, and methods like
C.onConfigurationChanged() are called from
VolumeDialogControllerImpl.Receiver, which registers with
on a handler tied to a background thread
(VolumeDialogControllerImpl.W/mWorker). C.onConfigurationChanged()
is called directly from that thread.

Use a concurrent hash map in place of hash map to avoid the
concurrent modification exception.

Test: manual. Ensure device boots. Ensure basic volume control
functions. Ensure a configuration change (via locale change)
does not result in any crash.

Bug: https://issuetracker.google.com/issues/150402778

Change-Id: I26bb8533c30d57e48f500e6863d0f522e1559567
 2020-09-11 13:33:57 +00:00
Treehugger Robot
590d59c39c [automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10b0 am: ee0cc87d07 -s ours am: 5de3899f44 -s ours 
am skip reason: Change-Id I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719 with SHA-1 b3288fbdd5 is in history

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

Change-Id: I9fcc200ddb299ed73321b113f9bbffdecca78f28
 2020-09-11 10:14:30 +00:00
Treehugger Robot
5de3899f44 [automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10b0 am: ee0cc87d07 -s ours 
am skip reason: Change-Id I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719 with SHA-1 b3288fbdd5 is in history

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

Change-Id: I872eca85c4ce9b96b86ba8de67fbe603274ce0b3
 2020-09-11 09:29:34 +00:00
Treehugger Robot
ee0cc87d07 Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425473

Change-Id: Id76c3decd9bd0be47700653fc490d64c46190511
 2020-09-11 08:40:46 +00:00
Treehugger Robot
68ca4e10b0 Merge "Add '-unstable' to solve ODR violation" 2020-09-11 08:19:44 +00:00
Jeongik Cha
388d5136b5 Add '-unstable' to solve ODR violation 
The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719
Merged-In: I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719
Exempt-From-Owner-Approval: cp from internal
 2020-09-11 15:39:46 +09:00
Gyumin Sim
0a0c1ce8bb Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100 am: aa1edf9312 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425508

Change-Id: I1ee6c9f690c110ba4e8b563b194fa55391e4ba92
 2020-09-11 05:44:42 +00:00
Gyumin Sim
aa1edf9312 Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425508

Change-Id: I2b9b4eef4cf075e9b38de2f5db4e73db3406e16a
 2020-09-11 05:09:28 +00:00
Gyumin Sim
75fa27a100 Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425508

Change-Id: I8d15b8a73d0d49eadd9d0c295430dcd6d34acbd2
 2020-09-11 04:22:52 +00:00
Yi Kong
70833656a8 Merge changes I10ab56a8,I7e437c3d,I0413c52f am: bece59741a am: 3979981b2d am: 70d4f9abc9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425270

Change-Id: I87e9f3a8e69bb69ce6d67986bba92f7f0ac4e757
 2020-09-11 03:56:16 +00:00
Yi Kong
99e8bf8ddb profcollectd: Rename config env to persist.* am: b6bb23ce27 am: 790ac8d3b2 am: bdf21de769 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425269

Change-Id: I7485cf89726935ebe026442e37e27c3cd3516751
 2020-09-11 03:56:12 +00:00
Yi Kong
4e400a6f4e Introduce ProfcollectForwardingService am: a0bd2a99ee am: fbeb0d8002 am: 4914fdc68c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425268

Change-Id: I49793af287143663a5301f1a70fec13b67fc9798
 2020-09-11 03:56:03 +00:00
Treehugger Robot
9baaf89491 Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9 am: 72b4976c66 am: f22a7ac463 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418957

Change-Id: I38d57b0ceaaf63fec5ca3cb5ff4b21997912016d
 2020-09-11 03:54:48 +00:00
Suprabh Shukla
58748edc02 RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms am: ac3d84392a am: 19411410c5 am: 706e8792eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418957

Change-Id: I91a0b94a5ccf50c2fd01ca8224d764eaf7d71353
 2020-09-11 03:54:43 +00:00
Kelly Rossmoyer
c19fd3c4cb Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: If391531e878e43b8856b230d3b5a12fb0e5492e1
 2020-09-11 03:53:49 +00:00
Treehugger Robot
b2474e5f88 Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 am: 56f0f3a67b am: 370924cafc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: I0915314f856a010900a8a2f0699f4461014106a0
 2020-09-11 03:50:37 +00:00
junyulai
d6c614f778 Handle lockdown VPN reset intent in ConnectivityService 
Currently, LockdownVpnTracker handles lockdown VPN reset intent.
Which will grab VPN object as a lock, then calls into
ConnectivityService to grab mVpn lock when querying NetworkInfo.
However, the order of grabing locks differs from ConnectivityService
and will causes deadlock if ConnectivityService grabs locks in
the other order.

Thus, make ConnectivityService handles reset intent so the
order of grabing locks can be consistent.

Test: atest FrameworksNetTests
Bug: 147403549
Change-Id: Ia10a3ef6f1e20d092a17313935083a84860961aa
 2020-09-11 11:43:51 +08:00
Gyumin Sim
93a807bcf7 Merge "Comply with inclusive language guidance in media session and browser" 2020-09-11 03:40:09 +00:00
Xin Li
8db7491422 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: a9f9ccbc9a -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
 2020-09-11 03:33:28 +00:00
Yi Kong
70d4f9abc9 Merge changes I10ab56a8,I7e437c3d,I0413c52f am: bece59741a am: 3979981b2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425270

Change-Id: I8b6f8fbea58ff300ca58fb781883d24bc54024c4
 2020-09-11 02:21:52 +00:00
Yi Kong
bdf21de769 profcollectd: Rename config env to persist.* am: b6bb23ce27 am: 790ac8d3b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425269

Change-Id: I145026fa72d179827311531924d18857bb6aec2d
 2020-09-11 02:21:50 +00:00
Yi Kong
4914fdc68c Introduce ProfcollectForwardingService am: a0bd2a99ee am: fbeb0d8002 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425268

Change-Id: I41b48dbf6a7c9272284b56ae1e1390c7d539e174
 2020-09-11 02:21:48 +00:00
Treehugger Robot
f22a7ac463 Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9 am: 72b4976c66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418957

Change-Id: I30c8857054d78d1b0234797ff67cc477311bcc73
 2020-09-11 02:19:58 +00:00
Suprabh Shukla
706e8792eb RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms am: ac3d84392a am: 19411410c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418957

Change-Id: Iad14c19f5c4f0b040cb7abbcaa33366e13f20628
 2020-09-11 02:19:57 +00:00
Kelly Rossmoyer
9f1608f214 Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

Change-Id: I53214a146b055f9866ccafcffa395fb1a2dc94a3
 2020-09-11 02:18:09 +00:00
Treehugger Robot
370924cafc Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 am: 56f0f3a67b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: Id4a31178da347a03bb3b1029921ce553712468d1
 2020-09-11 02:16:20 +00:00
Xin Li
a9f9ccbc9a [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
 2020-09-11 02:02:37 +00:00
Gyumin Sim
71133463f7 Comply with inclusive language guidance in media session and browser 
See https://source.android.com/setup/contribute/respectful-code for
reference.

Bug: 161896447
Change-Id: I9c48b7d835821691d37f4f1c866569071feb8cb7
Test: N/A
 2020-09-11 01:38:34 +00:00