Andreas Gampe
3ec885fa2f
Merge changes I66eac0c5,I07602072 into qt-dev am: e252d155b1
...
am: db47069d52
2019-06-11 20:19:23 -07:00
Andreas Gampe
db47069d52
Merge changes I66eac0c5,I07602072 into qt-dev
...
am: e252d155b1
2019-06-11 20:14:58 -07:00
Andreas Gampe
e252d155b1
Merge changes I66eac0c5,I07602072 into qt-dev
...
* changes:
Frameworks: Add fdatasync after dumping a trace
Frameworks: Change Java stack trace dumping
2019-06-12 02:58:31 +00:00
Andreas Gampe
72768ed944
Frameworks: Add fdatasync after dumping a trace
...
Ensure that data hits storage when dumping.
Bug: 133525168
Test: m
Test: manual (induce ANRs with various platform changes)
Merged-In: I66eac0c5e77ea98ba1777d0803b35f38d9ca648f
Change-Id: I66eac0c5e77ea98ba1777d0803b35f38d9ca648f
2019-06-12 02:58:16 +00:00
Andreas Gampe
fa178e14b9
Frameworks: Change Java stack trace dumping
...
When dumping stacks, e.g., for ANRs, even if the "Java" version from ART
reports success, check that output was generated, and fall back to a
"native" dump if the output is too small, currently set at one hundred
bytes.
Add more logging of failure paths.
Fix some error logging in native to go to logcat instead of stderr.
Bug: 133525168
Test: m
Test: manual (induce ANRs with various platform changes)
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: I0760207229989f6f34e10edcf45fb140bc81d0e5
Change-Id: I0760207229989f6f34e10edcf45fb140bc81d0e5
2019-06-12 02:56:49 +00:00
Android Build Merger (Role)
12be000155
Merge "Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev am: 1f7ee0bc98 am: 71c3b209ed" into qt-r1-dev-plus-aosp
2019-06-12 02:42:29 +00:00
Xiangyu/Malcolm Chen
f239cd7c7a
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev am: 1f7ee0bc98
...
am: 71c3b209ed
2019-06-11 19:41:28 -07:00
Xiangyu/Malcolm Chen
affcd63a05
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev am: 1f7ee0bc98
...
am: ea9bc39432
2019-06-11 19:41:22 -07:00
Selim Cinek
32c3a27840
Fixed an issue where too many notifications were pulsing
...
am: 94e56f929c
2019-06-11 19:36:42 -07:00
Xiangyu/Malcolm Chen
ea9bc39432
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev
...
am: 1f7ee0bc98
2019-06-11 19:34:29 -07:00
Xiangyu/Malcolm Chen
71c3b209ed
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev
...
am: 1f7ee0bc98
2019-06-11 19:34:23 -07:00
Xiangyu/Malcolm Chen
1f7ee0bc98
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev
2019-06-12 02:23:13 +00:00
Selim Cinek
94e56f929c
Fixed an issue where too many notifications were pulsing
...
With the bypass all notifications were pulsing. This was
accidental when factoring in changes.
Bug: 130327302
Test: atest SystemUITests
Change-Id: Iac5fb75763c7d093c40d7532e2d9ca1a799e983e
2019-06-12 02:19:05 +00:00
Varun Anand
cff10734c6
[automerger skipped] Merge changes from topic "vpn_data_accnt_revert" am: 8af90ce15b am: 39f9c1c212 -s ours
...
am: f9365b0c60ac06c1022d
2019-06-11 19:11:23 -07:00
Varun Anand
f9365b0c60
[automerger skipped] Merge changes from topic "vpn_data_accnt_revert" am: 8af90ce15b
...
am: 39f9c1c212ac06c1022d
2019-06-11 19:03:04 -07:00
Varun Anand
39f9c1c212
Merge changes from topic "vpn_data_accnt_revert"
...
am: 8af90ce15b
2019-06-11 18:45:17 -07:00
Selim Cinek
71e6bd1433
Merge "Removed the AmbientPulseManager" into qt-r1-dev
...
am: dd78681345
2019-06-11 18:44:08 -07:00
Android Build Merger (Role)
f815a72ae0
Merge "Merge "audioservice: add RTT mode observer" into qt-dev am: a66bfb90b6 am: 0ba8c2953a" into qt-r1-dev-plus-aosp
2019-06-12 01:42:43 +00:00
Eric Laurent
a22a8be89b
Merge "audioservice: add RTT mode observer" into qt-dev am: a66bfb90b6
...
am: 0ba8c2953a
2019-06-11 18:41:34 -07:00
Android Build Merger (Role)
6ac6d6cd67
Merge "Merge "audioservice: add RTT mode observer" into qt-dev am: a66bfb90b6 am: fef36889bb" into qt-r1-dev-plus-aosp
2019-06-12 01:41:21 +00:00
Android Build Merger (Role)
7c5277bc27
Merge "Merge "Emergency location notification text must be in the correct language" into qt-dev am: 1c60a7c773 am: 1a70c5a89f" into qt-r1-dev-plus-aosp
2019-06-12 01:40:37 +00:00
Eric Laurent
c209c421db
Merge "audioservice: add RTT mode observer" into qt-dev am: a66bfb90b6
...
am: fef36889bb
2019-06-11 18:40:18 -07:00
Android Build Merger (Role)
fcc2e9781c
Merge "Merge "Emergency location notification text must be in the correct language" into qt-dev am: 1c60a7c773 am: ac7800011d" into qt-r1-dev-plus-aosp
2019-06-12 01:39:53 +00:00
Anil Admal
ce88dd143a
Merge "Emergency location notification text must be in the correct language" into qt-dev am: 1c60a7c773
...
am: 1a70c5a89f
2019-06-11 18:39:53 -07:00
Anil Admal
d6098e0bc3
Merge "Emergency location notification text must be in the correct language" into qt-dev am: 1c60a7c773
...
am: ac7800011d
2019-06-11 18:39:11 -07:00
Kevin Chyn
0da3debeb4
Merge "Cancel authentication when secure camera is launched on Keyguard" into qt-r1-dev
...
am: 38466fd886
2019-06-11 18:37:58 -07:00
Selim Cinek
dd78681345
Merge "Removed the AmbientPulseManager" into qt-r1-dev
2019-06-12 01:35:18 +00:00
Eric Laurent
fef36889bb
Merge "audioservice: add RTT mode observer" into qt-dev
...
am: a66bfb90b6
2019-06-11 18:33:35 -07:00
Eric Laurent
0ba8c2953a
Merge "audioservice: add RTT mode observer" into qt-dev
...
am: a66bfb90b6
2019-06-11 18:32:26 -07:00
Anil Admal
ac7800011d
Merge "Emergency location notification text must be in the correct language" into qt-dev
...
am: 1c60a7c773
2019-06-11 18:32:03 -07:00
Anil Admal
1a70c5a89f
Merge "Emergency location notification text must be in the correct language" into qt-dev
...
am: 1c60a7c773
2019-06-11 18:31:04 -07:00
Varun Anand
8af90ce15b
Merge changes from topic "vpn_data_accnt_revert"
...
* changes:
Revert "Take all VPN underlying networks into account when migrating traffic for"
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
Revert "Addressing comments for http://ag/7700679 ."
Revert "Add one more test for VPN usage stats."
2019-06-12 01:05:01 +00:00
Govinda Wasserman
df999ccf32
Merge "Fixes bad merge in Assistant Handle logic" into qt-dev am: b349bcf5a5
...
am: 3568397416
2019-06-11 18:03:54 -07:00
TreeHugger Robot
a66bfb90b6
Merge "audioservice: add RTT mode observer" into qt-dev
2019-06-12 01:02:33 +00:00
Kevin Chyn
38466fd886
Merge "Cancel authentication when secure camera is launched on Keyguard" into qt-r1-dev
2019-06-12 01:02:26 +00:00
Anil Admal
1c60a7c773
Merge "Emergency location notification text must be in the correct language" into qt-dev
2019-06-12 00:59:15 +00:00
Govinda Wasserman
3568397416
Merge "Fixes bad merge in Assistant Handle logic" into qt-dev
...
am: b349bcf5a5
2019-06-11 17:37:17 -07:00
Govinda Wasserman
1625394bae
Merge "Fixes bad merge in Assistant Handle logic" into qt-dev am: b349bcf5a5
...
am: 09e5a56100
2019-06-11 17:32:07 -07:00
Govinda Wasserman
09e5a56100
Merge "Fixes bad merge in Assistant Handle logic" into qt-dev
...
am: b349bcf5a5
2019-06-11 17:23:35 -07:00
Android Build Merger (Role)
7e30efa0d7
Merge "Merge "GlobalScreenshot - Fix race condition" into qt-dev am: 0ebf0252e0 am: e43cea0622" into qt-r1-dev-plus-aosp
2019-06-12 00:18:37 +00:00
Matt Pietal
9604df8961
Merge "GlobalScreenshot - Fix race condition" into qt-dev am: 0ebf0252e0
...
am: e43cea0622
2019-06-11 17:17:37 -07:00
Matt Pietal
b5645340f3
Merge "GlobalScreenshot - Fix race condition" into qt-dev am: 0ebf0252e0
...
am: c07f2d3be2
2019-06-11 17:17:35 -07:00
TreeHugger Robot
b349bcf5a5
Merge "Fixes bad merge in Assistant Handle logic" into qt-dev
2019-06-12 00:15:36 +00:00
Matt Pietal
c07f2d3be2
Merge "GlobalScreenshot - Fix race condition" into qt-dev
...
am: 0ebf0252e0
2019-06-11 17:12:34 -07:00
Matt Pietal
e43cea0622
Merge "GlobalScreenshot - Fix race condition" into qt-dev
...
am: 0ebf0252e0
2019-06-11 17:12:33 -07:00
Matt Pietal
0ebf0252e0
Merge "GlobalScreenshot - Fix race condition" into qt-dev
2019-06-12 00:04:23 +00:00
Android Build Merger (Role)
736dbb02ed
Merge "Merge "Fixed an issue where the background was visible while pulsing" into qt-dev am: bd32a804ef am: f22112bafc" into qt-r1-dev-plus-aosp
2019-06-11 23:12:06 +00:00
Selim Cinek
25ab63e8fe
Merge "Fixed an issue where the background was visible while pulsing" into qt-dev am: bd32a804ef
...
am: f22112bafc
2019-06-11 16:11:06 -07:00
Selim Cinek
1464992ed9
Merge "Fixed an issue where the background was visible while pulsing" into qt-dev am: bd32a804ef
...
am: 7295f32507
2019-06-11 16:10:57 -07:00
Anil Admal
6acd4d7ee8
Emergency location notification text must be in the correct language
...
When the sytem language is changed, the emergency location user
notification text is not posted in the new language unless the
system server is restarted.
Bug: 116328114
Test: Visually verified that the notification reflects system
language changes.
Change-Id: I63c265da985395879683484af94e10159557789a
2019-06-11 23:07:42 +00:00
