Brad Ebinger
608fd93f45
Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev am: a105253ea8
...
am: f4e407d1d5
2019-05-24 12:03:23 -07:00
Bin Chen
6294913428
Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev am: 0c7e69bdb6
...
am: 009fecb8ad
2019-05-24 11:56:55 -07:00
Brad Ebinger
f4e407d1d5
Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev
...
am: a105253ea8
2019-05-24 11:00:08 -07:00
Brad Ebinger
a105253ea8
Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev
2019-05-24 17:45:47 +00:00
Bin Chen
009fecb8ad
Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev
...
am: 0c7e69bdb6
2019-05-24 10:34:29 -07:00
TreeHugger Robot
0c7e69bdb6
Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev
2019-05-24 17:03:21 +00:00
Mihai Popa
ffd67eb222
Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev am: 612f71b1df
...
am: b82fd2d7d3
2019-05-24 10:01:14 -07:00
Mihai Popa
b82fd2d7d3
Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
...
am: 612f71b1df
2019-05-24 09:32:04 -07:00
Mihai Popa
d88a953a78
Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
...
am: 612f71b1df
2019-05-24 09:22:20 -07:00
Mihai Popa
612f71b1df
Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
2019-05-24 15:45:38 +00:00
Andrei-Valentin Onea
d6d2f8f482
Merge "Move blacklisted methods back to greylist" into qt-dev am: 71a267b66f
...
am: ffeda699d5
2019-05-24 05:21:03 -07:00
Andrei-Valentin Onea
e4446b3e21
Merge "Move blacklisted methods back to greylist" into qt-dev
...
am: 71a267b66f
2019-05-24 05:15:31 -07:00
Andrei-Valentin Onea
ffeda699d5
Merge "Move blacklisted methods back to greylist" into qt-dev
...
am: 71a267b66f
2019-05-24 05:10:36 -07:00
Andrei-Valentin Onea
71a267b66f
Merge "Move blacklisted methods back to greylist" into qt-dev
2019-05-24 12:02:31 +00:00
Philip P. Moltmann
a0aecd7b46
Merge "Mark perm DB version as -1 when upgrading from P" into qt-dev am: da7156d13d
...
am: 2cf8337bcd
2019-05-23 23:34:27 -07:00
Philip P. Moltmann
7669d316c2
Merge "Mark perm DB version as -1 when upgrading from P" into qt-dev
...
am: da7156d13d
2019-05-23 23:24:36 -07:00
Philip P. Moltmann
2cf8337bcd
Merge "Mark perm DB version as -1 when upgrading from P" into qt-dev
...
am: da7156d13d
2019-05-23 23:21:38 -07:00
TreeHugger Robot
da7156d13d
Merge "Mark perm DB version as -1 when upgrading from P" into qt-dev
2019-05-24 05:59:44 +00:00
Max Dashouk
4f5cabfaa9
Merge "Fixes the bug that can occur when StatsCompanionService calls StatsService to update UID data and overflows kernel transfer buffer." into qt-dev am: 585422a5d2
...
am: 7e8e915b2b
2019-05-23 20:53:57 -07:00
Philip P. Moltmann
3d28c311bc
Merge "Merge "Make sure to always upgrade runtime permissions" into qt-dev am: 3fb12ba490" into qt-r1-dev
...
am: d80e267260
2019-05-23 20:15:51 -07:00
Jackal Guo
71bb5aa048
Merge "A11y support for windows in a re-parented display" into qt-r1-dev
...
am: 6d7b49bead
2019-05-23 20:05:57 -07:00
Max Dashouk
41545aa38f
Merge "Fixes the bug that can occur when StatsCompanionService calls StatsService to update UID data and overflows kernel transfer buffer." into qt-dev
...
am: 585422a5d2
2019-05-23 20:05:15 -07:00
Sudheer Shanka
d557ea7251
Merge "Trigger a mediascan when downloads get renamed." into qt-dev am: 5af9bed265
...
am: b50bd70426
2019-05-23 19:36:03 -07:00
Philip P. Moltmann
8ea7627c51
Merge "Make sure to always upgrade runtime permissions" into qt-dev
...
am: 3fb12ba490
2019-05-23 19:21:34 -07:00
Sudheer Shanka
cef6d7d084
Merge "Trigger a mediascan when downloads get renamed." into qt-dev
...
am: 5af9bed265
2019-05-23 19:01:46 -07:00
Max Dashouk
7e8e915b2b
Merge "Fixes the bug that can occur when StatsCompanionService calls StatsService to update UID data and overflows kernel transfer buffer." into qt-dev
...
am: 585422a5d2
2019-05-23 18:40:14 -07:00
Eric Holk
4cd4b58c51
Merge "Revert "LayoutInflater: Special case well-known View constructors"" am: 98e2663802 am: 6053fed521
...
am: 6335848513
2019-05-23 18:09:24 -07:00
Hai Zhang
f531147aa8
Merge "Exclude packages that's not installed from the hash for role." into qt-dev
...
am: c3c75a49ea
2019-05-23 18:06:04 -07:00
Android Build Merger (Role)
d80e267260
Merge "Merge "Make sure to always upgrade runtime permissions" into qt-dev am: 3fb12ba490" into qt-r1-dev
2019-05-24 01:03:29 +00:00
Philip P. Moltmann
541e587bf0
Merge "Make sure to always upgrade runtime permissions" into qt-dev
...
am: 3fb12ba490
2019-05-23 18:02:52 -07:00
Jackal Guo
6d7b49bead
Merge "A11y support for windows in a re-parented display" into qt-r1-dev
2019-05-24 01:02:17 +00:00
TreeHugger Robot
585422a5d2
Merge "Fixes the bug that can occur when StatsCompanionService calls StatsService to update UID data and overflows kernel transfer buffer." into qt-dev
2019-05-24 00:26:19 +00:00
Eric Holk
6335848513
Merge "Revert "LayoutInflater: Special case well-known View constructors"" am: 98e2663802
...
am: 6053fed521
2019-05-23 17:13:38 -07:00
Philip P. Moltmann
1ae81a547e
Mark perm DB version as -1 when upgrading from P
...
So that we can implement different behavior between Android P and Q.
Test: Upgraded P->Q and booted fresh install of Q. Checked DB after boot
Bug: 131427665
Change-Id: I89f9dc1fc11129c95c03834e21628c6be75f2875
2019-05-23 16:14:33 -07:00
Philip P. Moltmann
3fb12ba490
Merge "Make sure to always upgrade runtime permissions" into qt-dev
2019-05-23 23:10:49 +00:00
Hai Zhang
c010d23232
Merge "Exclude packages that's not installed from the hash for role." into qt-dev am: c3c75a49ea
...
am: 32765502da
2019-05-23 16:08:28 -07:00
Sudheer Shanka
b50bd70426
Merge "Trigger a mediascan when downloads get renamed." into qt-dev
...
am: 5af9bed265
2019-05-23 16:07:37 -07:00
Sudheer Shanka
5af9bed265
Merge "Trigger a mediascan when downloads get renamed." into qt-dev
2019-05-23 22:36:09 +00:00
Abodunrinwa Toki
2764a9f1e3
Merge "Convert TextClassifierEvent to SelectionEvent for logging in the default TC." into qt-dev am: a578ecce46
...
am: aeb8a3b154
2019-05-23 15:14:24 -07:00
Etan Cohen
9c1c1c03ff
Merge changes from topic "on_unavailable_fix" into qt-dev
...
am: 285b665784
2019-05-23 14:59:57 -07:00
Tej Singh
2fe1e333d5
Merge "Statsd: Add watchdog rollback to experiment ids" into qt-dev am: 42fb4bb1e9
...
am: ea2bdcd36f
2019-05-23 14:57:36 -07:00
Hai Zhang
32765502da
Merge "Exclude packages that's not installed from the hash for role." into qt-dev
...
am: c3c75a49ea
2019-05-23 14:53:21 -07:00
Abodunrinwa Toki
b1007e962c
Merge "Convert TextClassifierEvent to SelectionEvent for logging in the default TC." into qt-dev
...
am: a578ecce46
2019-05-23 14:47:38 -07:00
Tej Singh
ffd45fc714
Merge "Statsd: Add watchdog rollback to experiment ids" into qt-dev
...
am: 42fb4bb1e9
2019-05-23 14:31:29 -07:00
Michael Groover
0cd054da96
Merge "Document device ID access restriction target SDK behavior" into qt-dev am: f087f06ed9
...
am: 7b8af95872
2019-05-23 14:03:03 -07:00
Etan Cohen
285b665784
Merge changes from topic "on_unavailable_fix" into qt-dev
...
* changes:
[CM] Fix NPE due to unvalidated callback value
[CM] Fix NPE due to unvalidated callback value
2019-05-23 20:57:22 +00:00
Max Dashouk
11e0d40bbe
Fixes the bug that can occur when StatsCompanionService calls
...
StatsService to update UID data and overflows kernel transfer buffer.
In this case, the IPC call silently fails. The issue was discovered in Android Automotive Embedded use case that employs multiuser setup. This causes more uid data being sent via one-way StatsCompanionService::informAllUidData call than usual and can trigger the issue. As the result, uid map on statsd side is empty and many metrics are not captured.
Bug: b/132444397
Fixes: b/132444397
Test: Did a clean build of master branch and flashed the device. adb
shell cmd stats print-uid-map returned without any result. Repeated the
steps after implementing the fix, print-uid-map returns the results now.
Change-Id: I1451c13b36696449c145c51618c68d10e29a596a
2019-05-23 20:53:58 +00:00
Hai Zhang
c3c75a49ea
Merge "Exclude packages that's not installed from the hash for role." into qt-dev
2019-05-23 20:38:36 +00:00
Michael Groover
7b8af95872
Merge "Document device ID access restriction target SDK behavior" into qt-dev
...
am: f087f06ed9
2019-05-23 13:34:15 -07:00
Treehugger Robot
98e2663802
Merge "Revert "LayoutInflater: Special case well-known View constructors""
2019-05-23 19:59:33 +00:00
