OSDN Git Service
tony.ys_liu [Thu, 16 Mar 2017 15:42:53 +0000 (15:42 +0000)]
Merge "Set system server's class loader for wrap.system_server"
am:
8d2d6bfa12
Change-Id: Iba4af152c9f29ad6e8c9bb1b0a1047e96d287c6b
Treehugger Robot [Thu, 16 Mar 2017 15:33:32 +0000 (15:33 +0000)]
Merge "Set system server's class loader for wrap.system_server"
Elliott Hughes [Thu, 16 Mar 2017 05:40:47 +0000 (05:40 +0000)]
Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."
am:
ef9c425416
Change-Id: I0ea94267a6d6cfa137e77edde288632d04a71bcd
Elliott Hughes [Thu, 16 Mar 2017 05:31:23 +0000 (05:31 +0000)]
Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running."
Sooraj Sasindran [Thu, 16 Mar 2017 03:19:37 +0000 (03:19 +0000)]
Merge "Support Signal strength offset"
am:
98d499877f
Change-Id: I3087c3f8d6f975f399dfcf8aa8dd734f78caf69f
Sooraj Sasindran [Thu, 16 Mar 2017 03:13:29 +0000 (03:13 +0000)]
Merge "Support Signal strength offset"
Erik Kline [Thu, 16 Mar 2017 02:49:36 +0000 (02:49 +0000)]
Merge "Add blocking and retrying wrappers for INetd uses."
am:
ba8c613e16
Change-Id: Iae8ea51852ed6991e3b9ed89297c8a932b9224f3
Treehugger Robot [Thu, 16 Mar 2017 02:42:15 +0000 (02:42 +0000)]
Merge "Add blocking and retrying wrappers for INetd uses."
Chen Xu [Thu, 16 Mar 2017 00:02:28 +0000 (00:02 +0000)]
Merge "integrate portal webview to the default app"
am:
e3ece71f2e
Change-Id: I3c46e8bd47d087701b3c643e59bc9e373dab00bb
Chen Xu [Wed, 15 Mar 2017 23:52:52 +0000 (23:52 +0000)]
Merge "integrate portal webview to the default app"
tony.ys_liu [Wed, 14 Dec 2016 10:50:29 +0000 (18:50 +0800)]
Set system server's class loader for wrap.system_server
Root Cause: systemServer's class path is not set
after set wrap.system_server property, and restart system_server,
it shows a java.lang.RuntimeException:
Missing class when invoking static main com.android.server.SystemServer
Solution: Correctly pass and parse a passed classpath.
Bug:
34692265
Test: adb root && adb shell stop && adb shell setprop wrap.system_server logwrapper && adb shell start
Change-Id: Ia6707dc05fa627af6cc28360d26b894487a6eff1
Sooraj Sasindran [Thu, 9 Mar 2017 07:43:17 +0000 (23:43 -0800)]
Support Signal strength offset
Support feature to offset LTE rsrp
for higher freaquency lte bands.
Test: Verified on device that signal bars increased
Bug=
30628343
Merged-In: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
Change-Id: Id0b54901a1e8832fb48ba509e6a380c43f4c9497
fionaxu [Fri, 10 Mar 2017 18:16:09 +0000 (10:16 -0800)]
integrate portal webview to the default app
Based on the UX review feedback, we plan to implement portal webview
function inside the carrier default app instead of reusing the existing
portal app. This will give us more flexibility and control, also will
improve UX flow by getting rid of the some unwanted dialogues.
new added CaptivePortalLoginActivity is a copy paste from
com.android.captiveportallogin/CaptivePortalLoginActivity combined
with logic from deleted LaunchCaptivePortalActivity.
All webview UI was inherited from com.android.captiveportal
Test: Manual
Bug:
36002256
Merged-in: I2627d5a43039ce433006c058bb4f2c1a39113e59
Change-Id: If422fa12c5f24d9b9e2c9380b3edf94df74bb85f
Roshan Pius [Wed, 15 Mar 2017 20:43:52 +0000 (20:43 +0000)]
Merge "WiFi: Wifi service get configured networks use ParceledListSlice."
am:
8b549c9539
Change-Id: I9ccfbfcf17590284aedd4449022b107c37e5aef2
Roshan Pius [Wed, 15 Mar 2017 20:34:33 +0000 (20:34 +0000)]
Merge "WiFi: Wifi service get configured networks use ParceledListSlice."
Andreas Gampe [Wed, 15 Mar 2017 20:06:36 +0000 (20:06 +0000)]
Merge "PackageManagerService: Fix ABI adjustment logging"
am:
844be62eef
Change-Id: I35f0affaef73033c37798eba41dfc1b992187176
Elliott Hughes [Wed, 15 Mar 2017 20:01:53 +0000 (13:01 -0700)]
Restore SystemProperties.PROP_NAME_MAX to keep Kindle running.
The limit has been lifted in O, but without this constant, Kindle crashes here:
Caused by: java.lang.NoSuchFieldException: PROP_NAME_MAX
at java.lang.Class.getField(Class.java:1607)
at com.amazon.android.webkit.AmazonWebKitFactories$Implementation.<clinit>(AmazonWebKitFactories.java:59)
The code seems to want to truncate a system property name to avoid the
exception that SystemProperty.get threw if passed a name that was too long.
Bug: http://b/
36095274
Test: select a word in Kindle
Change-Id: Id1881a8a7c6386400a1024beb0d1b741bdaefba7
Treehugger Robot [Wed, 15 Mar 2017 19:54:09 +0000 (19:54 +0000)]
Merge "PackageManagerService: Fix ABI adjustment logging"
Andreas Gampe [Wed, 15 Mar 2017 17:09:57 +0000 (10:09 -0700)]
PackageManagerService: Fix ABI adjustment logging
Fix logging of "Adjusting ABI" to be tolerant to null
packages.
Bug:
36172429
Test: m
Test: manual
Change-Id: Ic6b9a8e09e58dce6be97e464fe3986c709f820de
Joachim Sauer [Wed, 15 Mar 2017 11:57:28 +0000 (11:57 +0000)]
Merge "Change Czech Republic to Czechia"
am:
027a67062e
Change-Id: I51fc6fde5647b1fd8ecc677da7f6ec7a248a3b38
Treehugger Robot [Wed, 15 Mar 2017 11:45:43 +0000 (11:45 +0000)]
Merge "Change Czech Republic to Czechia"
Erik Kline [Tue, 14 Mar 2017 08:40:00 +0000 (17:40 +0900)]
Add blocking and retrying wrappers for INetd uses.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Change-Id: I1a8e15149bf9dbedc6a09c0d8ab6abb2ef4f8fee
Erik Kline [Wed, 15 Mar 2017 02:38:51 +0000 (02:38 +0000)]
Merge "Add comment with packet tracker debugging tip"
am:
40aa5ee583
Change-Id: I0f5f139f81af23ddc33e37ddf489a477e37c394f
Treehugger Robot [Wed, 15 Mar 2017 02:28:06 +0000 (02:28 +0000)]
Merge "Add comment with packet tracker debugging tip"
Peter Qiu [Tue, 14 Mar 2017 23:07:28 +0000 (23:07 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
am:
6493f3df6b
Change-Id: I40fc13a08425f2ada7e648342db92d83c4d59cba
Treehugger Robot [Tue, 14 Mar 2017 22:45:56 +0000 (22:45 +0000)]
Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
Svetoslav Ganov [Tue, 14 Mar 2017 19:07:22 +0000 (19:07 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"
am:
14c7e67da8
Change-Id: Icfa9fc501806820545dd9df9d671fcdfe645b73f
Svetoslav Ganov [Tue, 14 Mar 2017 18:58:28 +0000 (18:58 +0000)]
Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"
Peter Qiu [Tue, 14 Mar 2017 16:24:11 +0000 (16:24 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
am:
5df03b3d74
Change-Id: Ic1822a3203da5522a5a103c34fb45a6498cd6428
Peter Qiu [Tue, 14 Mar 2017 16:22:28 +0000 (16:22 +0000)]
hotspot2: hide validate method for Passpoint configuration
am:
b5ca6f36b5
Change-Id: I268b0db6c844ec1746b6374c87768f233b719b3f
Peter Qiu [Tue, 14 Mar 2017 16:21:06 +0000 (16:21 +0000)]
Osu: temporarily comment out the usage of deprecated intent definitions
am:
06b63dcb9f
Change-Id: I6c418dbecc72ac5c4e245fff06fabfe23b443c23
Peter Qiu [Tue, 14 Mar 2017 16:19:19 +0000 (16:19 +0000)]
hotspot2: update Passpoint intent definitions
am:
5679145d9a
Change-Id: I4e59efbcd9a9d33ceac8cc359155770c2de5a0fd
Treehugger Robot [Tue, 14 Mar 2017 16:07:46 +0000 (16:07 +0000)]
Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
* changes:
hotspot2: update Passpoint configuration management APIs
hotspot2: hide validate method for Passpoint configuration
Osu: temporarily comment out the usage of deprecated intent definitions
hotspot2: update Passpoint intent definitions
Erik Kline [Tue, 14 Mar 2017 11:03:14 +0000 (20:03 +0900)]
Add comment with packet tracker debugging tip
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
- "adb shell dumpsys wifi ipmanager" shows the debugging tip
Change-Id: Ifcccbdd81a0fc8beb7801ec7c3f78e8a941bc72b
Erik Kline [Tue, 14 Mar 2017 06:08:34 +0000 (06:08 +0000)]
Merge "Address some comments on IpManagerTest"
am:
b2afa1ede5
Change-Id: Ic986c23c693757b8311e0de0c0a94281db67f62d
Treehugger Robot [Tue, 14 Mar 2017 06:00:34 +0000 (06:00 +0000)]
Merge "Address some comments on IpManagerTest"
Erik Kline [Tue, 14 Mar 2017 04:00:27 +0000 (13:00 +0900)]
Address some comments on IpManagerTest
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
26991160
Change-Id: Ib543874188537e31422206d67d1760762a7c85cd
Erik Kline [Tue, 14 Mar 2017 03:11:15 +0000 (03:11 +0000)]
Merge "Skeleton of an IpManagerTest"
am:
db4333a2c2
Change-Id: I5817c2458c222afb85389deaf22b43d245577b2a
Treehugger Robot [Tue, 14 Mar 2017 03:02:19 +0000 (03:02 +0000)]
Merge "Skeleton of an IpManagerTest"
Erik Kline [Tue, 14 Mar 2017 01:01:58 +0000 (10:01 +0900)]
Skeleton of an IpManagerTest
Test: as follows
- biult (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
26991160
Change-Id: Idddddf0c1a7a8d0a8acff8a5526b02a533d5f3ec
fionaxu [Tue, 14 Mar 2017 01:10:51 +0000 (01:10 +0000)]
Merge "carrier default app notification polish"
am:
b2bb98e62d
Change-Id: I78101dd7dc4bd7f222c5e6cc095b7179ce03f362
Treehugger Robot [Tue, 14 Mar 2017 00:55:05 +0000 (00:55 +0000)]
Merge "carrier default app notification polish"
fionaxu [Mon, 13 Mar 2017 23:01:12 +0000 (16:01 -0700)]
carrier default app notification polish
change notification string and app name
Bug:
36002256
Test: Manual
Change-Id: Iec2658850522585157bdc7edd7330ac930bf751d
Peter Qiu [Mon, 6 Mar 2017 18:47:55 +0000 (10:47 -0800)]
hotspot2: update Passpoint configuration management APIs
Address API Councils comment to update both
WifiManager#addOrUpdatePasspointConfiguration and
WifiManager#removePasspointConfiguration to return void and throw
exception on failure instead of returning a boolean.
Bug:
35858311,
35856174
Test: make -j32
Change-Id: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Merged-In: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Peter Qiu [Fri, 3 Mar 2017 17:15:49 +0000 (09:15 -0800)]
hotspot2: hide validate method for Passpoint configuration
The validate method is used by Framework only, no need to expose
to app developers. So hide it.
Bug:
35756298
Test: make -j32
Change-Id: I15ccae472f30d7ae968816479f6ea35d90248fe0
Merged-In: I15ccae472f30d7ae968816479f6ea35d90248fe0
Peter Qiu [Mon, 13 Mar 2017 18:19:43 +0000 (11:19 -0700)]
Osu: temporarily comment out the usage of deprecated intent definitions
Bug:
35857805
Test: mmma frameworks/base/packages/Osu
Change-Id: Iadaede1806cfe7bcaf57ed185618a6de4451e321
Merged-In: Ie4ea352e11b10a7c1f8780557554486bc2b4fcef
Jakub Pawlowski [Mon, 13 Mar 2017 18:11:58 +0000 (18:11 +0000)]
Merge "Bluetooth 5 spelling fixes"
am:
5465fe0a2d
Change-Id: Ibef8ee6a56bf1f8c695e07e4ba61c015054eee13
Jakub Pawlowski [Mon, 13 Mar 2017 17:58:25 +0000 (17:58 +0000)]
Merge "Bluetooth 5 spelling fixes"
Jakub Pawlowski [Sat, 11 Mar 2017 00:07:59 +0000 (16:07 -0800)]
Bluetooth 5 spelling fixes
Bug:
30622771
Test: manual
Change-Id: I46b6486619cc7366e56b25ca48937e6792f53e1d
(cherry picked from commit
53501ad210dd5c65c7910a6b75b2b481e92dd22f)
Hiroshi Yamauchi [Mon, 13 Mar 2017 17:42:50 +0000 (17:42 +0000)]
Merge "Fix the reset of boosted zygote thread priority."
am:
83aceea07d
Change-Id: I6ebd30a631ae10ada65b3279ec66c41d3f50fb1f
Peter Qiu [Thu, 2 Mar 2017 17:35:34 +0000 (09:35 -0800)]
hotspot2: update Passpoint intent definitions
Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
receivers, and not manifest receivers
- Rename extras to be more generic
While there, removed the deprecated hidden Passpoint intent
definitions.
Bug:
35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Merged-In: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Hiroshi Yamauchi [Mon, 13 Mar 2017 17:32:30 +0000 (17:32 +0000)]
Merge "Fix the reset of boosted zygote thread priority."
Hiroshi Yamauchi [Thu, 2 Mar 2017 21:39:07 +0000 (13:39 -0800)]
Fix the reset of boosted zygote thread priority.
This fixes the unexpected priority 112 of the daemon threads
(eg. HeapTaskDaemon). The problem was that when the zygote main
thread's priority is reset, it directly calls setpriority() and fails
to update the priority value in java.lang.Thread, which in turn causes
any threads created by the thread to unexpectedly inherit the boosted
priority. Calling java.lang.Thread.setPriority instead fixes.
(cherry picked from commit
1e3db871e52e59c69edb1843df7f4aecb030bc6f)
Bug:
35801778
Bug:
28866384
Test: angler master userdebug boots and thread priorities checked.
Change-Id: I68a6ed7244a9067acc2749feca7f88422bf44b02
zhangshuxiao [Mon, 13 Mar 2017 13:39:16 +0000 (21:39 +0800)]
WiFi: Wifi service get configured networks use ParceledListSlice.
The number of configurations will be more and more, some
users configured more than 600KB or even 1M, It will cause
the binder failed. Therefore, we use ParceledListSlice
to splits into multiple transactions when more than 64K.
binder: 1885: binder_alloc_buf size
1058080 failed, no address space
Test: more than 500 configurations.
Change-Id: I35b8bac478c6d9efa2fb8572fdc7ca22eb910609
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
Hugo Benichi [Mon, 13 Mar 2017 07:31:54 +0000 (07:31 +0000)]
Merge "Minor formatting cleanup to remove overlong line"
am:
d6998d4bd6
Change-Id: I3a4582ebfc1cb7436e570e37cacbc3cabf8c0182
Hugo Benichi [Mon, 13 Mar 2017 07:23:05 +0000 (07:23 +0000)]
Merge "Minor formatting cleanup to remove overlong line"
Hugo Benichi [Mon, 13 Mar 2017 07:09:49 +0000 (07:09 +0000)]
Merge "ConnectivityManager: unhide methods with Handler argument"
am:
e940d5458d
Change-Id: I470d68a25e62b9493ac7cfb5887e8345968f1097
Hugo Benichi [Mon, 13 Mar 2017 06:58:29 +0000 (06:58 +0000)]
Merge "ConnectivityManager: unhide methods with Handler argument"
Hugo Benichi [Mon, 13 Mar 2017 00:14:55 +0000 (00:14 +0000)]
Merge "Simple cleanups to Tethering"
am:
7eaa2ad172
Change-Id: I3bb7e4756eaa0b7e702ff7270beb7420b7b6aac5
Hugo Benichi [Mon, 13 Mar 2017 00:03:58 +0000 (00:03 +0000)]
Merge "Simple cleanups to Tethering"
Jeff Vander Stoep [Sat, 11 Mar 2017 23:30:01 +0000 (23:30 +0000)]
Merge "Move mac_permissions to etc/selinux"
am:
b063fe384f
Change-Id: Ia6da81ff48e749c8d3f4f150e81fc0c138e7763e
Treehugger Robot [Sat, 11 Mar 2017 23:23:09 +0000 (23:23 +0000)]
Merge "Move mac_permissions to etc/selinux"
Jeff Vander Stoep [Sat, 11 Mar 2017 00:01:19 +0000 (16:01 -0800)]
Move mac_permissions to etc/selinux
Test: Build and boot Marlin
Test: See the following in the logs:
01-01 02:10:28.756 1345 1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml
01-01 02:10:28.787 1345 1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml
Bug:
36003167
Change-Id: I97479260eabe14c1b1dcc238d7322016f6b5c4dd
Randy Pan [Fri, 10 Mar 2017 23:08:15 +0000 (23:08 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval"
am:
c25e2b79b1
Change-Id: Ic924e478f1278ab0873f33984d3026a5ec63c91c
Treehugger Robot [Fri, 10 Mar 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Add a config for WiFi exponential backoff scan base interval"
Paul Duffin [Fri, 10 Mar 2017 20:43:07 +0000 (20:43 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"
am:
2a3a4f81f9
Change-Id: I259dc2116f1ba7d409729d739404dca501f4a5e8
Paul Duffin [Fri, 10 Mar 2017 20:33:20 +0000 (20:33 +0000)]
Merge "Refactor code incompatible with Mockito 2.7.13"
Randy Pan [Fri, 10 Mar 2017 17:40:39 +0000 (09:40 -0800)]
Add a config for WiFi exponential backoff scan base interval
Bug:
36026947
Test: bulid and boot up the phone
Change-Id: I4971c1c7d0fc162ac5934becbdf28fba50d65c11
Etan Cohen [Fri, 10 Mar 2017 17:13:42 +0000 (17:13 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit"
am:
3dee29581e
Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690
Etan Cohen [Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)]
Merge "[AWARE] Update network API: make open/encrypted explicit"
Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000 (18:49 +0000)]
Refactor code incompatible with Mockito 2.7.13
Bug:
32912773
Test: make checkbuild
Merged-In: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Change-Id: I445b32432eea8a1ccb2060a73460a882a9ebe76f
fionaxu [Fri, 10 Mar 2017 09:52:22 +0000 (09:52 +0000)]
Merge "polish the notification of the default carrier app"
am:
b224b318a0
Change-Id: I4bb9f08d155def15a79a4960f05650cb5d7615fd
Treehugger Robot [Fri, 10 Mar 2017 09:44:02 +0000 (09:44 +0000)]
Merge "polish the notification of the default carrier app"
fionaxu [Fri, 10 Mar 2017 09:40:59 +0000 (09:40 +0000)]
Merge "decouple carrierdefaultapp from phone process"
am:
e32fc81c5d
Change-Id: I3b03e57609ab649f01a45a6b70edca1402f80b3e
Treehugger Robot [Fri, 10 Mar 2017 09:33:08 +0000 (09:33 +0000)]
Merge "decouple carrierdefaultapp from phone process"
fionaxu [Fri, 10 Mar 2017 06:25:29 +0000 (22:25 -0800)]
decouple carrierdefaultapp from phone process
Bug:
36114351
Test: Manual
Change-Id: I679d97bd9854fe478499d1fac6225c3f954ecdbc
Hugo Benichi [Fri, 10 Mar 2017 05:20:57 +0000 (14:20 +0900)]
Simple cleanups to Tethering
- regroup together static final class fields, final instance fields, and
mutable instance fields.
- uses correct Android naming conventions for instance fields.
- reorder imports correctly.
Test: no functional change.
Change-Id: If3d73bc28972a004c2ba3cc14d869a2a679abfce
Brad Ebinger [Thu, 9 Mar 2017 21:46:39 +0000 (21:46 +0000)]
Merge "Disable a phone number log for user build"
am:
59a40691a5
Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646
Brad Ebinger [Thu, 9 Mar 2017 21:38:59 +0000 (21:38 +0000)]
Merge "Disable a phone number log for user build"
Miao Wang [Thu, 9 Mar 2017 20:51:50 +0000 (20:51 +0000)]
Merge changes from topic 'USAGE_IO_INPUT'
am:
70fac233fa
Change-Id: I3f8db9b25a8ccee8ddb596baf5e54a268747de9f
Miao Wang [Thu, 9 Mar 2017 20:50:38 +0000 (20:50 +0000)]
[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.
am:
33287e8a89
Change-Id: Iffd2de04c50f07806063543abe9cd359ce48b6df
Miao Wang [Thu, 9 Mar 2017 20:38:48 +0000 (20:38 +0000)]
Merge changes from topic 'USAGE_IO_INPUT'
* changes:
[RenderScript] Update RenderScript JNI with the corresponding AllocationGetSurface driver implementation change.
[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.
Hugo Benichi [Thu, 9 Mar 2017 10:11:55 +0000 (10:11 +0000)]
Merge "CaptivePortalLoginActivity correctly gets UserAgent"
am:
4903487fd9
Change-Id: Iea24e914cab4128464f8866a4b9ae47c7c5325bf
Treehugger Robot [Thu, 9 Mar 2017 10:03:26 +0000 (10:03 +0000)]
Merge "CaptivePortalLoginActivity correctly gets UserAgent"
Martijn Coenen [Thu, 9 Mar 2017 08:39:15 +0000 (08:39 +0000)]
Merge "Remove interfaceChain from IServiceManager::add()"
am:
4a75e32f1d
Change-Id: I9443e22ed730c44abc6fd6f697f8b3f04b667f37
Martijn Coenen [Thu, 9 Mar 2017 08:33:02 +0000 (08:33 +0000)]
Merge "Remove interfaceChain from IServiceManager::add()"
Hugo Benichi [Tue, 7 Mar 2017 06:10:03 +0000 (15:10 +0900)]
CaptivePortalLoginActivity correctly gets UserAgent
Change I33cbcdab9809c712d998da6d925bdd4e3093f8ff added to the intent
passed from NetworkMonitor to the CaptivePortalLoginActivity an extra
argument to set the UserAgent header of probes done by the
CaptivePortalLoginActivity.
However that extra String argument is not correctly retrieved from the
Intent and instead a null pointer is returned by getParcelableExtra().
Consequently the UserAgent header field is never set.
This patch fixes this bug and replace getParcelableExtra() with
getStringExtra().
It also adds logging of the request header and response header for every
network probes sent by CaptivePortalLoginActivity.
Bug:
35937367,
32369183
Test: manually tested
Change-Id: If5c463023474ffb0401f3cda5875ccd9fc6f79f9
Hugo Benichi [Thu, 2 Mar 2017 04:41:38 +0000 (13:41 +0900)]
ConnectivityManager: unhide methods with Handler argument
Test: no functionality change
Bug:
32130437
Change-Id: I2a57175142683f991a215b584282db143a76ed9d
Brad Ebinger [Wed, 8 Mar 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Return generic Binder on onBind"
am:
c6613f7206
Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d
Brad Ebinger [Wed, 8 Mar 2017 19:53:25 +0000 (19:53 +0000)]
Merge "Return generic Binder on onBind"
Jakub Pawlowski [Wed, 8 Mar 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Bluetooth 5 Advertising API"
am:
1bb08c25b8
Change-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd
Jakub Pawlowski [Wed, 8 Mar 2017 19:18:50 +0000 (19:18 +0000)]
Merge "Bluetooth 5 PHY selection API"
am:
104eeedb42
Change-Id: I0ee2daaf0771b405c8a14598a70459879d31c953
Jakub Pawlowski [Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)"
am:
f1d76a71c8
Change-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16
Jakub Pawlowski [Wed, 8 Mar 2017 19:12:08 +0000 (19:12 +0000)]
Merge "Bluetooth 5 enhanced scanning API"
am:
bed6fb3f5a
Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411
Jakub Pawlowski [Wed, 8 Mar 2017 19:09:43 +0000 (19:09 +0000)]
Merge "Bluetooth 5 feature check API (1/2)"
am:
a06a0dfdb7
Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df
Jakub Pawlowski [Wed, 8 Mar 2017 19:05:12 +0000 (19:05 +0000)]
Merge "Bluetooth 5 Advertising API"
Jakub Pawlowski [Tue, 10 Jan 2017 14:15:54 +0000 (06:15 -0800)]
Bluetooth 5 Advertising API
Test: manual
Bug:
30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit
5324a14cf490656269ef862d7f8f6b139a21c0e6)
Jakub Pawlowski [Wed, 8 Mar 2017 19:04:30 +0000 (19:04 +0000)]
Merge "Bluetooth 5 PHY selection API"
Jakub Pawlowski [Thu, 2 Feb 2017 16:07:12 +0000 (08:07 -0800)]
Bluetooth 5 PHY selection API
Bug:
30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit
db5a87d50db9d4b3d642603f6c329b83ee5851f6)
Jakub Pawlowski [Wed, 8 Mar 2017 19:03:47 +0000 (19:03 +0000)]
Merge "Bluetooth 5 periodc scan API (1/2)"