OSDN Git Service
Michal Karpinski [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Extending DNS event reporting am:
f82d1596ce am:
3156b53fbe
am:
c1ca63e8cb
Change-Id: I5c3a43d9835900e849da6db2a895c0131f19d538
Michal Karpinski [Thu, 27 Oct 2016 13:20:31 +0000 (13:20 +0000)]
Extending DNS event reporting am:
f82d1596ce
am:
3156b53fbe
Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am:
f82d1596ce
Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
(cherry picked from commit
14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
Bug:
29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
Bill Yi [Thu, 27 Oct 2016 05:25:03 +0000 (05:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
43905cc9ac -s ours am:
3b2c3fe5ef -s ours
am:
ea109fa2c7 -s ours
Change-Id: I0db2a437d7449ebb7791c10615c248e1640cc132
Bill Yi [Thu, 27 Oct 2016 05:24:09 +0000 (05:24 +0000)]
Import translations. DO NOT MERGE am:
1377e2b985 -s ours am:
df305805c6 -s ours
am:
51521f2e18 -s ours
Change-Id: I4e07de2591fe8fbc4c8512fb47807aa434ab9a5a
Bill Yi [Thu, 27 Oct 2016 05:23:21 +0000 (05:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ad45d97c45 -s ours am:
d557ea9388 -s ours
am:
0141333d25 -s ours
Change-Id: I12544624bd86847af3528ec3f932d1442fee8f59
Bill Yi [Thu, 27 Oct 2016 05:22:26 +0000 (05:22 +0000)]
Import translations. DO NOT MERGE am:
d1b8917270 -s ours am:
6296c78ee4 -s ours
am:
044be18ae4 -s ours
Change-Id: I20f54a15d996b4fb1c786b1aabe8e090c5a558ca
Bill Yi [Thu, 27 Oct 2016 05:21:38 +0000 (05:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41912188e5 -s ours
am:
f0a5ebb129 -s ours
Change-Id: Ia8d103f423f72e3a32005f3f2c424ae2adac0ab3
Bill Yi [Thu, 27 Oct 2016 05:20:47 +0000 (05:20 +0000)]
Import translations. DO NOT MERGE am:
bff09ae3c8 -s ours
am:
305004ba4d -s ours
Change-Id: I43d0bd29cfb6ed5d332ee417c5b4e79d04b9b1b0
Bill Yi [Thu, 27 Oct 2016 05:19:56 +0000 (05:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c2effd95e2 -s ours
am:
6b8d9b2337 -s ours
Change-Id: I8311d8bc6ceee0de7935e8aaaa4c7dd091d2662f
Bill Yi [Thu, 27 Oct 2016 05:19:05 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am:
644a22437f -s ours
am:
316c6df269 -s ours
Change-Id: Ie9824ce9a2f24cc54b674209c82b717699a3cd2c
Bill Yi [Thu, 27 Oct 2016 05:13:33 +0000 (05:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
43905cc9ac -s ours
am:
3b2c3fe5ef -s ours
Change-Id: I4cbde56de0e86e7dc1f97595a60a2d38de078bc7
Bill Yi [Thu, 27 Oct 2016 05:12:51 +0000 (05:12 +0000)]
Import translations. DO NOT MERGE am:
1377e2b985 -s ours
am:
df305805c6 -s ours
Change-Id: Id238b877c3013be65641fe1e1d6937b6c1e4bdbf
Bill Yi [Thu, 27 Oct 2016 05:12:04 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ad45d97c45 -s ours
am:
d557ea9388 -s ours
Change-Id: Id6e530980e21ac4d2cb63ca3623bc28457ae8c2d
Bill Yi [Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours" into nyc-mr2-dev
am:
d37981be5a -s ours
Change-Id: I847bb6ba0d87353748f4506502f5d17d0f93d035
Bill Yi [Thu, 27 Oct 2016 05:11:16 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours
am:
38948cf86d -s ours
Change-Id: Ie362bb496f0f7262399434248f23bf1bbcbea991
Bill Yi [Thu, 27 Oct 2016 05:09:19 +0000 (05:09 +0000)]
Import translations. DO NOT MERGE am:
d1b8917270 -s ours
am:
6296c78ee4 -s ours
Change-Id: I9396a152c47e270c7660f46dca006468d26306c6
Bill Yi [Thu, 27 Oct 2016 05:09:19 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
50f02f9d0a -s ours
Change-Id: Ia71f1c93cb5abcc59867fc6318eac41536bf8ea0
Bill Yi [Thu, 27 Oct 2016 05:09:14 +0000 (05:09 +0000)]
Import translations. DO NOT MERGE
am:
6e3055ee37 -s ours
Change-Id: Ieb71085d233a47c000241368d435a3f8df985e03
Bill Yi [Thu, 27 Oct 2016 05:08:10 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
41912188e5 -s ours
Change-Id: Iadb23aebd270d96d6597e654b6ba5f417b023e96
Bill Yi [Thu, 27 Oct 2016 05:08:08 +0000 (05:08 +0000)]
Import translations. DO NOT MERGE
am:
bff09ae3c8 -s ours
Change-Id: Ie89040ae5c700d5ee12f371ff5aa412b7fec0340
Bill Yi [Thu, 27 Oct 2016 05:08:01 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
000e2093d2 -s ours
Change-Id: I9dc4dc4f9af82ecb8cd20acd3eb13021d25375dd
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 05:07:00 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c2effd95e2 -s ours
Change-Id: I982ed94bacbe316d1633fa30bb8b6b315ebf2354
Bill Yi [Thu, 27 Oct 2016 05:06:59 +0000 (05:06 +0000)]
Import translations. DO NOT MERGE
am:
644a22437f -s ours
Change-Id: I8204369580e5bb38a72570b175c066e903c2e9a9
Bill Yi [Thu, 27 Oct 2016 05:04:27 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
43905cc9ac -s ours
Change-Id: Ic4ffe5558fbb0baa525e76dbb14031c4d0cedde4
Bill Yi [Thu, 27 Oct 2016 05:04:25 +0000 (05:04 +0000)]
Import translations. DO NOT MERGE
am:
1377e2b985 -s ours
Change-Id: I33398bdb4166839276e72271097684fcd9e02655
Bill Yi [Thu, 27 Oct 2016 05:03:08 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ad45d97c45 -s ours
Change-Id: I3364c6eccecc274568d48f207c59be97ae78b1ce
Bill Yi [Thu, 27 Oct 2016 05:03:06 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE
am:
d1b8917270 -s ours
Change-Id: I6cf22433138b147581a2c055160e2610e0cfc2ce
TreeHugger Robot [Thu, 27 Oct 2016 05:01:32 +0000 (05:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:01:03 +0000 (05:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Thu, 27 Oct 2016 05:00:34 +0000 (05:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:00:15 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:59:53 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 27 Oct 2016 04:59:49 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours
am:
b9cc1f603c -s ours
Change-Id: I76607e7e8ecbdf03db23955402a626d89f144e31
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
TreeHugger Robot [Thu, 27 Oct 2016 04:58:33 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:56:58 +0000 (04:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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:33 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
696b0e4d9f -s ours
Change-Id: I807ae6a4f2808825e8363104e8e8661d5de77a2b
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
TreeHugger Robot [Thu, 27 Oct 2016 04:44:58 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-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
Bill Yi [Wed, 26 Oct 2016 23:42:29 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1a7cb9598cadefe20558f959a3bdfa1589e7652
Auto-generated-cl: translation import
Bill Yi [Wed, 26 Oct 2016 23:33:47 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia2d8f54a16000eea7175a78c25eb06cec1ad3dd4
Auto-generated-cl: translation import
Bill Yi [Wed, 26 Oct 2016 23:21:49 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5f9329d6be981207e939150ed924eaac5bd2180
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
Bill Yi [Wed, 26 Oct 2016 17:55:33 +0000 (10:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I70ad8db1fffca628251fbeaf6ef98882529a8210
Auto-generated-cl: translation import
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"
Bill Yi [Wed, 26 Oct 2016 17:47:09 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4b30fe6cf3449cc773ff6ce0e7a896b30248d2ec
Auto-generated-cl: translation import
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