OSDN Git Service
TreeHugger Robot [Thu, 4 May 2017 02:11:17 +0000 (02:11 +0000)]
Merge "Fixed BackupSettingsTest (update blacklists)"
Felipe Leme [Thu, 4 May 2017 02:04:47 +0000 (02:04 +0000)]
Merge "Always start a manual request, even if view was already autofilled." into oc-dev am:
5fafafaba2
am:
edd58e7747
Change-Id: I58afcc728445a03ecf1a0ee70caec251a9fa75e9
Felipe Leme [Thu, 4 May 2017 01:55:14 +0000 (01:55 +0000)]
Merge "Always start a manual request, even if view was already autofilled." into oc-dev
am:
5fafafaba2
Change-Id: I52f98e7126a036eb2925660ab36284cfb57801d9
Antony Sargent [Thu, 4 May 2017 01:51:05 +0000 (01:51 +0000)]
Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev am:
d53a71f443
am:
dc62fbe81b
Change-Id: I56c2eb9a3dca6e8dad1cbddeabe4ebbe471b4758
TreeHugger Robot [Thu, 4 May 2017 01:47:00 +0000 (01:47 +0000)]
Merge "Always start a manual request, even if view was already autofilled." into oc-dev
Antony Sargent [Thu, 4 May 2017 01:43:00 +0000 (01:43 +0000)]
Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
am:
d53a71f443
Change-Id: I735640f2c9c7a00ab206372ffa33f51621546e78
TreeHugger Robot [Thu, 4 May 2017 01:37:02 +0000 (01:37 +0000)]
Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:30:17 +0000 (01:30 +0000)]
Merge "Animate scrim colors when unlocking"
Jeff Sharkey [Thu, 4 May 2017 01:16:29 +0000 (01:16 +0000)]
Merge "Revert "Don't add other's child as header or footer"" into oc-dev am:
6e0332f308
am:
a3ff1b35c5
Change-Id: I0376d88061f48ce95cdb4b26e5228989d760dafa
Jeff Sharkey [Thu, 4 May 2017 01:11:36 +0000 (01:11 +0000)]
Merge "Revert "Don't add other's child as header or footer"" into oc-dev
am:
6e0332f308
Change-Id: I088c65f866de6a9df51784865531b0cc44ea4248
TreeHugger Robot [Thu, 4 May 2017 01:03:56 +0000 (01:03 +0000)]
Merge "Revert "Don't add other's child as header or footer"" into oc-dev
Calin Juravle [Thu, 4 May 2017 00:50:41 +0000 (00:50 +0000)]
Merge "Fix potential race in DexManager" into oc-dev am:
c54fa39d8b
am:
43284ad8b7
Change-Id: I72dc2159438834c568a43ea8101109f34ea15c9a
Siyamed Sinir [Thu, 4 May 2017 00:48:08 +0000 (00:48 +0000)]
Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev am:
5073b91236
am:
fb37bba30d
Change-Id: I4dc4116e456af56969a4c7559e19fa6369f0df12
Sudheer Shanka [Thu, 4 May 2017 00:46:11 +0000 (00:46 +0000)]
Merge "Reduce the timeout for waiting for the network state update." into oc-dev am:
f345a436be
am:
a2ebd80d84
Change-Id: I56ac6f7e3c5ba725b087a69d38b68f41392c5a77
Calin Juravle [Thu, 4 May 2017 00:41:15 +0000 (00:41 +0000)]
Merge "Fix potential race in DexManager" into oc-dev
am:
c54fa39d8b
Change-Id: I1c7f3138ac6354ccc98d66dfb350bc184e5f1059
Siyamed Sinir [Thu, 4 May 2017 00:37:01 +0000 (00:37 +0000)]
Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev
am:
5073b91236
Change-Id: I3320735cffac4a6802b0a4e64bf0a64e845ac6df
Calin Juravle [Thu, 4 May 2017 00:35:39 +0000 (00:35 +0000)]
Merge "Fix potential race in DexManager" into oc-dev
Sudheer Shanka [Thu, 4 May 2017 00:35:03 +0000 (00:35 +0000)]
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
am:
f345a436be
Change-Id: I62dcd82ec7dc1ef4b3fb9ab2c332f18581b7425d
Jorim Jaggi [Thu, 4 May 2017 00:29:08 +0000 (00:29 +0000)]
Merge "Avoid reading HW bitmap pixels twice" into oc-dev am:
afe23b9b53
am:
257a070939
Change-Id: I2fe3e48d06c55e30a4e6dcf2779f17b1fe1939cf
Siyamed Sinir [Thu, 4 May 2017 00:27:27 +0000 (00:27 +0000)]
Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev
Sudheer Shanka [Thu, 4 May 2017 00:26:52 +0000 (00:26 +0000)]
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
Ian Pedowitz [Thu, 4 May 2017 00:23:27 +0000 (00:23 +0000)]
Merge "Revert "O is API 26"" into oc-dev am:
b42b9a22df
am:
c96a358318
Change-Id: If16a559a068f93f79c7c398323fe3f1bafe1aaf9
Jorim Jaggi [Thu, 4 May 2017 00:23:24 +0000 (00:23 +0000)]
Merge "Avoid reading HW bitmap pixels twice" into oc-dev
am:
afe23b9b53
Change-Id: If844553df8ef3516880c51dad93edce49146fb70
Ian Pedowitz [Thu, 4 May 2017 00:18:19 +0000 (00:18 +0000)]
Merge "Revert "O is API 26"" into oc-dev
am:
b42b9a22df
Change-Id: Ic869f9f6f627c960222cb5364e04e6f4491c0a88
Jesse Evans [Thu, 4 May 2017 00:14:45 +0000 (00:14 +0000)]
Merge "Grant ephemeral app access during service bind" into oc-dev am:
b3af9b7eb7
am:
cd1944336d
Change-Id: Ib10484d4d3019468f98056da780a24a4c0837176
TreeHugger Robot [Thu, 4 May 2017 00:14:13 +0000 (00:14 +0000)]
Merge "Avoid reading HW bitmap pixels twice" into oc-dev
Sujith Ramakrishnan [Thu, 4 May 2017 00:12:52 +0000 (00:12 +0000)]
Merge "Accessibility shortcut on Android TV." into oc-dev am:
4fca7821fb
am:
7c146c0a76
Change-Id: I22e060ef3ea31ce3b17b5735003f61325a012f1d
Ian Pedowitz [Thu, 4 May 2017 00:07:05 +0000 (00:07 +0000)]
Merge "Revert "O is API 26"" into oc-dev
Jesse Evans [Thu, 4 May 2017 00:06:55 +0000 (00:06 +0000)]
Merge "Grant ephemeral app access during service bind" into oc-dev
am:
b3af9b7eb7
Change-Id: Id5f5c10b732218d424be259fc1578adbbf9794b7
Hemant Gupta [Thu, 4 May 2017 00:06:47 +0000 (00:06 +0000)]
Bluetooth: OBEX: Don't close transport when obex is disconnected am:
4dc4d56e5e
am:
9d1fb36ba8
Change-Id: Ia2bc733c4e93ed2a6d2d5ad695b89233c60046ec
Sujith Ramakrishnan [Thu, 4 May 2017 00:05:02 +0000 (00:05 +0000)]
Merge "Accessibility shortcut on Android TV." into oc-dev
am:
4fca7821fb
Change-Id: Ib1deb1de528afe648817eb20974e67c35e640786
TreeHugger Robot [Wed, 3 May 2017 23:58:19 +0000 (23:58 +0000)]
Merge "Grant ephemeral app access during service bind" into oc-dev
Sujith Ramakrishnan [Wed, 3 May 2017 23:56:18 +0000 (23:56 +0000)]
Merge "Accessibility shortcut on Android TV." into oc-dev
Hemant Gupta [Wed, 3 May 2017 23:55:12 +0000 (23:55 +0000)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
am:
4dc4d56e5e
Change-Id: If110e06cf8e7fed88fd314e8b7d114121ab76ee1
Felipe Leme [Wed, 3 May 2017 23:42:27 +0000 (23:42 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev am:
246cc5bf51
am:
5152055973
Change-Id: Ie3ea24baf32960eeaa8c85b71e25b8ec017212a1
Felipe Leme [Wed, 3 May 2017 23:34:29 +0000 (23:34 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
am:
246cc5bf51
Change-Id: Ie1e1e1edc6fc0b4202379dc61c7bb2167727ba6a
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
(cherry picked from commit
850758fb63ded57acf218341812ead95f7159ad6)
Kevin Chyn [Wed, 3 May 2017 23:20:07 +0000 (16:20 -0700)]
Fixed BackupSettingsTest (update blacklists)
Adjust blacklist to add new settings that shouldn't be backed up
Bug:
37684646
Test: mmma -j40 frameworks/base/core/tests/coretests, then
adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk, then
adb shell am instrument -w -e class android.provider.SettingsBackupTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I90e67d79ad158efe7261e3291274eb62a2ed6420
TreeHugger Robot [Wed, 3 May 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
Lucas Dupin [Wed, 3 May 2017 23:15:22 +0000 (16:15 -0700)]
Animate scrim colors when unlocking
Test: Set different wallpapers on home and lock screen, unlock the phone
Change-Id: Ifba44be747f0ad7b6ed4aec75197746edbbecfd2
Jeremy Joslin [Wed, 3 May 2017 23:13:26 +0000 (23:13 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev am:
d05dda1d40
am:
8cc43b6fa7
Change-Id: Ic2a3783d255482d0ae889c7501c2cdaf90ea2fed
Randy Pan [Wed, 3 May 2017 23:08:34 +0000 (23:08 +0000)]
Merge "Merge "Add network disabled reason starting index" into oc-dev am:
c7642c3239" into oc-dev-plus-aosp
am:
6ea58fad63
Change-Id: I00af68bba1c5f6bd4a5abb60b7cce0527a8746d3
Jeremy Joslin [Wed, 3 May 2017 23:05:51 +0000 (23:05 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev
am:
d05dda1d40
Change-Id: I90864d95416167384c7acb9ac3d6beb8e523b682
Android Build Merger (Role) [Wed, 3 May 2017 23:03:32 +0000 (23:03 +0000)]
Merge "Merge "Add network disabled reason starting index" into oc-dev am:
c7642c3239" into oc-dev-plus-aosp
Randy Pan [Wed, 3 May 2017 23:01:44 +0000 (23:01 +0000)]
Merge "Add network disabled reason starting index" into oc-dev
am:
c7642c3239
Change-Id: I7b6c39a1e89642e8e8fb7674e26b8323949a79cb
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev
* changes:
Revert permission check on setActiveScorer.
Allow the active scorer to be set to NULL.
Randy Pan [Wed, 3 May 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Add network disabled reason starting index" into oc-dev
Yifan Hong [Wed, 3 May 2017 22:55:46 +0000 (22:55 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev am:
0e0a37635e
am:
2e5ed49e86
Change-Id: Iae5650ba5186dc73e0dc2b20bf1feee127100db4
Chris Craik [Wed, 3 May 2017 22:53:46 +0000 (22:53 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev am:
ecc121d8bf
am:
16ee9b9bd1
Change-Id: I1a48d2f483b9d9859b6e5f599e6f59af8cd756c7
Yifan Hong [Wed, 3 May 2017 22:48:32 +0000 (22:48 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
am:
0e0a37635e
Change-Id: I6e2c660971c296f363b66baa43231e18464ffc34
Chris Craik [Wed, 3 May 2017 22:46:22 +0000 (22:46 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev
am:
ecc121d8bf
Change-Id: Iee5e75009bfe1dcce9dd021aa20f1410b1810f32
TreeHugger Robot [Wed, 3 May 2017 22:39:04 +0000 (22:39 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:38:23 +0000 (22:38 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 22:31:29 +0000 (22:31 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev am:
bca6bd2b8c
am:
aec91c2e73
Change-Id: I346aacd4412dddc98b0d68979355ee7087d6d366
Fyodor Kupolov [Wed, 3 May 2017 22:26:14 +0000 (22:26 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev
am:
bca6bd2b8c
Change-Id: If4bb1b78fc1cc3f8bc6987bd8bfcfa5738c5c0e9
Fyodor Kupolov [Wed, 3 May 2017 22:15:23 +0000 (22:15 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev
Ian Pedowitz [Wed, 3 May 2017 22:00:56 +0000 (22:00 +0000)]
Revert "O is API 26"
This reverts commit
9bcef8e2da32ba959b61a0b400adfe9fde1a2a10.
Reason for revert: b/
37355569
Bug:
37480230
Bug:
37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
Zac Iqbal [Wed, 3 May 2017 21:54:36 +0000 (21:54 +0000)]
Merge "Default Trust Agents are now always enforced."
Android Build Merger (Role) [Wed, 3 May 2017 21:44:30 +0000 (21:44 +0000)]
Merge "Merge "Fix Array Index out of bounds error." into oc-dev am:
5c05814af4 am:
7e51b8b671"
Sundeep Ghuman [Wed, 3 May 2017 21:42:46 +0000 (21:42 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev am:
5c05814af4
am:
7e51b8b671
Change-Id: If6a037654ff0cb5be728ef0fa70553ea9b92ff88
Android Build Merger (Role) [Wed, 3 May 2017 21:42:18 +0000 (21:42 +0000)]
Merge "Merge "Notification: Remove actions from public view" into oc-dev am:
37963d61b2 am:
b26c94ce4b"
Adrian Roos [Wed, 3 May 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev am:
37963d61b2
am:
b26c94ce4b
Change-Id: I4abcf27a87a87432a39aceac9a153a41b83d8031
Adrian Roos [Wed, 3 May 2017 21:36:22 +0000 (21:36 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev am:
37963d61b2
am:
b26c94ce4b
Change-Id: I1801ecae3fb327c8767f71d5e7f91c5cd581c448
Sundeep Ghuman [Wed, 3 May 2017 21:30:17 +0000 (21:30 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev
am:
5c05814af4
Change-Id: I11b957781eaab2702b3c7f1466c89ce60a5c30c8
Fyodor Kupolov [Wed, 3 May 2017 21:23:54 +0000 (21:23 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev am:
45a5adadbd
am:
2820e21299
Change-Id: Id6783edf74bf3f254b80ee99af14d0ebb695cb5b
Adrian Roos [Wed, 3 May 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev
am:
37963d61b2
Change-Id: I845cdc55b23f797b81adc08ef554831018822777
TreeHugger Robot [Wed, 3 May 2017 21:22:44 +0000 (21:22 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 21:13:47 +0000 (21:13 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev
am:
45a5adadbd
Change-Id: I6b8f626fd9e7590a2bf12123ee42c7dcdbc0444f
Adrian Roos [Wed, 3 May 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev
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
Fyodor Kupolov [Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev
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
Jeff Sharkey [Wed, 3 May 2017 19:25:08 +0000 (19:25 +0000)]
Revert "Don't add other's child as header or footer"
This reverts commit
358d0d329785a225449aa9c8aea7fcc2c7bec741.
This CL resulted in b/
37933333 regression, so it'll have to re-land with a target API check.
Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b
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
Felipe Leme [Wed, 3 May 2017 17:04:02 +0000 (10:04 -0700)]
Always start a manual request, even if view was already autofilled.
Fixes:
36034784
Test: CtsAutoFillServiceTestCases pass
Test: testAutofillManuallyAgainAfterAutomaticallyAutofilledBefore()
Test: testAutofillManuallyAgainAfterManuallyAutofilledBefore()
Change-Id: Ided8c42367b71766772bd364445510848db2adce
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
OSDN Git Service
