Brad Ebinger
7d6a9dc4e8
Merge "Prevent Infinite Recursion in Telecom Sessions" am: 8dec6de25a
...
am: 4bccabef90
2019-08-13 10:37:21 -07:00
Brad Ebinger
4bccabef90
Merge "Prevent Infinite Recursion in Telecom Sessions"
...
am: 8dec6de25a
2019-08-13 10:25:44 -07:00
Brad Ebinger
8dec6de25a
Merge "Prevent Infinite Recursion in Telecom Sessions"
2019-08-13 17:10:53 +00:00
Mark Chien
5d2bb5b544
Merge "Don't allow upstream if entitlement don't know any downstream" am: 161814ffb1
...
am: 538bc0fe4f
2019-08-13 03:01:31 -07:00
Mark Chien
538bc0fe4f
Merge "Don't allow upstream if entitlement don't know any downstream"
...
am: 161814ffb1
2019-08-13 02:49:09 -07:00
Mark Chien
161814ffb1
Merge "Don't allow upstream if entitlement don't know any downstream"
2019-08-13 09:36:16 +00:00
markchien
426311bcb5
Don't allow upstream if entitlement don't know any downstream
...
In case tethering donwstream is setup but don't ask EntitlementManager
to run provisioning. Cellular upstream should not be allowed if
EntilementManager don't have any donwstream record.
Bug: 134649258
Test: -build, flash, boot
-manual test with carrier SIM
Change-Id: I609722c79f0a45a1c2164d39721ef5883e436feb
2019-08-13 02:28:41 +00:00
Leland Miller
568f8bff01
Merge "Add documentation for Locked Messages" am: 3e85da2d89
...
am: 332f0a4ae8
2019-08-12 18:32:08 -07:00
Leland Miller
332f0a4ae8
Merge "Add documentation for Locked Messages"
...
am: 3e85da2d89
2019-08-12 18:21:16 -07:00
Brad Ebinger
839bfaf7d0
Prevent Infinite Recursion in Telecom Sessions
...
There looks to be a case where infinite recursion
is occuring when printing information about
Telecom Sessions. Set a reasonable limit of
iterations and throw a warning when this condition
occurs to better track down a root cause.
Bug: 139045282
Test: atest TelecomUnitTests:SessionTest
Merged-In: Iae69c5db070c5e58ae5d37c12d1c4df027138611
Change-Id: Iae69c5db070c5e58ae5d37c12d1c4df027138611
2019-08-13 00:39:44 +00:00
Leland Miller
3e85da2d89
Merge "Add documentation for Locked Messages"
2019-08-12 23:42:56 +00:00
Brad Ebinger
8a382eda66
[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours
...
am: 3c81a4c537fbc22c2b6d
2019-08-12 11:41:45 -07:00
Brad Ebinger
3c81a4c537
[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI"
...
am: ce98a32755fbc22c2b6d
2019-08-12 11:23:41 -07:00
Brad Ebinger
ce98a32755
Merge "SurfaceControl: Fix captureLayers JNI"
2019-08-12 17:46:33 +00:00
Sungsoo Lim
ec955bbf91
Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92
...
am: c91d1ea7ed
2019-08-11 21:51:43 -07:00
Sungsoo Lim
c91d1ea7ed
Merge "Fix reference leak on TvInputHardwareManager"
...
am: 8b578c9c92
2019-08-11 21:32:00 -07:00
Bill Yi
eb16f029ee
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 8931739c16
2019-08-11 21:31:53 -07:00
Sungsoo Lim
8b578c9c92
Merge "Fix reference leak on TvInputHardwareManager"
2019-08-12 04:02:56 +00: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
Robert Carr
1fb99f259f
SurfaceControl: Fix captureLayers JNI
...
Missed a call-point in last refactoring.
Bug: 135965618
Bug: 130211665
Bug: 133054270
Test: Manual
Merged-In: I43fa93eea7d79f5b773497e3bb65750866eca2cb
Change-Id: I43fa93eea7d79f5b773497e3bb65750866eca2cb
(cherry picked from commit bf9298f1c9
2019-08-09 23:50:04 +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
