OSDN Git Service
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
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
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
TreeHugger Robot [Wed, 3 May 2017 12:35:17 +0000 (12:35 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
Johan Torås Halseth [Wed, 26 Apr 2017 20:20:32 +0000 (21:20 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
It previously used a backup timeout of 5 min, and restore timeout of 1
min, that would always timeout if the files on shared storage were big.
Now increase both to 60 minutes.
Bug:
37201952
Test: adb backup -shared && adb restore backup.ab
Merged-In: Ice6648554933baf76e96fd151b506564487c91c6
Change-Id: I99095249e960fd47fc742154bc513347bf506548
Jorim Jaggi [Tue, 2 May 2017 16:02:46 +0000 (18:02 +0200)]
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
TreeHugger Robot [Wed, 3 May 2017 11:22:31 +0000 (11:22 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage."
Artem Iglikov [Wed, 3 May 2017 10:13:20 +0000 (10:13 +0000)]
Merge "Move message ids to BackupHandler."
TreeHugger Robot [Wed, 3 May 2017 10:04:25 +0000 (10:04 +0000)]
Merge "Revert "Add more explicit documentation for install reason""
Andrei Stingaceanu [Wed, 3 May 2017 09:55:25 +0000 (09:55 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev am:
e0857a5800
am:
9b6f0e6e1b
Change-Id: Ic349bde8c693210077a8ec1ad8e3f5d90f0855aa
Narayan Kamath [Wed, 3 May 2017 09:39:29 +0000 (10:39 +0100)]
preloaded-classes: Add android.text.Html$HtmlParser
This class creates a singleton HTMLSchema instance in <clinit> and
we want this done in the zygote. HTMLSchema.<init> is too large for
the compiler and can allocate ~100k of objects on the heap. This also
saves ~50ms in the execution of Html.fromHtml on a lightly loaded
marlin-userdebug.
Test: manual
Bug:
36678451
Change-Id: Icdd3af35018bbe283b3e3690c696e6517452165d
Andrei Stingaceanu [Wed, 3 May 2017 09:53:28 +0000 (09:53 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev am:
2b0d0671b8
am:
411b7d9b5e
Change-Id: Ia5d517564c925debf882db0a3f976790a22a2f0f
Andrei Stingaceanu [Wed, 3 May 2017 09:48:11 +0000 (09:48 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
am:
e0857a5800
Change-Id: I295b78a4397bb6409eef1963362b766c0ea78640
Andrei Stingaceanu [Wed, 3 May 2017 09:45:52 +0000 (09:45 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
am:
2b0d0671b8
Change-Id: I8f5457aacd79bdaf7be72f7cdc082d0c915f61c6
Johan Torås Halseth [Wed, 3 May 2017 09:43:06 +0000 (10:43 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
This is a manual merge of ag/
2161962 into master.
Test: it compiles.
Change-Id: Ice6648554933baf76e96fd151b506564487c91c6
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 08:20:12 +0000 (08:20 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev am:
e4f36952ab
am:
2c6741b660
Change-Id: I7a0f751d0ab2934435bfd0ed335308250b21f872
Bartosz Fabianowski [Wed, 3 May 2017 08:15:15 +0000 (08:15 +0000)]
Revert "Add more explicit documentation for install reason"
This reverts commit
839e8535898314f9cbca6f811a98f2d40ac61e2e.
We have a better solution in ag/
2135964.
Change-Id: Icfed2d883149c9e648b69ae88b64f76daf4030f3
Nicolas Geoffray [Wed, 3 May 2017 08:10:55 +0000 (08:10 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
am:
e4f36952ab
Change-Id: I37102edeba93a4b18c943c16946b609f04c1f0eb
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
Vladislav Kaznacheev [Wed, 3 May 2017 07:45:51 +0000 (07:45 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev am:
33f2b3b3b1
am:
f2b4b8306e
Change-Id: I8f76715c22c456b2b0aa1dcff88953487ee7399d
Vladislav Kaznacheev [Wed, 3 May 2017 07:38:47 +0000 (07:38 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
am:
33f2b3b3b1
Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
Tianjie Xu [Tue, 2 May 2017 19:41:56 +0000 (12:41 -0700)]
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
Sundeep Ghuman [Wed, 3 May 2017 04:37:12 +0000 (04:37 +0000)]
Merge "Updating network info state should return true." into oc-dev am:
703a233b03
am:
3b2ac89b9a
Change-Id: Ie80882f6d119a334065af7728ddda3867b21d4cf
Sundeep Ghuman [Wed, 3 May 2017 04:30:05 +0000 (04:30 +0000)]
Merge "Updating network info state should return true." into oc-dev
am:
703a233b03
Change-Id: Ib8a36b3880b65ea333a93dc4bd3ab5bca66272e7
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
Ruben Brunk [Wed, 3 May 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev am:
24f4743f92
am:
44e317e278
Change-Id: I2a66a50580a3e7c535c0eceec6f1d8fc1cf9b32e
Ruben Brunk [Wed, 3 May 2017 03:56:01 +0000 (03:56 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
am:
24f4743f92
Change-Id: I23f5fdf5b3584861818bc378b85f98fc2e33ebb8
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Ben Lin [Wed, 3 May 2017 02:37:27 +0000 (02:37 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev am:
d6bfaba59c
am:
bb87997182
Change-Id: I82a9b7c4542e4a2f157a608be3a991c158707f12
OSDN Git Service
