OSDN Git Service
Felipe Leme [Wed, 3 May 2017 21:10:27 +0000 (21:10 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev am:
943242804e
am:
b7824ceb97
Change-Id: I6069ca070178bc38b1a6e6d12c125ec695a2f7e9
Felipe Leme [Wed, 3 May 2017 21:03:58 +0000 (21:03 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev
am:
943242804e
Change-Id: I276b7650824571bc73102a4c014b4e120d3fb4ee
TreeHugger Robot [Wed, 3 May 2017 20:54:27 +0000 (20:54 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev
Adrian Roos [Wed, 3 May 2017 20:35:35 +0000 (20:35 +0000)]
Merge "AOD: Pass through pulse reason to DozeUi" into oc-dev am:
838e5f04be
am:
4c49f656fb
Change-Id: I297365d186814fe0502f8cf155a650546ce959fd
Chris Tate [Wed, 3 May 2017 20:31:02 +0000 (20:31 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev am:
70a2316ec7
am:
362a819a46
Change-Id: Ica34b713dcb76de186221caf3ea158a5125903b9
Adrian Roos [Wed, 3 May 2017 20:28:06 +0000 (20:28 +0000)]
Merge "AOD: Pass through pulse reason to DozeUi" into oc-dev
am:
838e5f04be
Change-Id: Ia14a5339053ac91ce4f08e1fde33fd6c2816ffe5
Chris Tate [Wed, 3 May 2017 20:23:32 +0000 (20:23 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
am:
70a2316ec7
Change-Id: Ifc4be7cab333d1956b3b6543e846489f686981ed
TreeHugger Robot [Wed, 3 May 2017 20:21:39 +0000 (20:21 +0000)]
Merge "AOD: Pass through pulse reason to DozeUi" into oc-dev
Chris Tate [Wed, 3 May 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
Wei Wang [Wed, 3 May 2017 20:09:37 +0000 (20:09 +0000)]
Merge "Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev am:
34ab1f6a31" into oc-dev-plus-aosp
am:
444724c874
Change-Id: I6ed4d7216604c8bf71d31a9bcff826b2d05a0d16
Hemant Gupta [Wed, 3 May 2017 20:07:36 +0000 (20:07 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected" am:
7485f047ba am:
799be11e6f am:
4cec063b7e
am:
1dfaae9fc7
Change-Id: I60786510d5b2a378ffed0103ece32e27ff5cdd7a
Android Build Merger (Role) [Wed, 3 May 2017 20:00:09 +0000 (20:00 +0000)]
Merge "Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev am:
34ab1f6a31" into oc-dev-plus-aosp
Wei Wang [Wed, 3 May 2017 19:59:49 +0000 (19:59 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev am:
41c1e3f1aa
am:
a269d60a2c
Change-Id: Ia1c5fdd5d0cbf3b7b039de73109cdd55fc1f82e9
Wei Wang [Wed, 3 May 2017 19:59:17 +0000 (19:59 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
am:
34ab1f6a31
Change-Id: Ib10efb3a99686901653775abb1662ffa5c4ded4d
Hemant Gupta [Wed, 3 May 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected" am:
7485f047ba am:
799be11e6f
am:
4cec063b7e
Change-Id: I924d65b3366edbb79f22085225de062ceec241ab
Wei Wang [Wed, 3 May 2017 19:52:56 +0000 (19:52 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev
am:
41c1e3f1aa
Change-Id: I45d508c6f5ecf97f5166dbfb52d61fc8465b51b5
Hemant Gupta [Wed, 3 May 2017 19:52:35 +0000 (19:52 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected" am:
7485f047ba
am:
799be11e6f
Change-Id: I4ed170d7558b108ddbd794bc07b750a75d706583
TreeHugger Robot [Wed, 3 May 2017 19:50:53 +0000 (19:50 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
Hemant Gupta [Wed, 3 May 2017 19:46:41 +0000 (19:46 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected"
am:
7485f047ba
Change-Id: I1c222eda83abf4a056535790b48819d857fdd1de
Wei Wang [Wed, 3 May 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev
Treehugger Robot [Wed, 3 May 2017 19:38:55 +0000 (19:38 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected"
Hemant Gupta [Thu, 5 Nov 2015 08:42:01 +0000 (14:12 +0530)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
Precondition: PTS 7.0
Usecase:
Execute test case TC_TG_CA_BI_02_C for AVRCP 1.6
Expectation:
Test case should pass
Observation:
Test case fails
Root cause:
Disconnection of OBEX from PTS leads to disconnection of transport
(initiated by DUT) leading to test case failure. Obex server was
unnecessary assuming that transport would be disconnected so was
informing registered users that transport has been disconnected,
which was leading to issues on new obex connect on same transport
channel from remote obex client
Fix:
Remove check to break out of loop after obex disconnection, as that is
already handled in case when read would return -1 in case transport
is closed.
Test: TC_TG_CA_BI_02_C can be passed after the patch.
Bug:
35590000
Change-Id: Ic1682ce77c07cf2e43da09dc95fff2214338f758
Android Build Merger (Role) [Wed, 3 May 2017 19:17:25 +0000 (19:17 +0000)]
Merge "Merge "Fix QS visibility logs missing some info" into oc-dev am:
df9b2e8d80 am:
86cc4bbac5"
Jason Monk [Wed, 3 May 2017 19:16:35 +0000 (19:16 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev am:
df9b2e8d80
am:
86cc4bbac5
Change-Id: Ib765a9aa0807ddd074b3ff4b066c8f79eb2751a8
Leon Scroggins [Wed, 3 May 2017 19:14:56 +0000 (19:14 +0000)]
Merge "IWYU in Movie.h"
Jason Monk [Wed, 3 May 2017 19:09:01 +0000 (19:09 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev
am:
df9b2e8d80
Change-Id: I0587ba086e5903549f629cf43755b57ec9d6952f
TreeHugger Robot [Wed, 3 May 2017 19:04:29 +0000 (19:04 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev
Abodunrinwa Toki [Wed, 3 May 2017 19:01:31 +0000 (19:01 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev am:
3baad0234b
am:
5adca9d964
Change-Id: I6c99ad6e10765f04d296e99e45df76aa5dc7aba7
Abodunrinwa Toki [Wed, 3 May 2017 18:56:42 +0000 (18:56 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev
am:
3baad0234b
Change-Id: Ia33a42abf1ef4d8d05498649979d5697b898c64e
TreeHugger Robot [Wed, 3 May 2017 18:49:14 +0000 (18:49 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 18:40:03 +0000 (18:40 +0000)]
Merge "Add unit tests for com.android.server.backup.utils"
Narayan Kamath [Wed, 3 May 2017 18:33:04 +0000 (18:33 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev am:
3bfbfead35
am:
ace02ff4e3
Change-Id: I9c169065c69fb15d247123f6354028b66fa1f038
Winson Chung [Wed, 3 May 2017 18:23:45 +0000 (18:23 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev am:
53bac3d927
am:
c45dc59b75
Change-Id: Id53132990bd479943815f431fa219541c8daeffa
Rob Carr [Wed, 3 May 2017 18:21:46 +0000 (18:21 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev am:
2ad5beb807
am:
89f98d022d
Change-Id: If90d16aa38ba378b8762d8c77a88f347ebbc293b
Narayan Kamath [Wed, 3 May 2017 18:19:00 +0000 (18:19 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
am:
3bfbfead35
Change-Id: Ibabd9fd9825d5f24f99468f004dc4e5424b280cd
Winson Chung [Wed, 3 May 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev
am:
53bac3d927
Change-Id: Ibb614910e47ddc31fbf671ba83b5f148bfc74875
Rob Carr [Wed, 3 May 2017 18:11:56 +0000 (18:11 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
am:
2ad5beb807
Change-Id: I02af0aa5ef03eff1ee25169011b63bd6b9e06d7e
TreeHugger Robot [Wed, 3 May 2017 18:05:49 +0000 (18:05 +0000)]
Merge "StatusBar: Make sure showKeyguard is called when needed"
Narayan Kamath [Wed, 3 May 2017 18:03:03 +0000 (18:03 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 18:02:49 +0000 (18:02 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev
Tianjie Xu [Wed, 3 May 2017 18:02:02 +0000 (18:02 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures" am:
2db2f6d265 am:
c2a0d6776c am:
1b0da0cdfd
am:
f2e1a43ac5
Change-Id: I45210f7127b92a68b419f5b8248d090d0607e716
Rob Carr [Wed, 3 May 2017 18:01:11 +0000 (18:01 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
Tianjie Xu [Wed, 3 May 2017 17:56:39 +0000 (17:56 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures" am:
2db2f6d265 am:
c2a0d6776c
am:
1b0da0cdfd
Change-Id: I967edc50dff44d830e475b94678c0194a379dba1
Tianjie Xu [Wed, 3 May 2017 17:51:56 +0000 (17:51 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures" am:
2db2f6d265
am:
c2a0d6776c
Change-Id: I2061f6c122f64d9156ca4c17ec3d410eff213a07
Tianjie Xu [Wed, 3 May 2017 17:44:32 +0000 (17:44 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures"
am:
2db2f6d265
Change-Id: I8361a38d9a913072541e805176bfccdc728f333c
Jorim Jaggi [Wed, 3 May 2017 17:44:29 +0000 (17:44 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev am:
bf08eb6da7
am:
b928547fc5
Change-Id: Ibc89f418354db1c7bdd57a9ee3b584570354bff5
Jorim Jaggi [Wed, 3 May 2017 17:37:01 +0000 (17:37 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev
am:
bf08eb6da7
Change-Id: I3142f4b13683f6189e0eccd155c36c0b65f3b820
Tianjie Xu [Wed, 3 May 2017 17:34:27 +0000 (17:34 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures"
TreeHugger Robot [Wed, 3 May 2017 17:29:16 +0000 (17:29 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev
Leon Scroggins III [Wed, 3 May 2017 17:15:39 +0000 (13:15 -0400)]
IWYU in Movie.h
SkBitmap.h was being pulled in (transitively) by SkCanvas.h, but that
was removed in Skia's https://skia-review.googlesource.com/15195.
Include SkBitmap.h directly in Movie.h
Test: No change in behavior. No test. Compilation will "test".
Change-Id: Ibeefdf829e4070e41b6dace4b7e63fd9b67870eb
Santos Cordon [Wed, 3 May 2017 17:18:54 +0000 (17:18 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev am:
e4e953ae4c
am:
70deb628b8
Change-Id: I30faf783b233d7095a6c9696be38a5cdf29a24ca
Santos Cordon [Wed, 3 May 2017 17:15:00 +0000 (17:15 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
am:
e4e953ae4c
Change-Id: Ifbfc389a5c72493a06de9fa33828ff50ff0d46a5
Christine Franks [Wed, 3 May 2017 17:14:52 +0000 (17:14 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev am:
78e03b44c3
am:
0bd001e95c
Change-Id: I83536aa49173091ed5fe8ad96e8f752a5313ef93
Android Build Merger (Role) [Wed, 3 May 2017 17:08:40 +0000 (17:08 +0000)]
Merge "Merge "Treat apps that use channels as O apps" into oc-dev am:
b0744b820a am:
65c95aab05"
TreeHugger Robot [Wed, 3 May 2017 17:08:21 +0000 (17:08 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
Julia Reynolds [Wed, 3 May 2017 17:07:34 +0000 (17:07 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev am:
b0744b820a
am:
65c95aab05
Change-Id: I7c71490236b10229b9592e57511a8f7e4679be49
TreeHugger Robot [Wed, 3 May 2017 17:07:09 +0000 (17:07 +0000)]
Merge "Add TestableResources"
Christine Franks [Wed, 3 May 2017 17:06:42 +0000 (17:06 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev
am:
78e03b44c3
Change-Id: I4cd13b8858f731ad66c5d0697cb95993317890ca
TreeHugger Robot [Wed, 3 May 2017 17:02:10 +0000 (17:02 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev
Chen Xu [Wed, 3 May 2017 16:58:23 +0000 (16:58 +0000)]
Merge "support locale change for notification channels" into oc-dev am:
dd373a838d
am:
7f9b31601e
Change-Id: Iade3dd57f046908e0b4031b5f7a87dd5c1240909
Julia Reynolds [Wed, 3 May 2017 16:53:22 +0000 (16:53 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
am:
b0744b820a
Change-Id: I2d9bc9ba84109408d765d2af34020f7d49921e2f
Julia Reynolds [Wed, 3 May 2017 16:50:27 +0000 (16:50 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
Chen Xu [Wed, 3 May 2017 16:47:09 +0000 (16:47 +0000)]
Merge "support locale change for notification channels" into oc-dev
am:
dd373a838d
Change-Id: I7773fb08018925589a271baccf35ce3d9cb3c7b7
Chen Xu [Wed, 3 May 2017 16:42:43 +0000 (16:42 +0000)]
Merge "support locale change for notification channels" into oc-dev
Wale Ogunwale [Wed, 3 May 2017 16:33:59 +0000 (16:33 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev am:
9304756c28
am:
4f49a5c7ba
Change-Id: Ib8f96663e4a667385ad0891616789403d14720f5
Wale Ogunwale [Wed, 3 May 2017 16:26:53 +0000 (16:26 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
am:
9304756c28
Change-Id: I81df798a1f2897837c6adbc622ffa64766030a6a
Roozbeh Pournader [Wed, 3 May 2017 16:26:50 +0000 (16:26 +0000)]
Merge "Update unit tests for forward delete" into oc-dev am:
995b4a2185
am:
465033c145
Change-Id: I3dc6b1c299d60a5e1aee4e30effa86e665af73e4
Roozbeh Pournader [Wed, 3 May 2017 16:21:52 +0000 (16:21 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
am:
995b4a2185
Change-Id: Idc9e02ae6c792194db32070557ad3921aceca49d
TreeHugger Robot [Wed, 3 May 2017 16:21:36 +0000 (16:21 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 16:13:10 +0000 (16:13 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
Julia Reynolds [Wed, 3 May 2017 15:56:37 +0000 (15:56 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev am:
abfa176b45
am:
ea447b0f40
Change-Id: I1007a52cc059addf0e583122866d79cdd5355646
Julia Reynolds [Wed, 3 May 2017 15:46:07 +0000 (15:46 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
am:
abfa176b45
Change-Id: I238c7b739ed7bf359804e9488cf13c27fbb21d2c
Tomasz Wasilczyk [Wed, 3 May 2017 15:42:31 +0000 (15:42 +0000)]
Merge "Implement get/setConfiguration calls of ITuner."
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
Artem Iglikov [Wed, 3 May 2017 14:06:59 +0000 (15:06 +0100)]
Add unit tests for com.android.server.backup.utils
Also add missing javadocs to some new classes.
Bug:
37939902
Test: runtest -p com.android.server.backup frameworks-services
Change-Id: I7c24cec754af9ea6caee7791a11085b8c174c427
Jason Monk [Tue, 2 May 2017 18:22:21 +0000 (14:22 -0400)]
Add TestableResources
Makes it easy to add or change values of resources from tests.
Test: runtest --path frameworks/base/tests/testables/tests
Change-Id: Iaedff3d4ce9eaf9f270e7c62bc8c1634bd3519ec
Bartosz Fabianowski [Wed, 3 May 2017 15:20:45 +0000 (15:20 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev am:
c8ca16a85a
am:
68e947c1bb
Change-Id: I6b80084a3bd04c350b3d4f4930aa7885ec8db22c
Jorim Jaggi [Wed, 3 May 2017 13:21:26 +0000 (15:21 +0200)]
Fix snapshots for secure windows
First, also draw system bar backgrounds when drawing a fake
snapshot. For that, refactor the drawing into a separate class so
it can be reused. Also enable fake snapshots for secure windows.
Test: com.android.server.wm.TaskSnapshotControllerTest
Test: com.android.server.wm.TaskSnapshotSurfaceTest
Test: Secure activity with resuming delay, make sure system bars
are covered when reopening app.
Bug:
35710126
Change-Id: I2f0ebc7e7acb80015780a4e882f0a472599efa30
Bartosz Fabianowski [Wed, 3 May 2017 15:15:20 +0000 (15:15 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
am:
c8ca16a85a
Change-Id: I3d9d26ce66c74c307cb9f2cd06537b2bb3a22487
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
Christine Franks [Sat, 11 Feb 2017 01:36:10 +0000 (17:36 -0800)]
Night display status restores on reboot/user change
Fixes:
30086742
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I264be077e607baf8e19496f0c57549a907668005
Jason Monk [Wed, 3 May 2017 14:37:34 +0000 (10:37 -0400)]
Fix QS visibility logs missing some info
Test: runtest systemui
Change-Id: I6deb71576b137dfbd51f863e88ad939d4f3fab1b
Fixes:
35454347
Julia Reynolds [Mon, 1 May 2017 13:20:30 +0000 (09:20 -0400)]
Treat apps that use channels as O apps
... even if they don't target O
- Delete misc channel
- Read settings from channel instead of notification
Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes:
37540996
Fixes:
35378789
Wale Ogunwale [Tue, 2 May 2017 21:49:04 +0000 (14:49 -0700)]
Only allow AM to update display orientation based on app containers
Activity manager choregraphs several app states when starting an
activity including when the display orientation should be updated based
on the app that is now in the foreground. It is possible for a call to
originate within WM after AM adds the starting app token, but before AM
makes the app visible and resumed. E.g. A relayout call due to a
starting window. When this happens WM can prematurely update the display
orientation with incomplete information causing the starting app to be
in an incorrect orientation initially.
To fix this problem we now only factor in app containers (stacks, task,
..) when updating the display orientation if the call to update is
coming from AM. Otherwise we only use the non-app/system containers to
determine the orientation or return the last orientation.
Change-Id: I431ce9260ee31257732311a548c62cbcdb27eae7
Fixes:
37550022
Test: Launch 2 apps that don't fix orientation and use the recent button
to switch between them while holding the device in landscape.
Johan Torås Halseth [Wed, 3 May 2017 14:07:47 +0000 (14:07 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev am:
3eafb6e2c6
am:
bdc3dd8d5d -s ours
Change-Id: I9895d98e8f1565b2bda044c405b83ae9d5c49e54
Johan Torås Halseth [Wed, 3 May 2017 14:02:11 +0000 (14:02 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
am:
3eafb6e2c6
Change-Id: I33cac59253e106423680c70d5f79d83402109afd
TreeHugger Robot [Wed, 3 May 2017 13:55:49 +0000 (13:55 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
Adrian Roos [Wed, 3 May 2017 13:55:11 +0000 (13:55 +0000)]
Merge "DozePlugin: Remove" into oc-dev am:
b2484f2258
am:
825b574892
Change-Id: I5994fbdd9cc15c1dc42fbecd63792eb2214ab017
Adrian Roos [Wed, 3 May 2017 13:49:41 +0000 (13:49 +0000)]
Merge "DozePlugin: Remove" into oc-dev
am:
b2484f2258
Change-Id: Id660a1dcfd49aeb6f46285927696a822a8e8c8f9
Julia Reynolds [Tue, 2 May 2017 19:04:34 +0000 (15:04 -0400)]
Sorting and intrusiveness updates
- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.
Test: cts-verifier, attention management test
Bug:
36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c
TreeHugger Robot [Wed, 3 May 2017 13:43:14 +0000 (13:43 +0000)]
Merge "DozePlugin: Remove" into oc-dev
Jorim Jaggi [Wed, 3 May 2017 13:28:39 +0000 (13:28 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev am:
251894b134
am:
53f6c02354
Change-Id: I83c68cf4bad91f7baa5016aab0f66f1d5fe2700f
Geoffrey Pitsch [Wed, 3 May 2017 13:26:43 +0000 (13:26 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev am:
b9ee2d4677
am:
29fecaf2a6
Change-Id: I2032881d163f6ba08d3d288dbdfbd8d0cb70f321
Jorim Jaggi [Wed, 3 May 2017 13:21:52 +0000 (13:21 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
am:
251894b134
Change-Id: I63323963266b4194f61c8e6d6cc30a63f9af78eb
Geoffrey Pitsch [Wed, 3 May 2017 13:19:03 +0000 (13:19 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
am:
b9ee2d4677
Change-Id: Icef88789844286860a348fab200ec8169dabbe51
Bartosz Fabianowski [Tue, 18 Apr 2017 12:39:23 +0000 (14:39 +0200)]
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
TreeHugger Robot [Wed, 3 May 2017 13:16:27 +0000 (13:16 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
Geoffrey Pitsch [Wed, 3 May 2017 13:15:16 +0000 (13:15 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
Abodunrinwa Toki [Wed, 3 May 2017 12:45:04 +0000 (12:45 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev am:
d30044407e
am:
e52458d98e
Change-Id: I1a67407a7d9bcf240f1a519060192ee220e9becc
Abodunrinwa Toki [Wed, 3 May 2017 12:40:34 +0000 (12:40 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
am:
d30044407e
Change-Id: Ie6b8c7e95e47c5e382d3f2dab505faee1c03a6e8