Tianjie Xu
4d2954b1d1
Merge "Add error/cause code reporting for Non A/B OTA failures" am: 2db2f6d265 am: c2a0d6776c am: 1b0da0cdfd
...
am: f2e1a43ac5
2017-05-03 18:02:02 +00:00
Tianjie Xu
f2e1a43ac5
Merge "Add error/cause code reporting for Non A/B OTA failures" am: 2db2f6d265 am: c2a0d6776c
...
am: 1b0da0cdfd
2017-05-03 17:56:39 +00:00
Tianjie Xu
1b0da0cdfd
Merge "Add error/cause code reporting for Non A/B OTA failures" am: 2db2f6d265
...
am: c2a0d6776c
2017-05-03 17:51:56 +00:00
Tianjie Xu
2db2f6d265
Merge "Add error/cause code reporting for Non A/B OTA failures"
2017-05-03 17:34:29 +00:00
Christine Franks
3fcdfa1b96
Merge "Night display status restores on reboot/user change" into oc-dev am: 78e03b44c3
...
am: 0bd001e95c
2017-05-03 17:14:52 +00:00
Christine Franks
0bd001e95c
Merge "Night display status restores on reboot/user change" into oc-dev
...
am: 78e03b44c3
2017-05-03 17:06:42 +00:00
TreeHugger Robot
78e03b44c3
Merge "Night display status restores on reboot/user change" into oc-dev
2017-05-03 17:02:15 +00:00
Tomasz Wasilczyk
ecfd85f5b4
Merge "Implement get/setConfiguration calls of ITuner."
2017-05-03 15:42:37 +00:00
Bartosz Fabianowski
4afd39e718
Merge "Add more explicit documentation for install reason" into oc-dev am: c8ca16a85a
...
am: 68e947c1bb
2017-05-03 15:20:45 +00:00
Bartosz Fabianowski
68e947c1bb
Merge "Add more explicit documentation for install reason" into oc-dev
...
am: c8ca16a85a
2017-05-03 15:15:20 +00:00
TreeHugger Robot
c8ca16a85a
Merge "Add more explicit documentation for install reason" into oc-dev
2017-05-03 15:10:16 +00:00
Christine Franks
e5bb03e2ea
Night display status restores on reboot/user change
...
Fixes: 30086742
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I264be077e607baf8e19496f0c57549a907668005
2017-05-03 15:00:43 +00:00
Jorim Jaggi
60e305ce8c
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev am: 251894b134
...
am: 53f6c02354
2017-05-03 13:28:39 +00:00
Jorim Jaggi
53f6c02354
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
...
am: 251894b134
2017-05-03 13:21:52 +00:00
Bartosz Fabianowski
40a006285b
Add more explicit documentation for install reason
...
This CL adds more explicit documentation of the install reason argument /
return value to PackageInstaller.SessionInfo.
Bug: 37324584
Test: None
Change-Id: I2450cc669b194e611c5dc07c6a0a5cd78a98c039
2017-05-03 15:17:36 +02:00
TreeHugger Robot
251894b134
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
2017-05-03 13:16:32 +00:00
Abodunrinwa Toki
287e90df53
Merge "Avoid classifying text mulitple times." into oc-dev am: d30044407e
...
am: e52458d98e
2017-05-03 12:45:04 +00:00
Abodunrinwa Toki
e52458d98e
Merge "Avoid classifying text mulitple times." into oc-dev
...
am: d30044407e
2017-05-03 12:40:34 +00:00
TreeHugger Robot
d30044407e
Merge "Avoid classifying text mulitple times." into oc-dev
2017-05-03 12:35:22 +00:00
Jorim Jaggi
86c39f9ede
Fix lock contention: Call into power manager service from handler
...
Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.
Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened
Bug: 37888898
Bug: 36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df
2017-05-03 13:22:47 +02:00
TreeHugger Robot
767939f6db
Merge "Revert "Add more explicit documentation for install reason""
2017-05-03 10:04:31 +00:00
Bartosz Fabianowski
faef1cbd13
Revert "Add more explicit documentation for install reason"
...
This reverts commit 839e853589
2017-05-03 08:15:15 +00:00
Vladislav Kaznacheev
714ccacaaa
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev am: 33f2b3b3b1
...
am: f2b4b8306e
2017-05-03 07:45:51 +00:00
Vladislav Kaznacheev
f2b4b8306e
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
...
am: 33f2b3b3b1
2017-05-03 07:38:47 +00:00
TreeHugger Robot
33f2b3b3b1
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
2017-05-03 07:31:48 +00:00
Tianjie Xu
223edeb272
Add error/cause code reporting for Non A/B OTA failures
...
Read and report the error_code & cause_code from last_install.
Bug: 36866437
Test: mma & observe the sysui event in logcat -b events
Change-Id: I5357861fc758e14ed3235bfc8cc76d7561ccea58
2017-05-02 23:02:11 -07:00
Ruben Brunk
619a0eb428
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev am: 24f4743f92
...
am: 44e317e278
2017-05-03 04:01:11 +00:00
Ruben Brunk
44e317e278
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
...
am: 24f4743f92
2017-05-03 03:56:01 +00:00
TreeHugger Robot
24f4743f92
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
2017-05-03 03:48:24 +00:00
Ben Lin
2db7e4d384
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev am: d6bfaba59c
...
am: bb87997182
2017-05-03 02:37:27 +00:00
Ben Lin
bb87997182
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
...
am: d6bfaba59c
2017-05-03 02:30:29 +00:00
Daichi Hirono
919d2c1a98
Merge "Don't add other's child as header or footer" into oc-dev am: 9e37a2e419
...
am: 9227334834
2017-05-03 02:27:56 +00:00
Ben Lin
d6bfaba59c
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
2017-05-03 02:25:08 +00:00
Todd Kennedy
2b33116477
Merge "Optionally let the instant app into disambig" into oc-dev am: 1f1d60c5a1
...
am: 74e39de950
2017-05-03 02:23:03 +00:00
Daichi Hirono
9227334834
Merge "Don't add other's child as header or footer" into oc-dev
...
am: 9e37a2e419
2017-05-03 02:18:52 +00:00
Todd Kennedy
74e39de950
Merge "Optionally let the instant app into disambig" into oc-dev
...
am: 1f1d60c5a1
2017-05-03 02:12:28 +00:00
TreeHugger Robot
9e37a2e419
Merge "Don't add other's child as header or footer" into oc-dev
2017-05-03 02:12:08 +00:00
Ruben Brunk
6bdc550e27
Fix Bluetooth GATT API default handler assignment
...
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug: 37544152
Bug: 37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
2017-05-03 00:11:10 +00:00
Makoto Onuki
d10ca46df3
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev am: e497b698d2
...
am: bab47edecb
2017-05-03 00:06:30 +00:00
Todd Kennedy
72dc2fa6ad
Optionally let the instant app into disambig
...
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.
Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes: 37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
2017-05-02 17:03:36 -07:00
Makoto Onuki
bab47edecb
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev
...
am: e497b698d2
2017-05-02 23:57:45 +00:00
TreeHugger Robot
e497b698d2
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev
2017-05-02 23:51:37 +00:00
Winson Chung
4678eca685
Merge "Restoring old methods for compatibility." into oc-dev am: d6c190c8d2
...
am: 3d66fb6519
2017-05-02 23:34:46 +00:00
Winson Chung
3d66fb6519
Merge "Restoring old methods for compatibility." into oc-dev
...
am: d6c190c8d2
2017-05-02 23:27:48 +00:00
Winson Chung
d6c190c8d2
Merge "Restoring old methods for compatibility." into oc-dev
2017-05-02 23:19:29 +00:00
TreeHugger Robot
4b64614e6e
Merge "Upstream update"
2017-05-02 22:47:05 +00:00
Tomasz Wasilczyk
8b6db4f2eb
Implement get/setConfiguration calls of ITuner.
...
Test: instrumentation
Bug: b/36863239
Change-Id: I0954f8f837c342b35873d3ae834bab83bc3cb04c
2017-05-02 15:33:52 -07:00
Michael Wright
c48451933d
Merge "O is API 26" into oc-dev am: 074a67c116
...
am: 8433705f77
2017-05-02 22:26:41 +00:00
Michael Dooley
ea1bc75d98
Merge "Adding voicemail transcription state to the database" into oc-dev am: 4794cbf574
...
am: bc06988d8b
2017-05-02 22:20:45 +00:00
Winson Chung
ca754789c1
Restoring old methods for compatibility.
...
Bug: 37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c
2017-05-02 15:18:23 -07:00
