TreeHugger Robot
60a4504796
Merge "Move MeasuredText.sRegistry to Builder"
2018-10-31 06:40:59 +00:00
Lei Yu
a38e450b37
Merge "Add ACL broadcast for bt devices"
2018-10-31 06:12:46 +00:00
Wesley Wang
d4fddad826
[automerger skipped] Merge "Fix Power Menu vanish when display size is Large" into pi-dev am: 6b0b1dafbe
...
am: bf7f2258d3
2018-10-30 20:44:03 -07:00
Wesley Wang
bf7f2258d3
Merge "Fix Power Menu vanish when display size is Large" into pi-dev
...
am: 6b0b1dafbe
2018-10-30 20:32:16 -07:00
Wesley Wang
6b0b1dafbe
Merge "Fix Power Menu vanish when display size is Large" into pi-dev
2018-10-31 02:58:09 +00:00
Junyu Lai
74d5f7f24a
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2 am: d62c2baa6d
...
am: cadfe44e05
2018-10-30 19:56:01 -07:00
Junyu Lai
cadfe44e05
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: 0d63da86e2
...
am: d62c2baa6d
2018-10-30 19:46:18 -07:00
Junyu Lai
d62c2baa6d
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on."
...
am: 0d63da86e2
2018-10-30 19:35:32 -07:00
Junyu Lai
0d63da86e2
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on."
2018-10-31 02:20:57 +00:00
Youming Ye
409b7fd693
Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3 am: 22b595e5bd
...
am: d07819d5cc
2018-10-30 19:02:26 -07:00
Xiangyu/Malcolm Chen
101f907ddb
Merge "Clear calling identity in callback."
2018-10-31 01:38:15 +00:00
Youming Ye
d07819d5cc
Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting" am: e3a989f7d3
...
am: 22b595e5bd
2018-10-30 18:37:59 -07:00
Youming Ye
22b595e5bd
Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting"
...
am: e3a989f7d3
2018-10-30 18:25:43 -07:00
Youming Ye
e3a989f7d3
Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting"
2018-10-31 00:44:04 +00:00
Michael Wachenschwanz
6b5d06fe4d
Merge changes from topic "UsageSessionTimers"
...
* changes:
Add SystemApi for registering Usage Session Observers in UsageStats
Refactor AppTimeLimitController for Session Observers
2018-10-31 00:35:39 +00:00
TreeHugger Robot
3875001f59
Merge "Add missing endRecording calls"
2018-10-30 23:57:23 +00:00
Siyamed Sinir
3bef4908b2
Move MeasuredText.sRegistry to Builder
...
Test: atest android.graphics.text.cts.MeasuredTextTest
Test: atest android.graphics.text.cts.LineBreakerTest
Test: atest android.text.cts.StaticLayoutTest
Bug: 117888473
Bug: 112327179
Change-Id: I0c1b86928429dce02867ac0cba674e0f69fc5fdf
2018-10-30 16:53:59 -07:00
Michael Groover
6331237ae7
Merge "Revert "Allow apps with carrier privileges to access device IDs""
2018-10-30 23:52:59 +00:00
Michael Groover
e13f850925
Revert "Allow apps with carrier privileges to access device IDs"
...
This reverts commit ec5f77a0d7
2018-10-30 23:49:56 +00:00
Chih-Hung Hsieh
e64c45258d
[automerger skipped] Fix implicit-fallthrough warnings. DO NOT MERGE. am: a4fd568a79 -s ours
...
am: 4dabb820bb
2018-10-30 16:44:08 -07:00
Chih-Hung Hsieh
4dabb820bb
[automerger skipped] Fix implicit-fallthrough warnings. DO NOT MERGE.
...
am: a4fd568a79
2018-10-30 16:39:04 -07:00
Colin Cross
b7fddfc6a6
Merge "Convert statsd and incidentd to Android.bp"
2018-10-30 23:28:28 +00:00
Michael Groover
f0ca3fec19
Merge "Allow apps with carrier privileges to access device IDs"
2018-10-30 23:06:38 +00:00
Cheney Ni
b3aaf29754
Merge "Be the current user to get A2DP proxy" into pi-dev am: 022cf30d17
...
am: f3fb14a773
2018-10-30 16:00:10 -07:00
Cheney Ni
f3fb14a773
Merge "Be the current user to get A2DP proxy" into pi-dev
...
am: 022cf30d17
2018-10-30 15:42:02 -07:00
TreeHugger Robot
022cf30d17
Merge "Be the current user to get A2DP proxy" into pi-dev
2018-10-30 22:22:14 +00:00
Eugene Susla
f4bebfea9f
Merge "Adjust default app op behavior based on feature state"
2018-10-30 22:11:24 +00:00
Chih-Hung Hsieh
a4fd568a79
Fix implicit-fallthrough warnings. DO NOT MERGE.
...
These changes are not needed in goog/master.
Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
(cherry picked from commit df891f8a31
2018-10-30 14:32:19 -07:00
jackqdyulei
2948963f31
Add ACL broadcast for bt devices
...
When we receive profile state change, the device may still be physically
connected(e.g. BluetoothDevice.isConnected() return true). In this case
UI still show a device is connected.
Add ACL broadcast listener which will be triggered when device is
physically disconnected. In this callback we can refresh UI to make it
show correct information.
Bug: 79947085
Test: RunSettingsLibRoboTests
Change-Id: I8370cc568fcb0d5995f164e7e62391a9525cbe19
2018-10-30 13:45:47 -07:00
Colin Cross
bc2dc31c4d
Convert statsd and incidentd to Android.bp
...
See build/soong/README.md for more information.
Fixes: 110563449
Test: m checkbuild
Change-Id: I8c80878cec46c9299234c6f4c1e0e19efc0a221e
2018-10-30 13:30:23 -07:00
sqian
bf916cd022
Merge "Change package to component for Setting's default call redirection service" am: f67ece13ad am: a6bf55bcc6
...
am: 5cfa939ba0
2018-10-30 13:25:37 -07:00
Makoto Onuki
8c439aa771
[automerger skipped] Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev am: 8a7d8bceb5
...
am: f5a4bfea67
2018-10-30 13:11:41 -07:00
sqian
5cfa939ba0
Merge "Change package to component for Setting's default call redirection service" am: f67ece13ad
...
am: a6bf55bcc6
2018-10-30 13:10:46 -07:00
Phil Weaver
1b4ea3a11a
Merge "Make performAccessibilityShortcut a SystemAPI"
2018-10-30 20:05:28 +00:00
Makoto Onuki
f5a4bfea67
Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev
...
am: 8a7d8bceb5
2018-10-30 12:52:39 -07:00
sqian
a6bf55bcc6
Merge "Change package to component for Setting's default call redirection service"
...
am: f67ece13ad
2018-10-30 12:31:15 -07:00
TreeHugger Robot
8b31b7d267
Merge "Shows only high priority notifications on lockscreen."
2018-10-30 19:30:37 +00:00
TreeHugger Robot
8a7d8bceb5
Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev
2018-10-30 19:25:40 +00:00
Stan Iliev
85c659f35c
[automerger skipped] Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev am: 9dff553798
...
am: f071820f78
2018-10-30 12:12:29 -07:00
Treehugger Robot
f67ece13ad
Merge "Change package to component for Setting's default call redirection service"
2018-10-30 19:06:55 +00:00
Nathan Harold
bc2a1620d7
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def am: ae7dd94d7f
...
am: 9e6faba5ed
2018-10-30 12:05:23 -07:00
Stan Iliev
f071820f78
Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev
...
am: 9dff553798
2018-10-30 11:56:21 -07:00
Nathan Harold
9e6faba5ed
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def
...
am: ae7dd94d7f
2018-10-30 11:37:43 -07:00
TreeHugger Robot
9dff553798
Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev
2018-10-30 18:34:26 +00:00
Nathan Harold
ae7dd94d7f
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields"
...
am: 40745e1def
2018-10-30 11:24:02 -07:00
Haoyu Zhang
9b74c07517
Merge "Fix getLineRight()/getLineLeft() may compute leadingMargin twice"
2018-10-30 18:16:44 +00:00
Treehugger Robot
40745e1def
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields"
2018-10-30 17:53:24 +00:00
John Reck
f401c7e8f5
Add missing endRecording calls
...
StaticLayoutPerfTest was previously leaking
display lists. RenderNode now notices and yells
about that, exposing this bug
Change-Id: If85c85211a115a4af09edf2a215415fd0d2d0b4b
Fixes: 118650198
Test: this
2018-10-30 10:50:41 -07:00
Phil Weaver
27beee50d3
Make performAccessibilityShortcut a SystemAPI
...
Also create a new MANAGE_ACCESSIBILITY permission to
perform the shortcut.
Bug: 116118615
Test: make, activate accessibility shortcut
Change-Id: Ic65a0cdf7393429e14cb98f4fb0734d20069b05a
2018-10-30 10:10:41 -07:00
Jon Boekenoogen
adb49c0031
Merge "Fix ClassCastException in 2nd phase resolution."
2018-10-30 17:08:42 +00:00
