Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
495,574 Commits 3 Branches 0 Tags
1183f4a548af64997f12ec386ef7dfa6c573b673
Commit Graph

495574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Yi Kong
3979981b2d Merge changes I10ab56a8,I7e437c3d,I0413c52f am: bece59741a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425270

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

Change-Id: Ie9c3618c163c3c5968bf560afab8acbae47d866f
 2020-09-11 01:32:55 +00:00
Yi Kong
fbeb0d8002 Introduce ProfcollectForwardingService am: a0bd2a99ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425268

Change-Id: I7cb007a080145d1c35fdee74a15ae17923cd221c
 2020-09-11 01:30:22 +00:00
Yi Kong
bece59741a Merge changes I10ab56a8,I7e437c3d,I0413c52f 
* changes:
  profcollectd: trigger trace records processing during system idle
  profcollectd: Rename config env to persist.*
  Introduce ProfcollectForwardingService
 2020-09-11 01:25:29 +00:00
Treehugger Robot
72b4976c66 Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418957

Change-Id: Ibfc8df340f6bab77d07791a9568892bc3c893638
 2020-09-11 01:25:04 +00:00
Suprabh Shukla
19411410c5 RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms am: ac3d84392a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418957

Change-Id: Ie1d27d21b447f631c89a9498a5c4b149355c5d96
 2020-09-11 01:22:16 +00:00
Treehugger Robot
87a85276a9 Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" 2020-09-11 01:19:23 +00:00
Kelly Rossmoyer
779a1aedd5 Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377954

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

Change-Id: I6b67e46aa5b421f974578fdd1b194d6166d50875
 2020-09-11 01:05:05 +00:00
Xin Li
b9db5b54f6 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -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: I4556c20984240fd32561e6b70f772b94934e5908
 2020-09-11 00:40:06 +00:00
Anton Hansson
16ae100af1 Merge "Add owners file for all bp files in apex subdir" am: 3de940cc40 am: 2547a73809 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423349

Change-Id: Id6c2b2d2530b2fb598c8c691c126e7caa66b19fc
 2020-09-11 00:08:01 +00:00
Anton Hansson
2547a73809 Merge "Add owners file for all bp files in apex subdir" am: 3de940cc40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423349

Change-Id: I07af3c4a688a105376ce4297f7f8e967a18f13ec
 2020-09-10 23:23:26 +00:00
Kelly Rossmoyer
f8476d358f Merge "Update language to comply with Android's inclusive language guidance" 2020-09-10 23:07:11 +00:00
Suprabh Shukla
ac3d84392a RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms 
While setting an alarm, we should remove any existing occurrences
of the same, but we were skipping on removing any past due non-wakeup
alarms.
In rare cases when a caller is spamming the alarm manager, we
might end up accumulating alarms inside mPendingNonWakeupAlarms that
count towards the per-uid limit of the caller, and may result in an
exception.

Test: atest FrameworksMockingServicesTests:AlarmManagerServiceTest
atest CtsAlarmManagerTestCases

Bug: 167595061
Change-Id: I2d2b08019a3b3a1e63b60d3a6e2909db7b1a1864
 2020-09-10 15:26:44 -07:00
Yi Kong
05302b72f6 profcollectd: trigger trace records processing during system idle 
Add a JobService to trigger trace records processing when the device is
idle and connected to a charger, saving profile disk space that
accumulates over time.

Bug: 79161490
Test: build
Merged-In: Ibb50fb1d05e52be76a63dbf95884b788965eb979
Change-Id: I10ab56a8f0727b0660d1bcd9ba43d0b39a691084
 2020-09-11 05:57:23 +08:00
Yi Kong
b6bb23ce27 profcollectd: Rename config env to persist.* 
... otherwise the option gets reset after reboot.

Test: TreeHugger
Bug: 79161490
Change-Id: I7e437c3df425ff0f604d24502d49a15050b5279d
Merged-In: I7e437c3df425ff0f604d24502d49a15050b5279d
 2020-09-11 05:57:12 +08:00
Yi Kong
a0bd2a99ee Introduce ProfcollectForwardingService 
Bug: 79161490
Test: boot and observe logcat
Change-Id: I0413c52f08b930b1e42971acc7f50e2e2da52f99
Merged-In: I0413c52f08b930b1e42971acc7f50e2e2da52f99
 2020-09-11 05:57:02 +08:00
Treehugger Robot
4fb19f1550 Merge "Expose some carrier config keys for RTT" 2020-09-10 21:39:25 +00:00