OSDN Git Service
Jack He [Wed, 13 Dec 2017 00:45:58 +0000 (00:45 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string" am:
f7a69aeeab
am:
c57c5a9ba4
Change-Id: Id9b238bb2493455650351d595e4c7d2dd5005f2e
Jack He [Wed, 13 Dec 2017 00:02:25 +0000 (00:02 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
am:
f7a69aeeab
Change-Id: I6be2177bcc81cd16824fc20b2dbf7a8a6c9464b8
Adam Lesinski [Tue, 12 Dec 2017 23:36:57 +0000 (23:36 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
am:
a06854e77a
Change-Id: I9d4f214b3911fb66fd2baa8ad83e8450246c3c80
Treehugger Robot [Tue, 12 Dec 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Bluetooth: Add convenience method to convert connection state to string"
TreeHugger Robot [Tue, 12 Dec 2017 21:48:11 +0000 (21:48 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
Hansong Zhang [Tue, 12 Dec 2017 19:22:12 +0000 (19:22 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am:
5b6b73800c
am:
64d81fbf33
Change-Id: I1be05324ec0134c801de08e0f60139c341261f33
Hansong Zhang [Tue, 12 Dec 2017 19:11:56 +0000 (19:11 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
am:
5b6b73800c
Change-Id: I29c61bf210b8bb01c3a51a12dca4e8a6d3e0d9e1
Treehugger Robot [Tue, 12 Dec 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Jack Yu [Tue, 12 Dec 2017 18:29:04 +0000 (18:29 +0000)]
Merge "Moved data connection response into system api." am:
8ded1cde4a
am:
88aa63a6a2
Change-Id: Iac46d7f4c0d6c8d46df77c6349b325b5dd5831b3
Jack Yu [Tue, 12 Dec 2017 18:18:09 +0000 (18:18 +0000)]
Merge "Moved data connection response into system api."
am:
8ded1cde4a
Change-Id: Ibcd8c9c11459e39ea8ba32f9bb680716c1ac9b0d
Treehugger Robot [Tue, 12 Dec 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Moved data connection response into system api."
Todd Kennedy [Tue, 12 Dec 2017 15:14:20 +0000 (15:14 +0000)]
Merge "Block the upgrade of persistent apps" am:
0b30d95dc8
am:
6de91158d7
Change-Id: I729df40376b972461908d22593b63f4f5399e356
Todd Kennedy [Tue, 12 Dec 2017 15:05:24 +0000 (15:05 +0000)]
Merge "Block the upgrade of persistent apps"
am:
0b30d95dc8
Change-Id: Icd375c367293169b2d2f7661fcb337cafd324714
Todd Kennedy [Tue, 12 Dec 2017 14:55:01 +0000 (14:55 +0000)]
Merge "Block the upgrade of persistent apps"
Paul Duffin [Tue, 12 Dec 2017 13:19:26 +0000 (13:19 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am:
60f0b06d19
am:
6ff2ad3044
Change-Id: I7ec4ac17b4fead69b3ffbd754cd3ce33978c64cb
Paul Duffin [Tue, 12 Dec 2017 13:09:48 +0000 (13:09 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
am:
60f0b06d19
Change-Id: I530df72ef5dc2c50a2304e5b2fe1ddff2ade2eeb
Treehugger Robot [Tue, 12 Dec 2017 12:55:28 +0000 (12:55 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
Siyamed Sinir [Tue, 12 Dec 2017 04:25:54 +0000 (04:25 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout" am:
b7941c50a0
am:
0863cf4e40
Change-Id: Ief495fcc7e6f711696ed6337ab65face9d03c981
Siyamed Sinir [Tue, 12 Dec 2017 04:15:03 +0000 (04:15 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
am:
b7941c50a0
Change-Id: I67578129771d0c7d52d5da63f24c2f0d6081ab57
Siyamed Sinir [Tue, 12 Dec 2017 03:57:43 +0000 (03:57 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
Hall Liu [Tue, 12 Dec 2017 02:11:04 +0000 (02:11 +0000)]
Merge "Add CarrierConfig key for RTT support" am:
e5a913661d
am:
79dc6fb815
Change-Id: I11ef3f96e578e077288fe60725d326a20f45daf1
Hall Liu [Tue, 12 Dec 2017 01:59:47 +0000 (01:59 +0000)]
Merge "Add CarrierConfig key for RTT support"
am:
e5a913661d
Change-Id: I035f9ae243dfe1a8c3bc1300851e88fdcb73dafd
Hall Liu [Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)]
Merge "Add CarrierConfig key for RTT support"
Amit Mahajan [Tue, 12 Dec 2017 01:37:32 +0000 (01:37 +0000)]
Merge "Revert "Add support for send Message with messaging options"" am:
563d93c107
am:
b1ba135258
Change-Id: I874df0b3061ef2f22de6d1c5f9338aa395092ee8
Tyler Gunn [Tue, 12 Dec 2017 01:27:00 +0000 (01:27 +0000)]
Merge "Add carrier config to always play hold tone when remotely held." am:
c352f5f861
am:
c9187f9199
Change-Id: Ic5b3a6089b03771bb0c0e48e0e8e01cbca839b47
Amit Mahajan [Tue, 12 Dec 2017 01:26:00 +0000 (01:26 +0000)]
Merge "Revert "Add support for send Message with messaging options""
am:
563d93c107
Change-Id: I5db31fdbddfdceb5417f617d7856f8a2a85cedb4
Tyler Gunn [Tue, 12 Dec 2017 01:16:30 +0000 (01:16 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
am:
c352f5f861
Change-Id: I16a53c2ec034c32c9e771e367c18ab20c1a52cf4
Amit Mahajan [Tue, 12 Dec 2017 01:04:54 +0000 (01:04 +0000)]
Merge "Revert "Add support for send Message with messaging options""
Treehugger Robot [Tue, 12 Dec 2017 00:56:37 +0000 (00:56 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:58:48 +0000 (23:58 +0000)]
Merge "Carrier confirmation code." am:
6627d2c4df
am:
0e788e00b6
Change-Id: Ibbb439b724ee031b76ff42ecd84c3c1f2df69ae1
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Carrier confirmation code."
am:
6627d2c4df
Change-Id: I444b27d11472cd9a84e4df3b5ae624fba0b13e71
Amit Mahajan [Mon, 11 Dec 2017 23:30:35 +0000 (23:30 +0000)]
Revert "Add support for send Message with messaging options"
This reverts commit
bbef627077c5126b5b1292a5a396d784218c09cf.
Reason for revert: Causing long sms failure
Bug:
68762942
Change-Id: I43c36e3286105459c7e08d1a0b2d89b4c42140b2
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:29:34 +0000 (23:29 +0000)]
Merge "Carrier confirmation code."
Hall Liu [Tue, 21 Nov 2017 00:25:39 +0000 (16:25 -0800)]
Add CarrierConfig key for RTT support
Add the carrier config key.
Test: add fake support for some random carrier, look for the capability
Bug:
63934808
Change-Id: I8a0e33a7ac10fbdcad356059913e7ddcba26bb6c
Hansong Zhang [Sat, 9 Dec 2017 00:05:55 +0000 (16:05 -0800)]
Make BluetoothPbap implement BluetoothProfile (1/3)
* BluetoothPbap will implement BluetoothProfile to be consistent with
other profiles
* Changed the method names to match the BluetoothProfile method
signatures
* Removed doesClassMatchSink() as it is never used
* Disable default DEBUG logs
Test: test with carkits
Bug:
69417672
Change-Id: I0766188f77468808d7505780c781f5fd8608af60
Jack He [Mon, 11 Dec 2017 21:11:20 +0000 (13:11 -0800)]
Bluetooth: Add convenience method to convert connection state to string
* Add method to convert the following state values to string
- BluetoothHeadset.STATE_DISCONNECTED
- BluetoothHeadset.STATE_CONNECTING
- BluetoothHeadset.STATE_CONNECTED
- BluetoothHeadset.STATE_DISCONNECTING
Test: make
Change-Id: Iaa5b6e35d3214ded8edbe29d626e0869651417d1
Paul Duffin [Mon, 11 Dec 2017 20:19:56 +0000 (20:19 +0000)]
Remove LOCAL_STATIC_SHARED_LIBRARY usage
That property is not used during the build so its usage can be safely
removed because it has no effect.
Bug:
30188076
Test: make checkbuild
Change-Id: Ie337426733c26ec12b344b8f4b7467aa7f9f63f3
susanta.patra [Mon, 11 Dec 2017 19:41:40 +0000 (19:41 +0000)]
Merge "Fixed button bar alignment issue in RTL languages" am:
403c8f72e3
am:
2063b1f792
Change-Id: I7493a720ef88f0b40ebed483d474a34ad9ee5da4
susanta.patra [Mon, 11 Dec 2017 19:28:44 +0000 (19:28 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
am:
403c8f72e3
Change-Id: I8a14f71b20fd07ac3fd9025ba4e303a11709fe0a
Treehugger Robot [Mon, 11 Dec 2017 19:10:46 +0000 (19:10 +0000)]
Merge "Fixed button bar alignment issue in RTL languages"
luozhanwei [Mon, 11 Dec 2017 16:14:17 +0000 (16:14 +0000)]
Merge "[DeadLock]AMS PMS MountService" am:
998ac99db4
am:
41fb54b955
Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa
luozhanwei [Mon, 11 Dec 2017 16:05:19 +0000 (16:05 +0000)]
Merge "[DeadLock]AMS PMS MountService"
am:
998ac99db4
Change-Id: I5910f42d91c3c3edcc092a87cc2e291d6e83e75e
Treehugger Robot [Mon, 11 Dec 2017 15:47:45 +0000 (15:47 +0000)]
Merge "[DeadLock]AMS PMS MountService"
Hugo Benichi [Mon, 11 Dec 2017 00:24:33 +0000 (00:24 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times" am:
c0d951c3e0
am:
144d9e9f83
Change-Id: Iad5a7cda8b73f638aa7db8ae38bdccef1cbeae85
Hugo Benichi [Mon, 11 Dec 2017 00:12:16 +0000 (00:12 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
am:
c0d951c3e0
Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97
Hugo Benichi [Sun, 10 Dec 2017 23:54:13 +0000 (23:54 +0000)]
Merge "DefaultNetworkEvent: fix two bugs with validation times"
Nicolas Geoffray [Sat, 9 Dec 2017 13:56:54 +0000 (13:56 +0000)]
Merge "Revert "Remove empty ScopedArray constructor."" am:
f6a0a7491b
am:
73fce7397e
Change-Id: I8bb88e7b91928ae8fc79233a74fe545aa3d40bb7
Nicolas Geoffray [Sat, 9 Dec 2017 13:38:43 +0000 (13:38 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
am:
f6a0a7491b
Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
Nicolas Geoffray [Sat, 9 Dec 2017 13:26:00 +0000 (13:26 +0000)]
Merge "Revert "Remove empty ScopedArray constructor.""
Nicolas Geoffray [Sat, 9 Dec 2017 13:25:26 +0000 (13:25 +0000)]
Revert "Remove empty ScopedArray constructor."
Libcore tests still fail.
This reverts commit
cee368b2b8299db5808284a30e2aa14d0aff8b4a.
Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164
Hugo Benichi [Wed, 6 Dec 2017 04:28:09 +0000 (13:28 +0900)]
DefaultNetworkEvent: fix two bugs with validation times
This patch fixes two bugs around the validation time calculation for
default network metrics:
- for events representing the absence of a default network, the
validation time was not correctly set to 0.
- for events representing a default network, the validation time was
always set to the duration time. This was overlooked by commit
380a0638588d.
Also fix a minor printing padding issue in DefaultNetworkEvent#toString
Test: manually inspected the output of $ adb shell dumpsys connmetrics
while enabling and disabling wifi.
Change-Id: I0eb4ccdf7a61d3097d0661104cb40d738e59772a
Siyuan Zhou [Sat, 9 Dec 2017 03:18:08 +0000 (03:18 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am:
5323d42b82
am:
c044749416
Change-Id: If096fea07e31abbd8c5c418c776296c1200009d9
Siyuan Zhou [Sat, 9 Dec 2017 03:06:26 +0000 (03:06 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
am:
5323d42b82
Change-Id: Iaf53e8a99b61d68c3b920b76c78e9208845c56f3
Treehugger Robot [Sat, 9 Dec 2017 02:55:20 +0000 (02:55 +0000)]
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
Roshan Pius [Sat, 9 Dec 2017 01:58:08 +0000 (01:58 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am:
e339662247
am:
66c8516600
Change-Id: I9c7175d9e2db45780f14630db43a6ab5672dfe3d
Roshan Pius [Sat, 9 Dec 2017 01:48:34 +0000 (01:48 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am:
e339662247
Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
Treehugger Robot [Sat, 9 Dec 2017 01:34:07 +0000 (01:34 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
Holly Jiuyu Sun [Sat, 14 Oct 2017 02:06:34 +0000 (19:06 -0700)]
Carrier confirmation code.
If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.
Add the confirmationCode as a member in DownloadableSubscription.
Merged-In: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Test: unit test, e2e on phone
Bug:
36730837
Change-Id: Ibe1e0fc5ddb736b411faf48ec9bea3c68972bb99
Etan Cohen [Sat, 9 Dec 2017 00:26:47 +0000 (00:26 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" am:
8d621cc042
am:
bd82991016 -s ours
Change-Id: I0d878f4ae7067e875879e683525d20338f2e3405
Etan Cohen [Sat, 9 Dec 2017 00:14:11 +0000 (00:14 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"
am:
8d621cc042
Change-Id: I31a1ebcecd49b620462f2fb917e6c0c0d8f4d06e
Etan Cohen [Fri, 8 Dec 2017 23:58:36 +0000 (23:58 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable"
Siyuan Zhou [Mon, 4 Dec 2017 21:02:11 +0000 (13:02 -0800)]
BootReceiver: Added an event log after the dropbox file copy is successful.
The log can be used to test if LAST KMSG or other items are copied
to dropbox successfully, especially in user builds without root
privilege.
BUG:
69685635
Test: manually verified the desired log from bugreport on user
and userdebug builds.
Change-Id: I6570d95538d678c98d261690ca3c20416d7a31c6
Merged-In: Ie6033bf04c7f79fc596761ab751aa5fcea2c1130
(cherry-picked from commit
bafcd7b59519ce67738c870cf9b69a7c0583cc9b)
Jack He [Fri, 8 Dec 2017 22:41:35 +0000 (22:41 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable" am:
1801711c53
am:
b9d49781ac
Change-Id: I8173afb73788a3de9ce7b1af07e653f9b76fbefa
Jack He [Fri, 8 Dec 2017 22:30:56 +0000 (22:30 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
am:
1801711c53
Change-Id: I58d0f361db35998b30c70cfd380e35b63e543524
Roshan Pius [Fri, 8 Dec 2017 22:29:50 +0000 (22:29 +0000)]
Revert "Send empty LinkProperties when entering StoppedState."
This reverts commit
b3f9f4a30502477e71fc93037dc58080fddb1853.
Reason for revert: Crash in WifiStateMachine (b/
70394432)
Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8
Jack He [Fri, 8 Dec 2017 22:13:27 +0000 (22:13 +0000)]
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
Jack Yu [Thu, 30 Nov 2017 22:03:58 +0000 (14:03 -0800)]
Moved data connection response into system api.
This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.
Test: Telephony sanity tests
bug:
64132030
Merged-In: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
(cherry picked from commit
e44609b15866d080e0f8813b99d04b51a6f32929)
Seigo Nonaka [Fri, 8 Dec 2017 20:30:40 +0000 (20:30 +0000)]
Merge "Remove empty ScopedArray constructor." am:
e7120f5056
am:
1a8fb13d2e
Change-Id: Ic7ab0ef3a691e5332fd02a5eb5cf08277fe44f5d
Seigo Nonaka [Fri, 8 Dec 2017 20:22:03 +0000 (20:22 +0000)]
Merge "Remove empty ScopedArray constructor."
am:
e7120f5056
Change-Id: I451928750550a4b29c6637bb351e5d18f16d04d2
Jack He [Fri, 8 Dec 2017 20:21:37 +0000 (12:21 -0800)]
Bluetooth: Fix boolean logic in quiet mode enable
* Change If97c454a8e5aff34c4f8550f7ade3da413a200b7 introduced a bug that
flipped the logic of quiet mode enable in the handler for
MESSAGE_BLUETOOTH_SERVICE_CONNECTED, causing quiet mode to be enabled
when toggling from Settings and system UI.
Bug:
70395489
Test: make, toggle bluetooth on/off
Change-Id: I405fb462783df0d52d9ce84d2ebe959e56a1aa30
Adil Aliyev [Fri, 8 Dec 2017 20:20:35 +0000 (20:20 +0000)]
Merge "Add Azerbaijani keyboard layout" am:
12fc68681b
am:
f189fbc969
Change-Id: I554f281025231a0de61abc1ff3224573b55e29cc
Treehugger Robot [Fri, 8 Dec 2017 20:07:33 +0000 (20:07 +0000)]
Merge "Remove empty ScopedArray constructor."
Adil Aliyev [Fri, 8 Dec 2017 20:07:09 +0000 (20:07 +0000)]
Merge "Add Azerbaijani keyboard layout"
am:
12fc68681b
Change-Id: I89b3c7f86f3571b30003087e68fbbbc46e01dd88
Treehugger Robot [Fri, 8 Dec 2017 19:53:14 +0000 (19:53 +0000)]
Merge "Add Azerbaijani keyboard layout"
Felipe Leme [Fri, 8 Dec 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev am:
bd355dbf58 am:
d62d68785e -s ours
am:
ed6f463636 -s ours
Change-Id: Iaf79d6fec857677e66af87927bc1aace01b9f1be
Felipe Leme [Fri, 8 Dec 2017 18:53:17 +0000 (18:53 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev am:
bd355dbf58
am:
d62d68785e -s ours
Change-Id: I7f5471c6329e54669c2926779a26536a9dc6e51d
Felipe Leme [Fri, 8 Dec 2017 18:39:01 +0000 (18:39 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
am:
bd355dbf58
Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604
Felipe Leme [Fri, 8 Dec 2017 18:18:49 +0000 (18:18 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev
am:
613d0cd8fb
Change-Id: Iee0adf135a684e5338250628f35b754a3e69b3d0
TreeHugger Robot [Fri, 8 Dec 2017 18:16:24 +0000 (18:16 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
TreeHugger Robot [Fri, 8 Dec 2017 18:05:59 +0000 (18:05 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev
Adil Aliyev [Tue, 5 Dec 2017 18:41:14 +0000 (03:41 +0900)]
Add Azerbaijani keyboard layout
KCM for Azerbaijani keyboard is added.
Change-Id: I6190607b4319a98f41d776b476b68e08ce4b07a2
Signed-off-by: Adil Aliyev <adilaliev@gmail.com>
Colin Cross [Fri, 8 Dec 2017 16:35:56 +0000 (16:35 +0000)]
Merge "Remove logtags property" am:
f2ed7683da
am:
9367657b27
Change-Id: Ic49a94bdf60bde65b02535377163e2da062d4a43
Colin Cross [Fri, 8 Dec 2017 16:26:26 +0000 (16:26 +0000)]
Merge "Remove logtags property"
am:
f2ed7683da
Change-Id: I599af7003bd4ef6cbb8f99ad4caba10ada2f1f43
Colin Cross [Fri, 8 Dec 2017 16:14:07 +0000 (16:14 +0000)]
Merge "Remove logtags property"
susanta.patra [Fri, 8 Dec 2017 06:25:40 +0000 (11:55 +0530)]
Fixed button bar alignment issue in RTL languages
Buttons should be aligned opposite to English in RTL languages.
Test: 1. RTL language
2. Create an alert dialog having positive, negative and neutral button.
3. Check the button bar alignment
Bug:
70363698
Change-Id: I783dfdcf9cb3f85402a4ff3fa4c2d1d1caf5c3da
Signed-off-by: susanta.patra <susanta.patra@lge.com>
Erik Kline [Fri, 8 Dec 2017 06:07:53 +0000 (06:07 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics" am:
b501e7e25b
am:
c4ca15786f
Change-Id: Ic6466a83f6b8e128a74321bb37da21e6d2c174e7
Erik Kline [Fri, 8 Dec 2017 05:58:32 +0000 (05:58 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
am:
b501e7e25b
Change-Id: Iddf69a93400af2262e4522592f9898ee0b79314c
Treehugger Robot [Fri, 8 Dec 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
Eric Erfanian [Fri, 8 Dec 2017 05:20:16 +0000 (05:20 +0000)]
Merge "Add assisted dialing properties to the framework." into oc-mr1-dev
am:
5d04d92265
Change-Id: Ib505b78a810099534907696b546213ad557343fb
TreeHugger Robot [Fri, 8 Dec 2017 05:02:31 +0000 (05:02 +0000)]
Merge "Add assisted dialing properties to the framework." into oc-mr1-dev
Erik Kline [Fri, 8 Dec 2017 03:36:17 +0000 (03:36 +0000)]
Merge "Send empty LinkProperties when entering StoppedState." am:
efdca004ab
am:
72aa5bbd4e
Change-Id: Ifc17bf75ec29d19e6d35716211305ea40b8742d3
Erik Kline [Fri, 8 Dec 2017 03:27:15 +0000 (03:27 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
efdca004ab
Change-Id: I28628277a2e09e7e01eeb6abb140533cc4b58b0d
Treehugger Robot [Fri, 8 Dec 2017 03:14:09 +0000 (03:14 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Erik Kline [Fri, 19 May 2017 00:29:48 +0000 (09:29 +0900)]
Refactor to IpNeighborMonitor and single-threaded semantics
IpReachabilityMonitor (and IpNeighborMonitor) are only accessed from
the IpManager StateMachine's thread. Consequently lots of locking can
now be removed.
Additionally:
- rename BlockingSocketReader to PacketReader
- incorporate IpReachabilityMonitor output in dump()
Test: as follows
- runtest frameworks-net passes
- "adb shell ip neigh change <address> dev wlan0 nud failed"
triggers wifi to disconnect
Bug:
62476366
Bug:
67013397
Change-Id: I18aca29ae0019a72a7e559c2832e0d9b0e33d81e
Colin Cross [Fri, 8 Dec 2017 01:58:57 +0000 (01:58 +0000)]
Merge "Convert services/core/jni to Android.bp" am:
6a4be8613a
am:
b3e34fd427
Change-Id: I336ae24f31e3435914876edb06fbb198f9417cfd
Colin Cross [Fri, 8 Dec 2017 01:55:05 +0000 (17:55 -0800)]
Remove logtags property
logtags previously needed to be listed in logtags and srcs, now
they only need to be listed in logtags.
Test: m checkbuild
Change-Id: I7750116675d9497782642a9b8c86288d42bf0a54
Jack He [Fri, 8 Dec 2017 01:48:22 +0000 (01:48 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset" am:
ea7363402c
am:
38ae4d2fce
Change-Id: I93ba53e4cf31e6dfc6e98d70cd73a93ec930ccb1
Colin Cross [Fri, 8 Dec 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Convert services/core/jni to Android.bp"
am:
6a4be8613a
Change-Id: Icbb98c844347418c003a75d80394448cacfb036f
Jack He [Fri, 8 Dec 2017 01:37:35 +0000 (01:37 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset"
am:
ea7363402c
Change-Id: I5ee5d55d3c47fc82698d80610a2bd70cdee794f8
Colin Cross [Fri, 8 Dec 2017 01:20:47 +0000 (01:20 +0000)]
Merge "Convert services/core/jni to Android.bp"
OSDN Git Service
