Erik Kline
7fed2942ea
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a am: cdcc931d93
...
am: 62c1d307e3
Change-Id: I05da79d601d412270a71026bbbad3c516a785422
2016-12-15 12:35:13 +00:00
Erik Kline
62c1d307e3
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a
...
am: cdcc931d93
Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
2016-12-15 12:28:41 +00:00
Erik Kline
cdcc931d93
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
...
am: 80ff5ecd4a
Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
2016-12-15 12:22:06 +00:00
Erik Kline
80ff5ecd4a
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
2016-12-15 12:10:17 +00:00
Joachim Sauer
be12d9bfd3
Merge "API updated for ICU4J 58.1" am: 9e3b160fc3 am: d20aebb443
...
am: c066d73c32
Change-Id: Ie3f10df12dd96d9e002bdef017759c394aa3e780
2016-12-15 11:54:42 +00:00
Joachim Sauer
c066d73c32
Merge "API updated for ICU4J 58.1" am: 9e3b160fc3
...
am: d20aebb443
Change-Id: Ib3ddf7441306adca048e2ef5c6cda31bb2543df6
2016-12-15 11:39:37 +00:00
Joachim Sauer
d20aebb443
Merge "API updated for ICU4J 58.1"
...
am: 9e3b160fc3
Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
2016-12-15 11:24:52 +00:00
Joachim Sauer
9e3b160fc3
Merge "API updated for ICU4J 58.1"
2016-12-15 11:16:41 +00:00
Erik Kline
e1389b7084
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
...
am: c75ab85cd2
Change-Id: Ie343e7b86b970f2d934b964eebe924f74b0138d2
2016-12-15 10:13:48 +00:00
Erik Kline
eff558cd30
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
...
am: 473355f96b
Change-Id: Ie95309464d8f368f5040c74b59daba9700191e86
2016-12-15 10:13:36 +00:00
Erik Kline
ade3a8ccb0
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
...
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug: 21859053
Bug: 26101306
Bug: 31742572
Bug: 31707128
Bug: 33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
2016-12-15 19:09:49 +09:00
TreeHugger Robot
c75ab85cd2
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
2016-12-15 10:03:46 +00:00
Erik Kline
473355f96b
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
...
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug: 21859053
Bug: 26101306
Bug: 31742572
Bug: 31707128
Bug: 33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
2016-12-15 17:16:48 +09:00
Bill Yi
ea79b5e4b9
Import translations. DO NOT MERGE
...
am: 1e0cc808ab -s ours
Change-Id: I1d7db8246f0864af9e03f6dee3cf6206763b3301
2016-12-15 08:03:52 +00:00
Colin Cross
92a868ed53
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am: c2f9ae35e6 am: 4379639606
...
am: b9743aa650
Change-Id: Ib90a26ffe1b9af8cf83c8b1c1342aaa9f5e06752
2016-12-15 07:31:25 +00:00
Colin Cross
904b4077ca
Move hwui private headers to frameworks/base/libs/hwui/private am: 19def9943a am: 174d150673
...
am: 6b629b7f38
Change-Id: Ic62fcf3d48ad58c1dec0fc6ddf3eaacc8140cc18
2016-12-15 07:30:25 +00:00
Colin Cross
fe9ffc29ff
Convert libstorage to Android.bp am: 3ac2be93a9 am: f12ae4bed7
...
am: 791d02818a
Change-Id: I73bb8a7332a6ba9aebf413cf9f0889ff9d98a5de
2016-12-15 07:29:24 +00:00
Colin Cross
e6120caf2a
Move libstorage includes into frameworks/base/lib/storage am: e78f853e46 am: afef87b1ba
...
am: f142640afb
Change-Id: I9f084034f960478ee6141158a0a0c5119d1879a4
2016-12-15 07:28:24 +00:00
Colin Cross
b9743aa650
Merge changes I4968d5aa,Ieb34d79a,Idc073536 am: c2f9ae35e6
...
am: 4379639606
Change-Id: I1d29954997012b2ac435dab96486175a40cd65a8
2016-12-15 07:18:02 +00:00
Colin Cross
6b629b7f38
Move hwui private headers to frameworks/base/libs/hwui/private am: 19def9943a
...
am: 174d150673
Change-Id: I0d97c3bc96c0beebc5988e4dca22ba4d5d1f982c
2016-12-15 07:16:31 +00:00
Colin Cross
791d02818a
Convert libstorage to Android.bp am: 3ac2be93a9
...
am: f12ae4bed7
Change-Id: I1255ee2b166b73a79b19035d59994204bb268c82
2016-12-15 07:15:32 +00:00
Colin Cross
f142640afb
Move libstorage includes into frameworks/base/lib/storage am: e78f853e46
...
am: afef87b1ba
Change-Id: Iff9c41710528af37a788973ac4a1080024808c95
2016-12-15 07:14:32 +00:00
Colin Cross
4379639606
Merge changes I4968d5aa,Ieb34d79a,Idc073536
...
am: c2f9ae35e6
Change-Id: Icd7cc5949d1388a5f928561dc0eea8a7df91b1b9
2016-12-15 07:01:01 +00:00
Colin Cross
174d150673
Move hwui private headers to frameworks/base/libs/hwui/private
...
am: 19def9943a
Change-Id: Ic26ef842f58a9db61e7ee12b3d4d858fc24cfbc8
2016-12-15 07:00:54 +00:00
Colin Cross
f12ae4bed7
Convert libstorage to Android.bp
...
am: 3ac2be93a9
Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
2016-12-15 07:00:07 +00:00
Colin Cross
afef87b1ba
Move libstorage includes into frameworks/base/lib/storage
...
am: e78f853e46
Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
2016-12-15 06:59:18 +00:00
Treehugger Robot
c2f9ae35e6
Merge changes I4968d5aa,Ieb34d79a,Idc073536
...
* changes:
Move hwui private headers to frameworks/base/libs/hwui/private
Convert libstorage to Android.bp
Move libstorage includes into frameworks/base/lib/storage
2016-12-15 06:49:35 +00:00
Erik Kline
579c86f622
Merge "More correct startup and shutdown procedures." am: 618d4215a2 am: b6588f9a41
...
am: 7074b562d9
Change-Id: I8c1e0b235808635a910262a65530e655408cc5d8
2016-12-15 05:40:17 +00:00
Erik Kline
7074b562d9
Merge "More correct startup and shutdown procedures." am: 618d4215a2
...
am: b6588f9a41
Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
2016-12-15 05:32:50 +00:00
Erik Kline
b6588f9a41
Merge "More correct startup and shutdown procedures."
...
am: 618d4215a2
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
2016-12-15 05:25:48 +00:00
Treehugger Robot
618d4215a2
Merge "More correct startup and shutdown procedures."
2016-12-15 05:10:11 +00:00
Bill Yi
1e0cc808ab
Import translations. DO NOT MERGE
...
Change-Id: I5a8c801eacef878f41a988ed655e6fa367909033
Auto-generated-cl: translation import
2016-12-14 18:56:18 -08:00
Erik Kline
c8585b9742
More correct startup and shutdown procedures.
...
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.
During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.
Test: backport from internal
Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
2016-12-15 10:43:41 +09:00
George Burgess IV
9dfed40bd8
Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9
...
am: 85785b557a
Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb
2016-12-14 23:49:07 +00:00
George Burgess IV
85785b557a
Merge "Fix a memory leak." am: 1715678a89
...
am: 8f9c005fa9
Change-Id: I29afa8d1394feb57574ed527cda102405571fd65
2016-12-14 23:41:26 +00:00
George Burgess IV
8f9c005fa9
Merge "Fix a memory leak."
...
am: 1715678a89
Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672
2016-12-14 23:34:23 +00:00
Hall Liu
9e0f5d1abf
Merge "Add ability to set supported audio routes on phone accounts and connection" am: d11261dcc9 am: 32e98d2f45
...
am: 60cb82e8e6
Change-Id: I9bfe58895aadcd5c40bae1bfc7a093feee4a6aa2
2016-12-14 23:30:01 +00:00
Jeremy Joslin
9f15b30858
Merge "Add an IPC for requesting network scores." am: e89ed4a001 am: 724b26c902
...
am: a00fda5311
Change-Id: I5b529ba1f9a151e108229c493cbdc0facd494d30
2016-12-14 23:28:56 +00:00
Marie Janssen
2f94877c01
resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp
...
am: f2fc15824d
Change-Id: I71d80c8a24f206d5919f56a28b1f1333021b7d46
2016-12-14 23:27:54 +00:00
Treehugger Robot
1715678a89
Merge "Fix a memory leak."
2016-12-14 23:23:52 +00:00
Hall Liu
60cb82e8e6
Merge "Add ability to set supported audio routes on phone accounts and connection" am: d11261dcc9
...
am: 32e98d2f45
Change-Id: I0741edc2b35b7c57cbde338c4617791d1d089137
2016-12-14 23:23:21 +00:00
Jeremy Joslin
a00fda5311
Merge "Add an IPC for requesting network scores." am: e89ed4a001
...
am: 724b26c902
Change-Id: If6284c934cd47257367c614523d4928758ab34e1
2016-12-14 23:22:15 +00:00
Marie Janssen
f2fc15824d
resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp
...
Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71
2016-12-14 13:44:28 -08:00
Colin Cross
19def9943a
Move hwui private headers to frameworks/base/libs/hwui/private
...
hwui already exports most of its headers, move its private headers
into its source directory.
Bug: 33630870
Test: m -j native
Change-Id: I4968d5aaaa68d9e92c826841d20f29cef349c9d8
2016-12-14 13:35:40 -08:00
Colin Cross
3ac2be93a9
Convert libstorage to Android.bp
...
See build/soong/README.md for more information.
Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
2016-12-14 13:28:56 -08:00
Colin Cross
e78f853e46
Move libstorage includes into frameworks/base/lib/storage
...
Move the libstorage includes out of the global include path and into
frameworks/base/lib/storage/include, and export it.
Bug: 33630870
Test: m -j native
Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1
2016-12-14 13:28:46 -08:00
Hall Liu
32e98d2f45
Merge "Add ability to set supported audio routes on phone accounts and connection"
...
am: d11261dcc9
Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
2016-12-14 20:03:54 +00:00
Jeremy Joslin
724b26c902
Merge "Add an IPC for requesting network scores."
...
am: e89ed4a001
Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
2016-12-14 20:02:45 +00:00
Marie Janssen
7a2518ee6e
Merge "Bluetooth: log message improvements"
...
am: f34bdf7676
Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
2016-12-14 20:01:39 +00:00
Hall Liu
d11261dcc9
Merge "Add ability to set supported audio routes on phone accounts and connection"
2016-12-14 19:55:00 +00:00