OSDN Git Service
Bill Yi [Thu, 27 Oct 2016 05:07:56 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE
am:
fc0224f880 -s ours
Change-Id: Ia6ca469ec75244202c5cf49605e05ab364bd0274
Bill Yi [Thu, 27 Oct 2016 05:07:03 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours am:
18608133d8 -s ours
am:
1653bfafc4 -s ours
Change-Id: I4793a3d04fc08897fdab2f11f4fa194076219b49
Bill Yi [Thu, 27 Oct 2016 04:59:00 +0000 (04:59 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours
am:
18608133d8 -s ours
Change-Id: I56489534a775a003ca0e5863bedafe2201e38c28
Bill Yi [Thu, 27 Oct 2016 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a2b301d0e1 -s ours
Change-Id: I33dcb6841acdee235a66dcf4f0900ee6cc041090
Bill Yi [Thu, 27 Oct 2016 04:54:34 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am:
aad661f874 -s ours
Change-Id: I8196b80e5f5ce6ac932e7556fc4727ee4047c6ba
Bill Yi [Thu, 27 Oct 2016 04:54:31 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am:
c541a19fba -s ours
Change-Id: I8540ec656b922d2a56b8ddcb58c719e52a1bb5c6
TreeHugger Robot [Thu, 27 Oct 2016 04:50:09 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 27 Oct 2016 03:18:34 +0000 (20:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01dfed1e6db0d4fe5cff72df3cec234400085fde
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 03:12:01 +0000 (20:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I637b457c6e9a20345cd5dbe599c4dce15ca9040c
Auto-generated-cl: translation import
Marie Janssen [Thu, 27 Oct 2016 00:29:51 +0000 (00:29 +0000)]
Bluetooth: prevent enabling BLE in airplane mode am:
a80d745c65 am:
6affbde556
am:
73bfd25356
Change-Id: Ieb424a2d68058d4171e6c9bd04f8a42cc1f3d7e9
Marie Janssen [Thu, 27 Oct 2016 00:24:48 +0000 (00:24 +0000)]
Bluetooth: prevent enabling BLE in airplane mode am:
a80d745c65
am:
6affbde556
Change-Id: I4b67a584fc9db12431d4552387abe9c456dee4d2
Marie Janssen [Thu, 27 Oct 2016 00:20:17 +0000 (00:20 +0000)]
Bluetooth: prevent enabling BLE in airplane mode
am:
a80d745c65
Change-Id: I05a57fa747abedab24e0509c1fb7ab8737b2256a
Bill Yi [Wed, 26 Oct 2016 23:50:38 +0000 (16:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bbb28b633130252b0dd3f6036cf4e8812814ce7
Auto-generated-cl: translation import
Peter Qiu [Wed, 26 Oct 2016 22:54:15 +0000 (22:54 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058 am:
bb8f3a3bbf
am:
e6effcd7a6
Change-Id: Id9358a0d3f821c201563ea072cc6784125fac591
Peter Qiu [Wed, 26 Oct 2016 22:52:36 +0000 (22:52 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533 am:
fe4f473fb8
am:
f300e2f8ff
Change-Id: I51abbd1d96aaf2ed5d99737cdd452de3c34fbe35
Peter Qiu [Wed, 26 Oct 2016 22:50:53 +0000 (22:50 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69 am:
2fb7775d2a
am:
90e40ee843
Change-Id: I45b4b70582252d680648a996b5e95e998f41afe2
Peter Qiu [Wed, 26 Oct 2016 22:49:43 +0000 (22:49 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95 am:
6f426e3b17
am:
47047555bc
Change-Id: I381096b9e6243b10e0e4cea4f31ef058c07054fb
Peter Qiu [Wed, 26 Oct 2016 22:44:44 +0000 (22:44 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058
am:
bb8f3a3bbf
Change-Id: I935c4b34c1f40e2bba1983161f7900ec9511f8da
Peter Qiu [Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533
am:
fe4f473fb8
Change-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626
Peter Qiu [Wed, 26 Oct 2016 22:41:48 +0000 (22:41 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69
am:
2fb7775d2a
Change-Id: Ie6cc6911d6ec49a55f467cfe5e59f218df18455b
Peter Qiu [Wed, 26 Oct 2016 22:40:43 +0000 (22:40 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95
am:
6f426e3b17
Change-Id: Icb7497670a7137810ed4def6e6b087c56f1c6de9
Peter Qiu [Wed, 26 Oct 2016 22:30:37 +0000 (22:30 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am:
ef0cc62058
Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am:
1a5da2b533
Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4
Peter Qiu [Wed, 26 Oct 2016 22:28:55 +0000 (22:28 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am:
bae4becf69
Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am:
e557c35d95
Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:13:57 +0000 (22:13 +0000)]
Merge changes I69c1931b,I6b08f52d
* changes:
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
wifi: hotspot2: initial implementation of PasspointConfiguration
Marie Janssen [Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)]
Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.
Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.
Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble
Bug:
32140251
Bug:
32140271
Bug:
32369494
Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
(cherry picked from commit
bd93b7b3dc6141cef6236cf0ca7dcc5acf5bfeed)
Alain Vongsouvanh [Wed, 26 Oct 2016 21:34:40 +0000 (21:34 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev am:
7aa48283b0
am:
db82c3fc46
Change-Id: I2f50ee1a68da4501e29bca9848d60abce11ea7e7
Alain Vongsouvanh [Wed, 26 Oct 2016 21:33:44 +0000 (21:33 +0000)]
Properly set the center of the circular mask. am:
63d2e41d1b
am:
285cf2d765
Change-Id: I7ebd39225bff8740d486d38f4668eeb8fd83da56
Alain Vongsouvanh [Wed, 26 Oct 2016 21:29:19 +0000 (21:29 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev
am:
7aa48283b0
Change-Id: Ie54889ebded4a26ee20807f06d5832851eb941f0
Alain Vongsouvanh [Wed, 26 Oct 2016 21:29:15 +0000 (21:29 +0000)]
Properly set the center of the circular mask.
am:
63d2e41d1b
Change-Id: If638998c5012b5ebb68cca77b257a991b09827a9
TreeHugger Robot [Wed, 26 Oct 2016 21:20:20 +0000 (21:20 +0000)]
Merge "Properly set the center of the circular mask." into cw-f-dev
Svetoslav Ganov [Wed, 26 Oct 2016 20:46:04 +0000 (20:46 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am:
e9db00e39f am:
5ac13dcb25
am:
69a039eb78
Change-Id: Id11cb6af6a7e7d9512a3b56efae4832ccfb2f928
Svetoslav Ganov [Wed, 26 Oct 2016 20:45:07 +0000 (20:45 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am:
e2c85890ac am:
2a81b4c908
am:
c893565d24
Change-Id: I3b0abcfcc23b114b38204c0c957acb1316698845
Svetoslav Ganov [Wed, 26 Oct 2016 20:37:24 +0000 (20:37 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am:
e9db00e39f
am:
5ac13dcb25
Change-Id: Ic2950d36ac4f7a32d45e06741e80963f7e1cf583
Svetoslav Ganov [Wed, 26 Oct 2016 20:36:35 +0000 (20:36 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages am:
e2c85890ac
am:
2a81b4c908
Change-Id: If6495a817d87c41998cbc148fce7bbb39c4da5a4
Svetoslav Ganov [Wed, 26 Oct 2016 20:28:33 +0000 (20:28 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
am:
e9db00e39f
Change-Id: I4141899231b1d48bb8217fe071a4146202e10ab8
Svetoslav Ganov [Wed, 26 Oct 2016 20:28:30 +0000 (20:28 +0000)]
[DO NOT MERGE] Don't accidentally delete renamed packages
am:
e2c85890ac
Change-Id: Icbd85ddfc76e50553414bd47860370cdc442b796
Dimitry Ivanov [Wed, 26 Oct 2016 20:27:23 +0000 (20:27 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559 am:
808bd1765f
am:
54501b0dee
Change-Id: Ia07db4ba7b893a577b7d411eaa7fa230b8eb784f
Dimitry Ivanov [Wed, 26 Oct 2016 20:25:47 +0000 (20:25 +0000)]
Always call into native loader when load a native library am:
569834d861 am:
3512d092dd
am:
35207ba655
Change-Id: I56fa597e50da763027aba74d678c40f2b2496b69
TreeHugger Robot [Wed, 26 Oct 2016 20:22:49 +0000 (20:22 +0000)]
Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev
Dimitry Ivanov [Wed, 26 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559
am:
808bd1765f
Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070
Jordan Liu [Wed, 26 Oct 2016 20:16:42 +0000 (20:16 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master am:
bc2af49c21
am:
ff13cc20fe
Change-Id: I5aea360d11a44b35c781ae32822a559900be34e5
Dimitry Ivanov [Wed, 26 Oct 2016 20:16:38 +0000 (20:16 +0000)]
Always call into native loader when load a native library am:
569834d861
am:
3512d092dd
Change-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6
Jordan Liu [Wed, 26 Oct 2016 20:12:56 +0000 (20:12 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master
am:
bc2af49c21
Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:33 +0000 (20:11 +0000)]
Merge "Always call into native loader when load a native library"
am:
e266c37559
Change-Id: I4d220cde19ac85b16396070f493395227a85d82c
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Always call into native loader when load a native library
am:
569834d861
Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104
Alain Vongsouvanh [Wed, 26 Oct 2016 20:01:49 +0000 (13:01 -0700)]
Properly set the center of the circular mask.
The new circular mask did not take into account devices with a chin,
setting the center of the circular mask higher than it should be.
BUG:
32418552
Change-Id: Ia45e197492a57341ad7db620b1d3fcc4820eabf0
Jordan Liu [Wed, 26 Oct 2016 18:24:54 +0000 (11:24 -0700)]
resolve merge conflicts of
ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
Peter Qiu [Tue, 18 Oct 2016 19:04:23 +0000 (12:04 -0700)]
wifi: hotspot2: omadm: add parsing support for PPS MO tree
This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.
Bug:
32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh
Peter Qiu [Fri, 14 Oct 2016 21:26:46 +0000 (14:26 -0700)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.
Bug:
32129686
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"
Svetoslav Ganov [Wed, 26 Oct 2016 03:47:15 +0000 (20:47 -0700)]
[DO NOT MERGE] Don't accidentally delete renamed packages
Apps on the system image can change their package by declaring
their old one in the manifest. If a package is renamed it is
internally referred by its old name.
The reconciliation code was using the new package name for
renamed packages and was concluding the apk is orphaned thus
deleting it. This puts the package in a bad state where the app
is gone and the version on the system partition is disabled.
Also Play was showing an update for a renamed system app as
an install while it is an update because of the same reason,
it was using the new package name while the app is internally
referred by the old one.
The fix for both above is to internally normalize the package
name by using the old one if the package was renamed or the
package name as is.
Test: With the fix put the old calculator on the system image
and booted, then put the renamed calculator and booted, updated
calculator from play and rebooted - calculator keeps working.
Also did the above steps without the patch to put calculator
in a bad state and flashed the system with the patch which
fixed the broken calculator app.
bug:
32321269
Change-Id: I98bfc05c399edfc9854ebcce44182fefa55ceeff
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"
Jorim Jaggi [Wed, 26 Oct 2016 17:41:29 +0000 (17:41 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9 am:
b5fed003cc
am:
bb139c5633
Change-Id: I31d905372f37c3002212d3b7f49144e0b7812269
Jorim Jaggi [Wed, 26 Oct 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9
am:
b5fed003cc
Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec
Jorim Jaggi [Wed, 26 Oct 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix animation sequence for upload tasks"
am:
7f2676a3d9
Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"
Peter Qiu [Thu, 29 Sep 2016 17:44:15 +0000 (10:44 -0700)]
wifi: hotspot2: initial implementation of PasspointConfiguration
Only support nodes under HomeSP and Credential subtree that are used
by Hotspot 2.0 Release 1.
These classes are used for data exchanges between the app and the system
service (WifiService). All the business logics and validations will be
done on the service side (WifiService).
Bug:
31813706
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I6b08f52dd7b1a7b337899ab80f11d062c8e2f532
Brad Ebinger [Wed, 26 Oct 2016 16:53:57 +0000 (16:53 +0000)]
Merge "Add support for starting external Sessions" am:
4ce60695f9 am:
9bec1a5095
am:
2504343fcd
Change-Id: I8c8919377f1aa953fc798ce8fd431afb25104e78
Brad Ebinger [Wed, 26 Oct 2016 16:48:54 +0000 (16:48 +0000)]
Merge "Add support for starting external Sessions" am:
4ce60695f9
am:
9bec1a5095
Change-Id: Ie0b4ca75d34f8489483bd274e7902d3de67703fa
Brad Ebinger [Wed, 26 Oct 2016 16:42:15 +0000 (16:42 +0000)]
Merge "Add support for starting external Sessions"
am:
4ce60695f9
Change-Id: I6957c8e2846d216f77f5f6337388e1fc296511de
Brad Ebinger [Wed, 26 Oct 2016 16:34:31 +0000 (16:34 +0000)]
Merge "Add support for starting external Sessions"
Andreas Huber [Wed, 26 Oct 2016 15:58:50 +0000 (15:58 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am:
c3d8550cf3 am:
8bd63a39f3
am:
63f0ebc7a8
Change-Id: I4eeb088c4de6e13f4e939e847dd1ab62b9d91d6a
Andreas Huber [Wed, 26 Oct 2016 15:54:20 +0000 (15:54 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am:
c3d8550cf3
am:
8bd63a39f3
Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062
Andreas Huber [Wed, 26 Oct 2016 15:49:52 +0000 (15:49 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
am:
c3d8550cf3
Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259
Andreas Huber [Wed, 26 Oct 2016 15:38:44 +0000 (15:38 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
Julius D'souza [Wed, 26 Oct 2016 03:35:16 +0000 (03:35 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am:
1e0055bb51
am:
24dcd11841
Change-Id: I5e61f68e635a8a86b4fa8a1aaafe692431be5b91
Julius D'souza [Wed, 26 Oct 2016 03:34:09 +0000 (03:34 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate am:
82b9aff0a9
am:
4d3af80494
Change-Id: Ia54da3fd528bc62c74f607af1e8d45a51bf11918
Julius D'souza [Wed, 26 Oct 2016 03:29:49 +0000 (03:29 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
am:
1e0055bb51
Change-Id: If6b70c76c4e16634175667ca58b69077c5e54c61
Julius D'souza [Wed, 26 Oct 2016 03:29:41 +0000 (03:29 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate
am:
82b9aff0a9
Change-Id: I65408c700317d76e271659945fe280318dabe315
Julius D'souza [Wed, 26 Oct 2016 03:23:17 +0000 (03:23 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
Zhao Wei Liew [Mon, 14 Sep 2015 13:41:57 +0000 (21:41 +0800)]
Fix animation sequence for upload tasks
stat_sys_upload_anim2 and stat_sys_upload_anim1 are reversed,
resulting in an animation that jumps from one frame to the
following frame and back again.
Change-Id: Ibb9c6c4ff992895dce26a283f1ee9a81f7cdee15
Julius D'souza [Tue, 25 Oct 2016 02:26:45 +0000 (19:26 -0700)]
DO NOT MERGE: Add initial ambient light sensor rate
Bug:
32153559
Change-Id: Ic54bded46f88991290ed1e4d2574f865b6f598ec
Jorim Jaggi [Tue, 25 Oct 2016 23:55:56 +0000 (23:55 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am:
7e8fc05295 am:
66a7dc6193
am:
a03792fb24
Change-Id: Id1d6dfe8fd3a1553fae50601435b50e8746a7565
Jorim Jaggi [Tue, 25 Oct 2016 23:54:55 +0000 (23:54 +0000)]
Make sure to call dismissKeyguard after setOccluded am:
ec50931d88 am:
1d4f2b9914
am:
ae7f618f38
Change-Id: Ic11164067ce5145771fd0e6f13dcd478c16877f2
Jorim Jaggi [Tue, 25 Oct 2016 23:48:15 +0000 (23:48 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am:
7e8fc05295
am:
66a7dc6193
Change-Id: I53f230e3f9b6aa18c7d8d2ff41542fbd47c3da5c
Jorim Jaggi [Tue, 25 Oct 2016 23:47:20 +0000 (23:47 +0000)]
Make sure to call dismissKeyguard after setOccluded am:
ec50931d88
am:
1d4f2b9914
Change-Id: I27ef32dfb5963524c0c3efb03058f021799dda07
Jorim Jaggi [Tue, 25 Oct 2016 23:39:30 +0000 (23:39 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
am:
7e8fc05295
Change-Id: I30c5c07b6b0308e6161607f7e89302d5af8b7c11
Jorim Jaggi [Tue, 25 Oct 2016 23:39:25 +0000 (23:39 +0000)]
Make sure to call dismissKeyguard after setOccluded
am:
ec50931d88
Change-Id: Ib25480fa4efe63940fed144f4e28dee185244fad
Jorim Jaggi [Tue, 25 Oct 2016 23:32:54 +0000 (23:32 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
Christopher Wiley [Tue, 25 Oct 2016 23:14:52 +0000 (23:14 +0000)]
Merge "Add script to expedite running passing tests" am:
4d1c2922f0 am:
2bb707b1c1
am:
c65ca7708a
Change-Id: I77da4757155f028889890e80bb79ba56a8371b86
Christopher Wiley [Tue, 25 Oct 2016 23:10:49 +0000 (23:10 +0000)]
Merge "Add script to expedite running passing tests" am:
4d1c2922f0
am:
2bb707b1c1
Change-Id: I42f000895fcba0c12c5301578a791ce17668df3d
Christopher Wiley [Tue, 25 Oct 2016 23:06:51 +0000 (23:06 +0000)]
Merge "Add script to expedite running passing tests"
am:
4d1c2922f0
Change-Id: I1b85b8ffd3f6de26d3226f5b1e1475ad87e8def6
Treehugger Robot [Tue, 25 Oct 2016 22:58:55 +0000 (22:58 +0000)]
Merge "Add script to expedite running passing tests"
Adrian Roos [Tue, 25 Oct 2016 22:17:05 +0000 (22:17 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am:
db1fd054d2 -s ours am:
299b57410d -s ours
am:
0d280c5a52 -s ours
Change-Id: I6198082bc0dce2cccb7818e08e027e1df493ae1b
Adrian Roos [Tue, 25 Oct 2016 22:15:56 +0000 (22:15 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
21984eeaf7 -s ours am:
4e2bad2a02 -s ours
am:
cd9c84aff5 -s ours
Change-Id: I7d4316b8cccf4a2cc5106778d2e20ab5d80a8577
Adrian Roos [Tue, 25 Oct 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am:
db1fd054d2 -s ours
am:
299b57410d -s ours
Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185
Adrian Roos [Tue, 25 Oct 2016 22:10:46 +0000 (22:10 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
21984eeaf7 -s ours
am:
4e2bad2a02 -s ours
Change-Id: I578cbe489e705b77689860eb0cea7d79ab6cc4c8
Adrian Roos [Tue, 25 Oct 2016 22:02:49 +0000 (22:02 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
am:
db1fd054d2 -s ours
Change-Id: I9f3d116efa02bfca1df96414110722afe143a6dc
Adrian Roos [Tue, 25 Oct 2016 22:02:44 +0000 (22:02 +0000)]
Ambient: If user turned off ambient, keep it off after split
am:
21984eeaf7 -s ours
Change-Id: Ia9508033be03059a382abfaaa2adfc3e415df81b
Jakub Pawlowski [Tue, 25 Oct 2016 21:58:48 +0000 (21:58 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes" am:
8a0a58b218 am:
f169ecb76f
am:
f68a0c6dec
Change-Id: I7d73817cbb42f52f89112416cf7e090f08bec4df
Adrian Roos [Tue, 25 Oct 2016 21:55:49 +0000 (21:55 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
Jakub Pawlowski [Tue, 25 Oct 2016 21:54:44 +0000 (21:54 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes" am:
8a0a58b218
am:
f169ecb76f
Change-Id: I035eb25c9a320b1760221bc5928919a148801488
Jakub Pawlowski [Tue, 25 Oct 2016 21:47:35 +0000 (21:47 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
am:
8a0a58b218
Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac
Adrian Roos [Tue, 25 Oct 2016 21:39:18 +0000 (21:39 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
cb60c7a87e
am:
b97cd830e0
Change-Id: Ie0ea2eca7a74922d712d5f5bdedd005853f7a44d
Jakub Pawlowski [Tue, 25 Oct 2016 21:36:38 +0000 (21:36 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
Adrian Roos [Tue, 25 Oct 2016 21:31:17 +0000 (21:31 +0000)]
Ambient: If user turned off ambient, keep it off after split
am:
cb60c7a87e
Change-Id: I7da07f53de4748462f06a805921e7dcd28637820
Brad Ebinger [Fri, 21 Oct 2016 16:41:29 +0000 (09:41 -0700)]
Add support for starting external Sessions
This change adds support for parceling Session Information to be
transmitted over AIDLs and starting an external session in the external
process.
Test: Telecom Unit tests and new SessionManager Tests.
Bug:
26571395
Change-Id: Ie27ed88d4a8c344b34568025ddcf150fdcb38d62