Commit Graph

494815 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Kelly Rossmoyer
2837883e87 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make (change is only comments + 1 log message)

Change-Id: I8a21ef4ce19c517853388d8f7542f3a0cf8d91d5
Merged-In: I26ef8e079bf13f19bdc3bbc8219f572a43b68090
2020-09-10 13:55:33 -07:00
Hall Liu
6c0206ae4f Expose some carrier config keys for RTT
These keys were added at some point in the past when the API window for
a release had already passed. Expose these constants for use by apps.

Fixes: 149906782
Test: NA -- constants only
Change-Id: I34c34b05f559ab3424bce42ec61bae3572ff6f8d
2020-09-10 12:22:20 -07:00
Treehugger Robot
c4f395d361 Merge "Change Czech keyboard default layout to qwertz" am: 23ddddef15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417617

Change-Id: I72dfc4f664c397c254c5106603616faa152da8cf
2020-09-10 18:11:29 +00:00
Xin Li
8ac6741e47 Merge "Merge Android R" 2020-09-10 17:22:01 +00:00
Anton Hansson
3de940cc40 Merge "Add owners file for all bp files in apex subdir" 2020-09-10 17:19:35 +00:00
Treehugger Robot
23ddddef15 Merge "Change Czech keyboard default layout to qwertz" 2020-09-10 16:40:20 +00:00
Anton Hansson
14eba557fb Add owners file for all bp files in apex subdir
This is a frequent area of build refactoring.

Test: No
Change-Id: I7582fc3bfa00d2bff74012d6aa31a4b236b916f8
2020-09-10 16:28:08 +01:00
Xin Li
c64112eb97 Merge Android R
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
2020-09-09 20:21:10 -07:00
Jooyung Han
14a6871e43 Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master 2020-09-09 07:35:37 +00:00
Sergey Nikolaienkov
ec82033d3e Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856

Change-Id: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
2020-09-09 07:23:52 +00:00
Sergey Nikolaienkov
104d2f92b3 Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" 2020-09-09 07:09:11 +00:00
Jooyung Han
fa78ddbdc8 statsd: mark libstats_jni as jni_libs
This helps the build system to convey the information to linkerconfig so
that jni_libs are available via libnativeloader.

Bug: 168077238
Bug: 150767721
Test: presubmit
Merged-In: Ie32e88355828c8f696cce9d128eebb6da70026f1
Change-Id: Ie32e88355828c8f696cce9d128eebb6da70026f1
(cherry picked from commit 95642bbc3f)
(cherry picked from commit 39c94c0493)
2020-09-09 06:15:32 +00:00
Brad Ebinger
f3670cc3d3 Merge "Update OWNERS" am: 33082d4490
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418955

Change-Id: Ia358e7f028c9fbbb80aa03e714f652c251a6fd9b
2020-09-08 19:20:53 +00:00
Brad Ebinger
33082d4490 Merge "Update OWNERS" 2020-09-08 18:37:07 +00:00
Treehugger Robot
27e25ee89e Merge "Move PropertyMap from libutils to libinput" am: bf37f0d136
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419037

Change-Id: I79f94c2c458d3314246cbe0980b28acac4d97cb4
2020-09-08 16:17:05 +00:00