OSDN Git Service
Bill Yi [Mon, 21 Nov 2016 01:44:32 +0000 (01:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
d0220f7863 -s ours
am:
610d943dd6 -s ours
Change-Id: I32cb631e3fc22caaad64403f3a13852b0d9ec18e
Bill Yi [Mon, 21 Nov 2016 01:43:26 +0000 (01:43 +0000)]
Import translations. DO NOT MERGE am:
18935bdfc9 -s ours
am:
028dcb2eff -s ours
Change-Id: I7a75530d2ec2b28d72ec0091cb89bda7366648ae
Bill Yi [Mon, 21 Nov 2016 01:42:19 +0000 (01:42 +0000)]
Import translations. DO NOT MERGE am:
ca112cfaeb -s ours
am:
fd2f8d8571 -s ours
Change-Id: I1f5459cca82c436b1cb0834e4af826fba4f89339
Bill Yi [Mon, 21 Nov 2016 01:34:37 +0000 (01:34 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
d0220f7863 -s ours
Change-Id: I0065f8bdf061cd032ba4cf6fc54ca494da369a31
Bill Yi [Mon, 21 Nov 2016 01:34:34 +0000 (01:34 +0000)]
Import translations. DO NOT MERGE
am:
18935bdfc9 -s ours
Change-Id: I75043944a7acfcf1c349adfcec764e1fbbf4e0b0
Bill Yi [Mon, 21 Nov 2016 01:33:32 +0000 (01:33 +0000)]
Import translations. DO NOT MERGE
am:
ca112cfaeb -s ours
Change-Id: I259f0c5f68a89c27ba68d7721efe67a5f12ca186
TreeHugger Robot [Mon, 21 Nov 2016 01:23:55 +0000 (01:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Sun, 20 Nov 2016 23:49:28 +0000 (15:49 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ia328721b05af6cfe32f4494e89f6ee1645cb1deb
Bill Yi [Sun, 20 Nov 2016 23:43:22 +0000 (15:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: I102b129ace5c7d97a6874aad995930b2f3cbdae6
Michael Kwan [Sat, 19 Nov 2016 00:15:48 +0000 (00:15 +0000)]
Fix default dialog background colour for watch devices. am:
56c25af274
am:
0995a17481
Change-Id: I5cbd81a2a776542190beb669e36146911dc2357c
Michael Kwan [Sat, 19 Nov 2016 00:12:12 +0000 (00:12 +0000)]
Fix default dialog background colour for watch devices.
am:
56c25af274
Change-Id: I5020e61d35adf3327f4b0e39e5e3e74188392330
Marie Janssen [Fri, 18 Nov 2016 23:42:41 +0000 (23:42 +0000)]
Bluetooth: BLE app tracking fixes
am:
6689f33436
Change-Id: If01dfa47d4d616f2455a7800c040cb0000f21d52
Yifan Hong [Fri, 18 Nov 2016 23:32:22 +0000 (23:32 +0000)]
Merge "Split libhidl into base and transport." am:
c6c005ef5b am:
06025dc947
am:
60090674e1
Change-Id: I598fabea4c1097a94a5131d3e176a9be62302946
Yifan Hong [Fri, 18 Nov 2016 23:29:05 +0000 (23:29 +0000)]
Merge "Split libhidl into base and transport." am:
c6c005ef5b
am:
06025dc947
Change-Id: I20fbea0d4d4dc3908f962007df3e3509c054be68
Yifan Hong [Fri, 18 Nov 2016 23:27:18 +0000 (23:27 +0000)]
Split libhidl into base and transport. am:
c46d1b44eb am:
78f6a7c615
am:
3ca2fb074f
Change-Id: I382d91f4cea8577400bba71bcd51e8e9a947215f
Yifan Hong [Fri, 18 Nov 2016 23:23:08 +0000 (23:23 +0000)]
Merge "Split libhidl into base and transport."
am:
c6c005ef5b
Change-Id: Ia0017e01d650383a709952c86012dc958d93b794
Yifan Hong [Fri, 18 Nov 2016 23:20:38 +0000 (23:20 +0000)]
Split libhidl into base and transport. am:
c46d1b44eb
am:
78f6a7c615
Change-Id: I95471e3f90ba796b52c3df555b60ad6f49aae5da
Yifan Hong [Fri, 18 Nov 2016 23:14:27 +0000 (23:14 +0000)]
Split libhidl into base and transport.
am:
c46d1b44eb
Change-Id: I0bcf04338d71386249de46c015b0e577c47c6e79
Treehugger Robot [Fri, 18 Nov 2016 23:08:55 +0000 (23:08 +0000)]
Merge "Split libhidl into base and transport."
Michael Kwan [Fri, 18 Nov 2016 23:02:43 +0000 (15:02 -0800)]
Fix default dialog background colour for watch devices.
Bug:
33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
Wan He [Fri, 18 Nov 2016 22:53:09 +0000 (22:53 +0000)]
Merge "Fix incorrect calculation of sizeof package structure" am:
757e286cc8 am:
530fdccbe4
am:
2f176bb2cd
Change-Id: I4dd8f888102fadb1d636256e742742ad2388af2b
Wan He [Fri, 18 Nov 2016 22:48:28 +0000 (22:48 +0000)]
Merge "Fix incorrect calculation of sizeof package structure" am:
757e286cc8
am:
530fdccbe4
Change-Id: I92417758a165741a4346d6b6c3f3491776b86729
Wan He [Fri, 18 Nov 2016 22:39:43 +0000 (22:39 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"
am:
757e286cc8
Change-Id: Ia16ee8f4efaee3e43c656f753c878b13b4a4706c
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug:
32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
Treehugger Robot [Fri, 18 Nov 2016 22:30:41 +0000 (22:30 +0000)]
Merge "Fix incorrect calculation of sizeof package structure"
Mats 2, Åkesson [Fri, 18 Nov 2016 21:00:04 +0000 (21:00 +0000)]
Merge "Customization of LTE Signal Bars" am:
3cbf2c2657 am:
5ee2b9384b
am:
a16a77781e
Change-Id: Ia9853ec8459355ad3b00e7505dc6af491bf6828d
Mats 2, Åkesson [Fri, 18 Nov 2016 20:56:03 +0000 (20:56 +0000)]
Merge "Customization of LTE Signal Bars" am:
3cbf2c2657
am:
5ee2b9384b
Change-Id: I82d61b23560e4bdf84caca7e49ddcd367662cb47
Mats 2, Åkesson [Fri, 18 Nov 2016 20:50:20 +0000 (20:50 +0000)]
Merge "Customization of LTE Signal Bars"
am:
3cbf2c2657
Change-Id: I33c625ec49547fde582462687e6229ddf0269b15
Treehugger Robot [Fri, 18 Nov 2016 20:44:14 +0000 (20:44 +0000)]
Merge "Customization of LTE Signal Bars"
Felipe Leme [Fri, 18 Nov 2016 20:07:18 +0000 (20:07 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev
am:
589c217580 -s ours
Change-Id: I35f9b310a83ad4386a5f8910613698d2f1d7e226
Felipe Leme [Fri, 18 Nov 2016 20:07:11 +0000 (20:07 +0000)]
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
am:
7e45541244 -s ours
Change-Id: Id6daee5de0684c6144858d8a15ab57b8e1676e9b
Selim Cinek [Fri, 18 Nov 2016 20:04:25 +0000 (20:04 +0000)]
Merge "Share one receiver for CurrentUserTracker" am:
06d619ccfa am:
a84c7ea396
am:
61e2ff5727
Change-Id: I0d10e5142705810274e4677115bb4e249ad806f4
Selim Cinek [Fri, 18 Nov 2016 20:03:28 +0000 (20:03 +0000)]
Merge "Brightness mirror - fix multi-touch issue" am:
1bfab3de31 am:
44857962dc
am:
3212624a6b
Change-Id: Ib473c039fd8392c8d43c0c1473f0c705c00b625e
TreeHugger Robot [Fri, 18 Nov 2016 19:59:40 +0000 (19:59 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev
Selim Cinek [Fri, 18 Nov 2016 19:57:20 +0000 (19:57 +0000)]
Merge "Share one receiver for CurrentUserTracker" am:
06d619ccfa
am:
a84c7ea396
Change-Id: I54ca8022b6aeb15329d7a432300eaa758ea4b8ac
Selim Cinek [Fri, 18 Nov 2016 19:56:27 +0000 (19:56 +0000)]
Merge "Brightness mirror - fix multi-touch issue" am:
1bfab3de31
am:
44857962dc
Change-Id: Ie5f7a865b3ed1d17444b5133ad530ae6191294a9
Selim Cinek [Fri, 18 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Share one receiver for CurrentUserTracker"
am:
06d619ccfa
Change-Id: I4b0dc5398b0be804663ebd633070a38cc51ec7de
Selim Cinek [Fri, 18 Nov 2016 19:50:27 +0000 (19:50 +0000)]
Merge "Brightness mirror - fix multi-touch issue"
am:
1bfab3de31
Change-Id: I5906d89a1c4e1343dbdbf99f328a5356b4f2be85
Selim Cinek [Fri, 18 Nov 2016 19:39:30 +0000 (19:39 +0000)]
Merge "Share one receiver for CurrentUserTracker"
Selim Cinek [Fri, 18 Nov 2016 19:39:09 +0000 (19:39 +0000)]
Merge "Brightness mirror - fix multi-touch issue"
Erik Wolsheimer [Fri, 18 Nov 2016 19:31:32 +0000 (19:31 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev am:
d841ee9c81
am:
53f88c7826
Change-Id: Ib2e5908ffdd6f9b251a48cf78c1ba6d61ddb4381
Michael Kwan [Fri, 18 Nov 2016 19:30:25 +0000 (19:30 +0000)]
Enable swipe to dismiss for watch devices. am:
686de42711
am:
ba28331c3a
Change-Id: I1a11c42470c21dced393428eeb5206f34cc8cbc3
Erik Wolsheimer [Fri, 18 Nov 2016 19:24:32 +0000 (19:24 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
am:
d841ee9c81
Change-Id: Ic2bd153e8ba12b6e4aff380c20c7ecf5dea09791
Michael Kwan [Fri, 18 Nov 2016 19:24:27 +0000 (19:24 +0000)]
Enable swipe to dismiss for watch devices.
am:
686de42711
Change-Id: I3f9b9dcf8f7094bcf59eec643a5f87922486371e
Erik Wolsheimer [Fri, 18 Nov 2016 19:17:53 +0000 (19:17 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
Felipe Leme [Wed, 17 Aug 2016 20:39:10 +0000 (13:39 -0700)]
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
(cherry pick of commits
2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).
Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Bug:
30900628
Bug:
28722556
Fixes:
32972310
(cherry picked from commit
20488d97cdc9aa7e98f6fd75c2890ba18781654a)
Scott Main [Fri, 18 Nov 2016 17:32:12 +0000 (17:32 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973 am:
97be8864e5 am:
ec9f41356c
am:
e42d88323a
Change-Id: Ic5587ed1d9d4932133a2017c1cf9fc4a5373a2ff
Jack Yu [Fri, 18 Nov 2016 17:30:47 +0000 (17:30 +0000)]
Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev
am:
d97ccb1c0b
Change-Id: I9a7a78640c5ca7a25d80764ce980ae38a5abcead
Jack Yu [Fri, 18 Nov 2016 17:22:39 +0000 (09:22 -0800)]
resolve merge conflicts of
80a0e6d to nyc-mr2-dev-plus-aosp
Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887
Scott Main [Fri, 18 Nov 2016 15:42:08 +0000 (15:42 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973 am:
97be8864e5
am:
ec9f41356c
Change-Id: I7cd3a82a73707b1f61c82897c0e7fbc63f33d226
Scott Main [Fri, 18 Nov 2016 15:36:33 +0000 (15:36 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973
am:
97be8864e5
Change-Id: I340207420e0811c74751a96dc30e929a411ea207
Scott Main [Fri, 18 Nov 2016 15:30:06 +0000 (15:30 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb
am:
192a8c4973
Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
Scott Main [Fri, 18 Nov 2016 15:24:18 +0000 (15:24 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359
am:
c8b11fb7cb
Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
Scott Main [Fri, 18 Nov 2016 15:17:06 +0000 (15:17 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600
am:
3fef783359
Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
Peter Qiu [Fri, 18 Nov 2016 09:05:13 +0000 (09:05 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration" am:
ebb722d04a am:
8bbb583ff7
am:
1b3a17c280
Change-Id: Id2e1d703f3c87fb02ff439a68f388b7fc5a93ea3
Peter Qiu [Fri, 18 Nov 2016 08:59:09 +0000 (08:59 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration" am:
ebb722d04a
am:
8bbb583ff7
Change-Id: I50cd0f4c92b30cd649626dad1a1288619d6b03e5
Peter Qiu [Fri, 18 Nov 2016 08:54:11 +0000 (08:54 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
am:
ebb722d04a
Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a
Treehugger Robot [Fri, 18 Nov 2016 08:45:15 +0000 (08:45 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
TreeHugger Robot [Fri, 18 Nov 2016 06:04:56 +0000 (06:04 +0000)]
Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev
Ricky Wai [Fri, 18 Nov 2016 01:47:06 +0000 (01:47 +0000)]
Catch KeyStoreException for setting profile lock am:
c8fa5ed8f2 am:
3b546019dc
am:
c40b9a8ee2
Change-Id: Ibbdef0242e12ba5e942cb8162e21a34fa30c9a92
Ricky Wai [Fri, 18 Nov 2016 01:43:01 +0000 (01:43 +0000)]
Catch KeyStoreException for setting profile lock am:
c8fa5ed8f2
am:
3b546019dc
Change-Id: Id668766a96473ae2f68e83dae1ecb547b26de6fc
Chris Tate [Fri, 18 Nov 2016 01:42:39 +0000 (01:42 +0000)]
Merge "Schedule agentDisconnected() in handler thread" am:
c02a4a4613 am:
72a838e704
am:
18d0df806e
Change-Id: I04b3f4a130f611c917f478e7c31b857a413641b7
Chris Tate [Fri, 18 Nov 2016 01:38:05 +0000 (01:38 +0000)]
Merge "Schedule agentDisconnected() in handler thread" am:
c02a4a4613
am:
72a838e704
Change-Id: I2eda02ea14fb67b1a0192750ae3885ec89f14564
Ricky Wai [Fri, 18 Nov 2016 01:38:04 +0000 (01:38 +0000)]
Catch KeyStoreException for setting profile lock
am:
c8fa5ed8f2
Change-Id: I28777d9d80ba13df463e05b95dd2524633554c9d
Chris Tate [Fri, 18 Nov 2016 01:33:29 +0000 (01:33 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
am:
c02a4a4613
Change-Id: I1e2da0be53678a791dd16be5d00caa5e712fa036
Chris Tate [Fri, 18 Nov 2016 01:23:31 +0000 (01:23 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
Michael Kwan [Fri, 18 Nov 2016 01:19:15 +0000 (01:19 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
am:
77ad3429a6 -s ours
Change-Id: I81e8e5d02c0039a9bdd2ef1632fc5f36c3ec3317
John Reck [Fri, 18 Nov 2016 00:44:26 +0000 (00:44 +0000)]
Merge "Avoid starving RT anims" am:
f77c220aa9 am:
7269372d5f
am:
91d1bbce59
Change-Id: Ie4bf34f84a09e3147edba6ad099338fa82adc5ca
John Reck [Fri, 18 Nov 2016 00:28:54 +0000 (00:28 +0000)]
Merge "Avoid starving RT anims" am:
f77c220aa9
am:
7269372d5f
Change-Id: Ife1e7ea95055d8179b4a622dc4dabce382575b5b
John Reck [Fri, 18 Nov 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Avoid starving RT anims"
am:
f77c220aa9
Change-Id: I3d4ba24ae0e6de4683d47163fd8f3bf65b98bd17
Yifan Hong [Wed, 16 Nov 2016 23:48:49 +0000 (15:48 -0800)]
Split libhidl into base and transport.
Bug:
32756130
Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8
Ricky Wai [Thu, 17 Nov 2016 18:49:17 +0000 (18:49 +0000)]
Catch KeyStoreException for setting profile lock
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.
Bug:
32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
Treehugger Robot [Thu, 17 Nov 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Avoid starving RT anims"
Michael Kwan [Thu, 3 Nov 2016 08:04:24 +0000 (01:04 -0700)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.
Bug:
30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
John Reck [Tue, 15 Nov 2016 18:22:01 +0000 (10:22 -0800)]
Avoid starving RT anims
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents
Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Brad Ebinger [Thu, 17 Nov 2016 19:43:08 +0000 (19:43 +0000)]
Merge "Readability improvements in Logging" am:
d51df736f6 am:
90b6e78657
am:
3ae84b6efe
Change-Id: I7eba86dfbf8845aae8bafddc4a6bc5f94b66bc2b
Brad Ebinger [Thu, 17 Nov 2016 19:35:08 +0000 (19:35 +0000)]
Merge "Readability improvements in Logging" am:
d51df736f6
am:
90b6e78657
Change-Id: I51e87f2a8146e1e60d3610bbdc791b40fc8ba972
Brad Ebinger [Thu, 17 Nov 2016 19:29:17 +0000 (19:29 +0000)]
Merge "Readability improvements in Logging"
am:
d51df736f6
Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2
Brad Ebinger [Thu, 17 Nov 2016 19:18:00 +0000 (19:18 +0000)]
Merge "Readability improvements in Logging"
Dimitry Ivanov [Thu, 17 Nov 2016 19:06:02 +0000 (19:06 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper" am:
f68cb55cc1 am:
6a5e1a7f4a
am:
b8e43f60c2
Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579
Dimitry Ivanov [Thu, 17 Nov 2016 18:57:58 +0000 (18:57 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper" am:
f68cb55cc1
am:
6a5e1a7f4a
Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36
Dimitry Ivanov [Thu, 17 Nov 2016 18:50:29 +0000 (18:50 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
am:
f68cb55cc1
Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
Treehugger Robot [Thu, 17 Nov 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
Jack Yu [Wed, 16 Nov 2016 00:16:21 +0000 (16:16 -0800)]
Added configuration for VT downgrade/tear down when data disabled
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.
bug:
32880745
Merged-In: Idd33a022b5a31cbc58592587bcb496bd78923ae7
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:56:56 +0000 (15:56 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am:
caa816451c am:
d771b36951
am:
728ce76156
Change-Id: I8f340a9ff5f98ad028db8ebd7502f6b12d0c464c
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:49:22 +0000 (15:49 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am:
caa816451c
am:
d771b36951
Change-Id: Ia37618f5de09faa89f2ed421eae0760118c1483e
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:41:57 +0000 (15:41 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
am:
caa816451c
Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:28:52 +0000 (15:28 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
Wan He [Thu, 17 Nov 2016 09:49:37 +0000 (17:49 +0800)]
Fix incorrect calculation of sizeof package structure
Argument "package" is a pointer, not the structure.
Signed-off-by: Wan He <xiaolin.gxl@alibaba-inc.com>
Pavlin Radoslavov [Thu, 17 Nov 2016 07:22:23 +0000 (07:22 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device" am:
3ebcf1218b am:
c15cc348e8
am:
ffb6a4beab
Change-Id: I2924dfe291a6a29620d4e22c47c32716516911e3
Pavlin Radoslavov [Thu, 17 Nov 2016 07:16:13 +0000 (07:16 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device" am:
3ebcf1218b
am:
c15cc348e8
Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c
Pavlin Radoslavov [Thu, 17 Nov 2016 07:07:20 +0000 (07:07 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
am:
3ebcf1218b
Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16
Treehugger Robot [Thu, 17 Nov 2016 06:58:42 +0000 (06:58 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
Pavlin Radoslavov [Thu, 17 Nov 2016 04:51:06 +0000 (20:51 -0800)]
Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.
Test: Manual A2DP testing with a phone and wireless headsets
Bug:
32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
Peter Qiu [Thu, 17 Nov 2016 02:35:38 +0000 (02:35 +0000)]
Merge "wifi: add constant definition for EAP types" am:
a908e65b66 am:
40dfd2d0bc
am:
120cb677f0
Change-Id: I7a1321952bd8fa0bb6a032cc847fbc0eba6ac67c
Dimitry Ivanov [Thu, 17 Nov 2016 02:28:04 +0000 (18:28 -0800)]
Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.
This change fixes these problems by removing dependency and renaming
JNI method.
Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
Peter Qiu [Thu, 17 Nov 2016 02:28:13 +0000 (02:28 +0000)]
Merge "wifi: add constant definition for EAP types" am:
a908e65b66
am:
40dfd2d0bc
Change-Id: I155c39131c820cf7eb77ee8b9bb2b51b3eed3d08
Peter Qiu [Thu, 17 Nov 2016 02:21:41 +0000 (02:21 +0000)]
Merge "wifi: add constant definition for EAP types"
am:
a908e65b66
Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
Treehugger Robot [Thu, 17 Nov 2016 02:10:23 +0000 (02:10 +0000)]
Merge "wifi: add constant definition for EAP types"
Jerry Zhang [Thu, 17 Nov 2016 00:50:53 +0000 (00:50 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am:
b37d826204 am:
1faf15d422
am:
12488ed15f
Change-Id: I83b0e723f86791eaa5d5fbc7d21172a69bb8090b