Bill Yi
eb16f029ee
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 8931739c16
2019-08-11 21:31:53 -07:00
TreeHugger Robot
8931739c16
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-08-12 04:00:48 +00:00
Kyeongkab.Nam
4b98ce6898
Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389
...
am: 41c9e7092e
2019-08-11 18:49:12 -07:00
Kyeongkab.Nam
41c9e7092e
Merge "Fix a lock issue in AudioPortEventHandler"
...
am: 0985eea389
2019-08-11 18:38:44 -07:00
Treehugger Robot
0985eea389
Merge "Fix a lock issue in AudioPortEventHandler"
2019-08-12 01:22:58 +00:00
Ned Burns
12201c4bf7
Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev
...
am: 68f3bb1305
2019-08-09 15:38:06 -07:00
Ned Burns
68f3bb1305
Merge "Ensure isTopBucket() gets set when there is just one notification" into qt-dev
2019-08-09 22:21:45 +00:00
Bill Yi
419814670d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibb92c8650e8f63fd70e7a23dcbde26ce19868d4a
2019-08-09 15:06:46 -07:00
Bill Yi
32cc5ed314
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: fe2d421fab
2019-08-09 12:30:07 -07:00
TreeHugger Robot
fe2d421fab
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-08-09 18:42:27 +00:00
Ned Burns
6c34506dd8
Ensure isTopBucket() gets set when there is just one notification
...
My descendants will vilify this CL for generations to come. We'll
clean it up for R, but this is our last, best hope for fixing things
in Q.
Bug: 138775282
Test: manual
Change-Id: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
Merged-In: I615b2f7fddca30dae67dbaab0e5d54a824a4c441
(cherry picked from commit 2d35980e72
2019-08-09 17:28:27 +00:00
Kyunglyul Hyun
81d17f56dd
Merge "Add klhyun@ to media OWNERS" am: 454029142c
...
am: a7a67d17b6
2019-08-09 07:39:50 -07:00
Kyunglyul Hyun
a7a67d17b6
Merge "Add klhyun@ to media OWNERS"
...
am: 454029142c
2019-08-09 07:29:58 -07:00
Treehugger Robot
454029142c
Merge "Add klhyun@ to media OWNERS"
2019-08-09 14:04:34 +00:00
Steven Moreland
bddb4d69d2
Merge "Fix ParcelNullabilityTest." into stage-aosp-master
...
am: dc6a23bab9
2019-08-08 19:35:40 -07:00
TreeHugger Robot
dc6a23bab9
Merge "Fix ParcelNullabilityTest." into stage-aosp-master
2019-08-09 01:59:23 +00:00
Bill Yi
1715bf4a65
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If8df5134da53280a8a52b21df9d4769d31230d0a
2019-08-08 18:58:21 -07:00
Bill Yi
b87c62f388
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 801d177995
2019-08-08 18:25:08 -07:00
TreeHugger Robot
801d177995
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-08-09 01:08:59 +00:00
Kyeongkab.Nam
6dbaaf2d8a
Fix a lock issue in AudioPortEventHandler
...
It used "this" as a lock object to guard mListeners. but "this" is
pointing to mHandler in handler thread.
This causes the IndexOutOfBoundsException.
bug: 138951761
Test: manual
Change-Id: I826c7c68ecff4fc0d39addd3d56bc989e00848bc
2019-08-09 09:30:44 +09:00
Yi Kong
1f2ddd8b7f
[automerger skipped] Merge "Fix statsd ASAN failure" am: 12140677ea -s ours
...
am: e8460d61e5d39437888c
2019-08-08 15:59:50 -07:00
Yi Kong
e8460d61e5
[automerger skipped] Merge "Fix statsd ASAN failure"
...
am: 12140677ea12140677ea
2019-08-08 15:49:08 -07:00
Yi Kong
12140677ea
Merge "Fix statsd ASAN failure"
2019-08-08 22:09:48 +00:00
Yi Kong
3ee963917f
Fix statsd ASAN failure
...
If tagId is not found in kAllPullAtomInfo map, StatsPuller will read
outside of the object. Add a condition check to gracefully handle
unrecognised tagId and fix the ASAN failure.
Bug: 139037732
Test: boot aosp_x86-eng
Change-Id: Ic62b89866dbec82f05e6f8e6afca9b312f44a801
Merged-In: I5db561c4223efc4ef6b1441490d319cc6ec8afc7
Exempt-From-Owner-Approval: trivial change, owner OOO.
2019-08-08 22:09:09 +00:00
Andrew Sapperstein
60cc649995
Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
...
am: aa3689c4d9
2019-08-08 14:30:31 -07:00
Andrew Sapperstein
aa3689c4d9
Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
2019-08-08 20:50:09 +00:00
Yi Kong
d39437888c
Fix statsd ASAN failure
...
Empty change to block automerger.
Test: N/A
Bug: 139037732
Change-Id: I5db561c4223efc4ef6b1441490d319cc6ec8afc7
(cherry picked from commit 660b7ff8084a448a8341de5db1303019f2af8479)
2019-08-08 13:37:25 -07:00
Elliott Hughes
3c24dd8caf
Merge "Use String8 for UTF16 to UTF8 conversion." am: 527c91320d
...
am: c3b0712ed2
2019-08-08 13:13:27 -07:00
Elliott Hughes
c3b0712ed2
Merge "Use String8 for UTF16 to UTF8 conversion."
...
am: 527c91320d
2019-08-08 12:51:31 -07:00
Elliott Hughes
527c91320d
Merge "Use String8 for UTF16 to UTF8 conversion."
2019-08-08 19:12:04 +00:00
Steven Moreland
42fb0c80fb
Fix ParcelNullabilityTest.
...
Test: atest android.os.ParcelNullabilityTest
Fixes: 138999297
Change-Id: I0f5c09a1e8f7a2927409f228a566988d949f34c7
2019-08-08 11:15:35 -07:00
bsears
a4cd2edc7d
Merge "Avoid using secondary displays as launch params when not support" into qt-dev
...
am: c5568f9aac
2019-08-08 11:03:55 -07:00
bsears
c5568f9aac
Merge "Avoid using secondary displays as launch params when not support" into qt-dev
2019-08-08 17:51:11 +00:00
Bill Yi
a241f18783
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1fc9b1dc26f21604c06de951f0bfc0ec4e5e1155
2019-08-08 10:30:47 -07:00
Patrick Baumann
63b0ccf092
Merge "Cleans up sharedUser regardless of creation logic" into qt-dev
...
am: a1bf282e43
2019-08-08 10:08:34 -07:00
Elliott Hughes
1f7b854d70
Use String8 for UTF16 to UTF8 conversion.
...
This is the only actual user of libcutils' jstring.h.
Test: treehugger
Change-Id: I0444d42e5a3ca57de3bffca48aa265f267c3d4dc
2019-08-08 09:36:14 -07:00
Rajeev Kumar
2123aad7ab
Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3cc1
...
am: f9e3e40676
2019-08-08 09:24:14 -07:00
TreeHugger Robot
a1bf282e43
Merge "Cleans up sharedUser regardless of creation logic" into qt-dev
2019-08-08 16:18:33 +00:00
Rajeev Kumar
f9e3e40676
Merge "Stop showing disclosure UI when isDisclosureEnabled is false."
...
am: 6452cc3cc1
2019-08-08 09:13:56 -07:00
Rajeev Kumar
6452cc3cc1
Merge "Stop showing disclosure UI when isDisclosureEnabled is false."
2019-08-08 15:42:51 +00:00
Andrew Sapperstein
e016781807
Add a blacklist for preinstalled carrier apps.
...
Allows an OEM to specify that a preinstalled carrier app, even if
TelephonyManager says it should have carrier privileges, does not
get granted the default permissions and does not get enabled when
a compatible SIM is inserted.
Bug: 138150105
Test: verified locally
Change-Id: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
Merged-In: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
2019-08-08 15:05:06 +00:00
Remi NGUYEN VAN
9832b48095
Merge "Fix interfaceVersion in DhcpServerCallbacks" am: e921001f2d
...
am: 5833474d58
2019-08-08 06:12:06 -07:00
Remi NGUYEN VAN
5833474d58
Merge "Fix interfaceVersion in DhcpServerCallbacks"
...
am: e921001f2d
2019-08-08 06:02:06 -07:00
Treehugger Robot
e921001f2d
Merge "Fix interfaceVersion in DhcpServerCallbacks"
2019-08-08 12:41:51 +00:00
Nicolas Geoffray
ed22d5f05c
Merge "Notify the ART runtime when boot is complete." am: f83748ae28
...
am: 6b9ab57b2d
2019-08-08 05:32:55 -07:00
Nicolas Geoffray
6b9ab57b2d
Merge "Notify the ART runtime when boot is complete."
...
am: f83748ae28
2019-08-08 05:11:55 -07:00
Nicolas Geoffray
f83748ae28
Merge "Notify the ART runtime when boot is complete."
2019-08-08 11:58:06 +00:00
Anna Trostanetski
f74bce37de
Merge "Upload platform compat config generated from framework target." am: d7345e923a
...
am: 01a10679ac
2019-08-08 04:44:04 -07:00
Anna Trostanetski
01a10679ac
Merge "Upload platform compat config generated from framework target."
...
am: d7345e923a
2019-08-08 04:34:15 -07:00
Anna Trostanetski
d7345e923a
Merge "Upload platform compat config generated from framework target."
2019-08-08 10:54:02 +00:00
