OSDN Git Service
Andreas Gampe [Tue, 21 Mar 2017 18:58:27 +0000 (18:58 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit" am:
1ae7af10ff
am:
1d9c3ba10d
Change-Id: Ia9b6111705486d7da69ef2436d03cd19272502b6
Andreas Gampe [Tue, 21 Mar 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
am:
1ae7af10ff
Change-Id: Ia1ffb03d6e03b098cc634ef2deb3785c6bb87202
Jakub Pawlowski [Tue, 21 Mar 2017 18:52:03 +0000 (18:52 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)" am:
7f14b8f095
am:
8d06b41826
Change-Id: I8cc220bd494841841f89eeba840ce71b1c2a0692
Jakub Pawlowski [Tue, 21 Mar 2017 18:50:51 +0000 (18:50 +0000)]
Merge "Add missing txPower parameter" am:
a6c1f6def1
am:
43f71975d0
Change-Id: If6dbc369985eaf18db9c8fd0670683768d613406
Andreas Gampe [Tue, 21 Mar 2017 18:45:00 +0000 (18:45 +0000)]
Merge "Zygote: Preserve capabilities in WrapperInit"
Jakub Pawlowski [Tue, 21 Mar 2017 18:44:36 +0000 (18:44 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"
am:
7f14b8f095
Change-Id: I26846383be5c0fe88501ffd1011b27f39896a74a
Jakub Pawlowski [Tue, 21 Mar 2017 18:43:21 +0000 (18:43 +0000)]
Merge "Add missing txPower parameter"
am:
a6c1f6def1
Change-Id: I61ac50f7f2a5d3d3ea2a3e23b441fa22bb69f52a
Jakub Pawlowski [Tue, 21 Mar 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (1/2)"
Jakub Pawlowski [Mon, 20 Mar 2017 22:57:46 +0000 (15:57 -0700)]
Add setScannable to AdvertisingSetParameters (1/2)
There must be a proper way to specify if advertisment is scannable, when
updating the parameters.
Test: manual
Bug:
30622771
Change-Id: Ie520609d3fff07ccc2960015c19311d773842852
Jakub Pawlowski [Tue, 21 Mar 2017 18:36:14 +0000 (18:36 +0000)]
Merge "Add missing txPower parameter"
Jakub Pawlowski [Tue, 21 Mar 2017 00:02:20 +0000 (17:02 -0700)]
Add missing txPower parameter
Test: manual
Bug:
30622771
Change-Id: Iaf3111d7545f9bb046b5a23b680347a75125ca7e
Joachim Sauer [Tue, 21 Mar 2017 18:28:16 +0000 (18:28 +0000)]
Merge "Update to 2017a." am:
2ca0abc8de
am:
eeca6add23
Change-Id: I7dd23af7452ed9836fb26dad0d7774ce9aef1c36
Joachim Sauer [Tue, 21 Mar 2017 18:22:44 +0000 (18:22 +0000)]
Merge "Update to 2017a."
am:
2ca0abc8de
Change-Id: I0a6dd7f5cef6f7f3634413d012c8f1c84c807aac
Treehugger Robot [Tue, 21 Mar 2017 18:09:33 +0000 (18:09 +0000)]
Merge "Update to 2017a."
Andreas Gampe [Mon, 13 Mar 2017 21:36:09 +0000 (14:36 -0700)]
Zygote: Preserve capabilities in WrapperInit
Preserve the capabilities a zygote fork has across the sh exec in
WrapperInit. Use ambient capabilities.
Test: m
Test: adb shell setprop wrap.com.android.bluetooth logwrapper && adb shell kill `pid com.android.bluetooth`
Merged-In: I3526d6a31aaadf082365c9ce31da0950e17677eb
Change-Id: I3526d6a31aaadf082365c9ce31da0950e17677eb
Joachim Sauer [Tue, 21 Mar 2017 12:39:26 +0000 (12:39 +0000)]
Update to 2017a.
This commit adds America/Punta_Arenas to time_zones_by_country.xml to
allow it to automatically be picked based on cell network information.
Bug:
35861784
Test: builds & boots & automatic timezone detection still works
Change-Id: I1bfa327fbb58f82eb951028e288fad819bf0f231
Erik Kline [Tue, 21 Mar 2017 10:22:21 +0000 (10:22 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()" am:
9eb959320f
am:
9e46faff07
Change-Id: I227d8bcd27ae2970ee65d6cc83faa37ff4e4f17a
Erik Kline [Tue, 21 Mar 2017 10:14:19 +0000 (10:14 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
am:
9eb959320f
Change-Id: I29c80b36ddd14e1e03c88c63d35ee9982dcef887
Treehugger Robot [Tue, 21 Mar 2017 10:05:41 +0000 (10:05 +0000)]
Merge "add and incorporate TetheringConfiguration.dump()"
Jack Yu [Tue, 21 Mar 2017 09:26:51 +0000 (09:26 +0000)]
Merge "Added ETWS primary message default message support" am:
2d3fb48b39
am:
dfe1743b37
Change-Id: I71a1be66cb84ed8030df4ab9d406c390872f5346
Jack Yu [Tue, 21 Mar 2017 09:20:17 +0000 (09:20 +0000)]
Merge "Added ETWS primary message default message support"
am:
2d3fb48b39
Change-Id: Ib03378e2f9c2da53b5efbedde08b20acc0b8c199
Treehugger Robot [Tue, 21 Mar 2017 09:11:44 +0000 (09:11 +0000)]
Merge "Added ETWS primary message default message support"
Jack Yu [Sat, 18 Mar 2017 06:21:48 +0000 (23:21 -0700)]
Added ETWS primary message default message support
ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.
Test: manual
bug:
33595007
Merged-In: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Change-Id: I53659298d8ce3b3ba5c751c14c1b36e76d6dc562
Jeremy Klein [Tue, 21 Mar 2017 00:04:11 +0000 (00:04 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system." am:
4a8953094f
am:
23d6ba12f1
Change-Id: I35f45927c564773c10da78e1476814f0a1c7f1be
Jeremy Klein [Mon, 20 Mar 2017 23:58:09 +0000 (23:58 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
am:
4a8953094f
Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8
Jeremy Klein [Mon, 20 Mar 2017 23:50:57 +0000 (23:50 +0000)]
Merge "In isTetheringSupported, call isAdmin user from system."
Jakub Pawlowski [Mon, 20 Mar 2017 22:33:09 +0000 (22:33 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
f0c963a5b6
am:
375741e99a
Change-Id: Ieb03aed00cee20c367f52aa8ea1b1fd02a6fbbac
Jakub Pawlowski [Mon, 20 Mar 2017 22:26:42 +0000 (22:26 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am:
f0c963a5b6
Change-Id: Ia401ccf8935b8cb315849803c5c82d1d7dd64b81
Jakub Pawlowski [Mon, 20 Mar 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Jeremy Klein [Fri, 17 Mar 2017 21:30:02 +0000 (14:30 -0700)]
In isTetheringSupported, call isAdmin user from system.
This avoids requiring the MANAGE_USERS permission in this function.
Bug:
32671528
Test: Manual. Also seeking unit test guidance from reviewer.
Change-Id: I841e721013b0e4b6db34d629a1e97b3cd54cd73b
Jerry Zhang [Mon, 20 Mar 2017 21:46:01 +0000 (21:46 +0000)]
Merge "Add support for MTP perceived device type property." am:
b6ed343e85
am:
7644b885c7
Change-Id: If09ce7609ff999c7dc32d7cc5db4917eae50748c
Jerry Zhang [Mon, 20 Mar 2017 21:39:17 +0000 (21:39 +0000)]
Merge "Add support for MTP perceived device type property."
am:
b6ed343e85
Change-Id: I58417625aa6c669eb82af3a11a4e35c77952f539
Treehugger Robot [Mon, 20 Mar 2017 21:23:10 +0000 (21:23 +0000)]
Merge "Add support for MTP perceived device type property."
Jakub Pawlowski [Fri, 17 Mar 2017 22:33:27 +0000 (15:33 -0700)]
Bluetooth 5 AdvertisingSet implementation (1/4)
Test: manual
Bug:
30622771
Change-Id: Ia89718c0c2ab2eaa71b158ecdcae989af907769f
Su, Weihua [Mon, 20 Mar 2017 17:18:40 +0000 (17:18 +0000)]
Merge "Fix crash issue on Storage Manager app" am:
cb4a3c55cf
am:
69be98ae52
Change-Id: Iaa7f97df590cbf93e1d5c942dae5f3be55988f11
Su, Weihua [Mon, 20 Mar 2017 17:12:40 +0000 (17:12 +0000)]
Merge "Fix crash issue on Storage Manager app"
am:
cb4a3c55cf
Change-Id: If33e23972770c50cf83a42d8621d31b15b945524
Ryuki Nakamura [Mon, 20 Mar 2017 17:12:39 +0000 (17:12 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am:
a6ce3f3021
am:
900620cffc
Change-Id: I730e7c550b88325a418c419340e6f98080f89969
Treehugger Robot [Mon, 20 Mar 2017 17:05:18 +0000 (17:05 +0000)]
Merge "Fix crash issue on Storage Manager app"
Ryuki Nakamura [Mon, 20 Mar 2017 17:05:16 +0000 (17:05 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
am:
a6ce3f3021
Change-Id: I3f43b25622e5052e6336983da84b92e12f3e06dc
Treehugger Robot [Mon, 20 Mar 2017 16:54:35 +0000 (16:54 +0000)]
Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
Narayan Kamath [Mon, 20 Mar 2017 11:04:17 +0000 (11:04 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation." am:
5d3f14fe02
am:
088df2bd0a
Change-Id: I0af6c22b2c7418553a70d49f9d67393b51abd37f
Narayan Kamath [Mon, 20 Mar 2017 10:57:52 +0000 (10:57 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation."
am:
5d3f14fe02
Change-Id: If425a64fe7820579045dfa40b356792f24d0de43
Narayan Kamath [Mon, 20 Mar 2017 10:49:16 +0000 (10:49 +0000)]
Merge "TelephonyManager: Avoid unnecessary object allocation."
fionaxu [Fri, 17 Mar 2017 23:44:09 +0000 (23:44 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am:
7f8d27f84b
am:
4aadda1902
Change-Id: I5c01a75cbb65b8374548c18c5139f9d892e14f49
fionaxu [Fri, 17 Mar 2017 23:34:49 +0000 (23:34 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
am:
7f8d27f84b
Change-Id: Ia1216368a2a2a4959283d95bbc4be26789f151f6
Treehugger Robot [Fri, 17 Mar 2017 23:24:28 +0000 (23:24 +0000)]
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
Andreas Gampe [Fri, 17 Mar 2017 22:53:33 +0000 (22:53 +0000)]
Merge "Ota: Add command logging" am:
9a8d78dc86
am:
8dd991a7ef
Change-Id: I7a5061a98c33abbae787a42079c41263dbcdc7cb
Andreas Gampe [Fri, 17 Mar 2017 22:45:34 +0000 (22:45 +0000)]
Merge "Ota: Add command logging"
am:
9a8d78dc86
Change-Id: I48b887a26c8f8123c112559da0f74112bb703b1c
Jakub Pawlowski [Fri, 17 Mar 2017 22:41:00 +0000 (22:41 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)" am:
d9f2f67a5f
am:
07d79aa3b0
Change-Id: I5f75034690784dd06d54345e60107ab7049e4da7
Treehugger Robot [Fri, 17 Mar 2017 22:35:47 +0000 (22:35 +0000)]
Merge "Ota: Add command logging"
Jakub Pawlowski [Fri, 17 Mar 2017 22:34:24 +0000 (22:34 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
am:
d9f2f67a5f
Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:34:01 +0000 (22:34 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
9aa841d254
am:
4992b1533e
Change-Id: I00c97934ad59e996844831ee23ace60813d3ce0c
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:27:11 +0000 (22:27 +0000)]
Merge "Add new precise call fail causes and OEM causes"
am:
9aa841d254
Change-Id: I2b52c9c332fc73a37ac2c4c492ac9b85b2025897
Jakub Pawlowski [Fri, 17 Mar 2017 22:24:04 +0000 (22:24 +0000)]
Merge "Bluetooth 5 move timeout parameter (1/2)"
Jakub Pawlowski [Fri, 17 Mar 2017 18:12:15 +0000 (11:12 -0700)]
Bluetooth 5 move timeout parameter (1/2)
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.
Test: manual
Bug:
30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add new precise call fail causes and OEM causes"
Peter Qiu [Fri, 17 Mar 2017 22:16:22 +0000 (22:16 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration" am:
5bd337397b
am:
8951172562
Change-Id: I3799156a83400d9fa1aa07a4afd935bd9c0f683b
Peter Qiu [Fri, 17 Mar 2017 22:08:21 +0000 (22:08 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
am:
5bd337397b
Change-Id: I8db5f02e6c6ab6b03de5ae3cff39619f85963e9b
Treehugger Robot [Fri, 17 Mar 2017 21:57:15 +0000 (21:57 +0000)]
Merge "hotspot2: implement toString for PasspointConfiguration"
fionaxu [Fri, 17 Mar 2017 21:35:39 +0000 (14:35 -0700)]
remove deprecated SIM_ACTIVATION_REQUEST intent
This deprecated intent voilates intent naming conventions as defined in CDD.
Bug:
35271104
Test: Manual
Change-Id: Ic7f251a6471de31e17960d612e108203983ce32d
Andreas Gampe [Fri, 17 Mar 2017 20:59:08 +0000 (13:59 -0700)]
Ota: Add command logging
Log the next command.
Bug:
25612095
Test: m
Change-Id: I284a2fb3e329afcb0b03f7162585b0eefe13eb0e
Peter Qiu [Fri, 17 Mar 2017 16:39:11 +0000 (09:39 -0700)]
hotspot2: implement toString for PasspointConfiguration
Bug:
35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
Roshan Pius [Fri, 17 Mar 2017 17:34:10 +0000 (17:34 +0000)]
Merge "WifiConfiguration: Correct documentation for priority" am:
f5fa26bf25
am:
da34226f06
Change-Id: I4b01b13b9628a06040db3a49c2e7769b837cadf6
Roshan Pius [Fri, 17 Mar 2017 17:33:06 +0000 (17:33 +0000)]
Merge "WifiConfiguration: Update psk documentation" am:
89c79ff632
am:
6b6f1b9e12
Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
Roshan Pius [Fri, 17 Mar 2017 17:28:13 +0000 (17:28 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
am:
f5fa26bf25
Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
Roshan Pius [Fri, 17 Mar 2017 17:26:57 +0000 (17:26 +0000)]
Merge "WifiConfiguration: Update psk documentation"
am:
89c79ff632
Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
Treehugger Robot [Fri, 17 Mar 2017 17:18:31 +0000 (17:18 +0000)]
Merge "WifiConfiguration: Correct documentation for priority"
Treehugger Robot [Fri, 17 Mar 2017 17:17:50 +0000 (17:17 +0000)]
Merge "WifiConfiguration: Update psk documentation"
Roshan Pius [Thu, 16 Mar 2017 18:07:07 +0000 (11:07 -0700)]
WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.
Bug:
35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
Neil Fuller [Fri, 17 Mar 2017 15:44:05 +0000 (15:44 +0000)]
Merge "Track library change in libcore." am:
ed9c176e16
am:
301f1d3645
Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
Roshan Pius [Thu, 16 Mar 2017 17:59:58 +0000 (10:59 -0700)]
WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.
Bug:
35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
Neil Fuller [Fri, 17 Mar 2017 15:38:01 +0000 (15:38 +0000)]
Merge "Track library change in libcore."
am:
ed9c176e16
Change-Id: Iae6166cf055625947589b3a14b72ed7828738311
Treehugger Robot [Fri, 17 Mar 2017 15:28:35 +0000 (15:28 +0000)]
Merge "Track library change in libcore."
liangweikang [Fri, 17 Mar 2017 14:57:55 +0000 (14:57 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java" am:
c14d5db093
am:
79e9f380e2
Change-Id: Ic9356edc395f68c5dda5a19a2efca31b5f16a068
liangweikang [Fri, 17 Mar 2017 14:51:58 +0000 (14:51 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java"
am:
c14d5db093
Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154
Treehugger Robot [Fri, 17 Mar 2017 14:43:20 +0000 (14:43 +0000)]
Merge "[BUG] fix NullPointerException in Notification.java"
Neil Fuller [Wed, 22 Feb 2017 18:29:47 +0000 (18:29 +0000)]
Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.
Bug:
31008728
Test: make
Merged-In: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Change-Id: I40b725a97ae2bc258b1fd4b2312b6c60ff83fe64
Narayan Kamath [Fri, 17 Mar 2017 10:28:54 +0000 (10:28 +0000)]
TelephonyManager: Avoid unnecessary object allocation.
No need to use a boxed type - the value is being passed to a function
that takes a boolean.
Test: make
Change-Id: Id6d5c581dd6e3a1832d3419a2fbec92e97c4240d
Narayan Kamath [Fri, 17 Mar 2017 09:58:12 +0000 (09:58 +0000)]
Merge "fd_utils: address a couple of TODOs." am:
eae1ae9732
am:
a34d01d1ee
Change-Id: I167e56d78a5a1ef6c2f1bcad891d5f20f4e07375
Narayan Kamath [Fri, 17 Mar 2017 09:51:35 +0000 (09:51 +0000)]
Merge "fd_utils: address a couple of TODOs."
am:
eae1ae9732
Change-Id: I8e4e92df3c1f0016de2c396345b7a0b4bc0e1cb6
Narayan Kamath [Fri, 17 Mar 2017 09:44:11 +0000 (09:44 +0000)]
Merge "fd_utils: address a couple of TODOs."
Narayan Kamath [Thu, 2 Mar 2017 17:30:03 +0000 (17:30 +0000)]
fd_utils: address a couple of TODOs.
Drink the android::base koolaid.
Test: make, boots
Change-Id: Ib24b9b59fa3490e80ba78be0199eafa676225b73
Jakub Pawlowski [Fri, 17 Mar 2017 05:26:26 +0000 (05:26 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)" am:
74f2e1a303
am:
2fc3834f4d
Change-Id: Iad555280f5d702c63c76a2399c8d02ac39749a77
Jakub Pawlowski [Fri, 17 Mar 2017 05:19:57 +0000 (05:19 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
am:
74f2e1a303
Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a
Jakub Pawlowski [Fri, 17 Mar 2017 05:13:44 +0000 (05:13 +0000)]
Merge "LE Maximum Advertising Data Length (1/4)"
liangweikang [Thu, 16 Mar 2017 11:22:15 +0000 (19:22 +0800)]
[BUG] fix NullPointerException in Notification.java
https://code.google.com/p/android/issues/detail?id=252835
Test: null
Change-Id: I6c575686c75b02ac938f35622b522fff25403c29
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Joel Scherpelz [Fri, 17 Mar 2017 02:59:11 +0000 (02:59 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am:
52f8421b77
am:
b8933942fc
Change-Id: Ic1b6226da3cfb68eeb352c1f81df09733ab52e4d
Joel Scherpelz [Fri, 17 Mar 2017 02:53:11 +0000 (02:53 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
am:
52f8421b77
Change-Id: I5b5d5460f9fe7ed228ab32b2c63cb601be5e1edb
Treehugger Robot [Fri, 17 Mar 2017 02:44:07 +0000 (02:44 +0000)]
Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
Jakub Pawlowski [Fri, 17 Mar 2017 01:22:36 +0000 (18:22 -0700)]
LE Maximum Advertising Data Length (1/4)
Add ability to check maximum advertising data length.
Bug:
30622771
Test: manual
Change-Id: I281f7e9f294c40a47a67a22809cc753b6693f7c4
Jakub Pawlowski [Fri, 17 Mar 2017 01:15:08 +0000 (01:15 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am:
15e69df921
am:
45e0c6ea7f
Change-Id: I6975c6629e8c4a7be20f355fdeaba268b33396a2
Jakub Pawlowski [Fri, 17 Mar 2017 01:09:02 +0000 (01:09 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am:
15e69df921
Change-Id: I585fc900b4a153744116fa87764db98b038184d5
Treehugger Robot [Fri, 17 Mar 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
Joel Scherpelz [Wed, 15 Mar 2017 06:32:33 +0000 (15:32 +0900)]
Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces
This patch tries to change accept_ra_rt_info_max_plen to 64 from its
default value of 0 on kernels that support router advertisements with
route information options. The code fails silently on older unsupported
platforms.
Also factor existing startIPv6() code into a self documenting function
enableInterfaceIpv6PrivacyExtensions()
Bug:
33333670
Test: as follows
- build sailfish
- flashed
- booted
- runtest frameworks-net passes
- runtest frameworks-wifi passes
Change-Id: I10ec83b9e04836089477d74417b7222499820066
Jack He [Fri, 17 Mar 2017 00:14:57 +0000 (00:14 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable" am:
41f5b61f5d
am:
592d78238d
Change-Id: I47b79c0113f3452df40325df4d96952aa1c7d835
Jack He [Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable"
am:
41f5b61f5d
Change-Id: I25931f4ed056f6990c6ecb2d9f6629d89610c072
Treehugger Robot [Fri, 17 Mar 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Add a flag that indicates whether in-band ringing is avalable"
Android Build Merger (Role) [Thu, 16 Mar 2017 23:41:29 +0000 (23:41 +0000)]
Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am:
2d87679a11 am:
1228b6cdec" into nyc-mr2-dev-plus-aosp
Andrew Zeng [Thu, 16 Mar 2017 23:40:09 +0000 (23:40 +0000)]
Merge "Fix NPE in LockSettingsService." into cw-f-dev am:
4aff3d53ef
am:
a01e2212c8
Change-Id: Id333403e3a989e233a97760b716055b3abd186d6
Peter Qiu [Thu, 16 Mar 2017 23:39:52 +0000 (23:39 +0000)]
Merge "wifi: add a flag indicating legacy Passpoint configuration" am:
2d87679a11
am:
1228b6cdec
Change-Id: Ifc293108dfdfb503ab7596da657e9768a8fea25d
OSDN Git Service
