Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
553,362 Commits 3 Branches 0 Tags
eed9ddcb4e81b0ae4e9584aa7f4608d1efa8b4e8
Commit Graph

553362 Commits

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

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

Change-Id: I529e18e690b3d4163b632810be9d5751c5847c56
 2020-09-14 16:52:26 +00:00
TreeHugger Robot
986c02b562 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-14 16:43:58 +00:00
TreeHugger Robot
c8f579fd86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 74237cc162 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c5afd37fd1f961ca1d1e60f4654cf3d9da7464f
 2020-09-14 16:40:49 +00:00
TreeHugger Robot
74237cc162 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-14 16:16:02 +00:00
Bill Yi
f71dbc4559 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifa519b1746e37bcd08cdbbce12fe0c05508b0b58
 2020-09-14 10:33:03 +00:00
Bill Yi
eba59d16f0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I56c3b73c881bae6f51565f987fd2ea877c61d031
 2020-09-14 09:00:41 +00:00
Junyu Lai
3d1a6b7ced Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df am: 8ea944d77a am: 1183f4a548 am: 7e62609e37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I7c535b32844f00eef3ad2f4454557f92c3d1befc
 2020-09-14 05:24:27 +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
TreeHugger Robot
b5106f60a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 047c1b917d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaaab1b76bb64f542e234d42bce6469f40a899d85
 2020-09-13 21:13:18 +00:00
TreeHugger Robot
047c1b917d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-13 20:53:30 +00:00
Hongwei Wang
3fea89e0fc Merge "Block offset requests prior to entering PiP" into rvc-qpr-dev am: 5656705d6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12554721

Change-Id: I49e9310699f500eb51ed6891caa368ccee485ebd
 2020-09-13 19:25:51 +00:00
Hongwei Wang
5656705d6d Merge "Block offset requests prior to entering PiP" into rvc-qpr-dev 2020-09-13 18:35:53 +00:00
Bill Yi
1168b0b70b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2af3829dc86d8546f811370077bce5c8f561787a
 2020-09-13 17:25:19 +00:00
TreeHugger Robot
f07234ac61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d057f6fdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fa07baeb70032fca82a40249103b5860b621397
 2020-09-12 20:49:26 +00:00
TreeHugger Robot
9d057f6fdc Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-09-12 20:20:34 +00:00
Bill Yi
f293008783 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I572d1eae3ec8211183a99dc9cc4d6703408dba83
 2020-09-12 16:02:51 +00:00
Treehugger Robot
5ca2e8a44e Merge "Quiet excessive logging of missing lambdas during preload" am: 70b20ee0b8 am: 1f2781c323 am: f72a5498af am: d39fbcc29e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424919

Change-Id: I4716c9349dd5db8cc4cb6d42e3f60e4897d5c88e
 2020-09-11 21:46:22 +00: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
Quang Luong
b70296653d Merge "Use WifiEntry#shouldShowXLevelIcon() to show X in level icon" into rvc-qpr-dev am: a2da145ff6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12475283

Change-Id: I1910ca04565e936cd5054cb199aa074ead91cc0e
 2020-09-11 18:57:42 +00:00
Treehugger Robot
70b20ee0b8 Merge "Quiet excessive logging of missing lambdas during preload" 2020-09-11 18:45:03 +00:00
Quang Luong
a2da145ff6 Merge "Use WifiEntry#shouldShowXLevelIcon() to show X in level icon" into rvc-qpr-dev 2020-09-11 18:30:33 +00:00
Treehugger Robot
8513ac2afc Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 am: 1ff037880a am: 6671acef6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

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

Change-Id: I032cdc7bf9972a3c990db8e3bef396ee14795690
 2020-09-11 18:17:30 +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
Narayan Kamath
2ddb682b95 Merge "AppOpsService: Add a special case for OP_RECORD_AUDIO_HOTWORD." into rvc-qpr-dev am: 76cf584185 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12470810

Change-Id: I2ff7b7ba4c4dc40deb1c87aad98879b4a41710ad
 2020-09-11 13:10:30 +00:00
Narayan Kamath
76cf584185 Merge "AppOpsService: Add a special case for OP_RECORD_AUDIO_HOTWORD." into rvc-qpr-dev 2020-09-11 12:19:04 +00:00
Treehugger Robot
8f58cc1e9e [automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10b0 am: ee0cc87d07 -s ours am: 5de3899f44 -s ours am: 590d59c39c -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: Ie4cb5aeed9db638e89f14208dedd73064cd85161
 2020-09-11 10:54:23 +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
4d52c486fb Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100 am: aa1edf9312 am: 0a0c1ce8bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425508

Change-Id: I09c48ce04d58651ad3a71cb43f6202553ad783af
 2020-09-11 06:34:06 +00: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