susanta.patra
bf62defed2
Merge "Fixed button bar alignment issue in RTL languages" am: 403c8f72e3
...
am: 2063b1f792
Change-Id: I7493a720ef88f0b40ebed483d474a34ad9ee5da4
2017-12-11 19:41:40 +00:00
susanta.patra
2063b1f792
Merge "Fixed button bar alignment issue in RTL languages"
...
am: 403c8f72e3
Change-Id: I8a14f71b20fd07ac3fd9025ba4e303a11709fe0a
2017-12-11 19:28:44 +00:00
Treehugger Robot
403c8f72e3
Merge "Fixed button bar alignment issue in RTL languages"
2017-12-11 19:10:46 +00:00
luozhanwei
81544d2a71
Merge "[DeadLock]AMS PMS MountService" am: 998ac99db4
...
am: 41fb54b955
Change-Id: I15056a18d70a1d17c52799f71e8faf5c565bb8aa
2017-12-11 16:14:17 +00:00
luozhanwei
41fb54b955
Merge "[DeadLock]AMS PMS MountService"
...
am: 998ac99db4
Change-Id: I5910f42d91c3c3edcc092a87cc2e291d6e83e75e
2017-12-11 16:05:19 +00:00
Treehugger Robot
998ac99db4
Merge "[DeadLock]AMS PMS MountService"
2017-12-11 15:47:45 +00:00
Hugo Benichi
51e563aefb
Merge "DefaultNetworkEvent: fix two bugs with validation times" am: c0d951c3e0
...
am: 144d9e9f83
Change-Id: Iad5a7cda8b73f638aa7db8ae38bdccef1cbeae85
2017-12-11 00:24:33 +00:00
Hugo Benichi
144d9e9f83
Merge "DefaultNetworkEvent: fix two bugs with validation times"
...
am: c0d951c3e0
Change-Id: I94489cb28fad5d8adddb200b44d72bab2be70b97
2017-12-11 00:12:16 +00:00
Hugo Benichi
c0d951c3e0
Merge "DefaultNetworkEvent: fix two bugs with validation times"
2017-12-10 23:54:13 +00:00
Nicolas Geoffray
d3e197a1bd
Merge "Revert "Remove empty ScopedArray constructor."" am: f6a0a7491b
...
am: 73fce7397e
Change-Id: I8bb88e7b91928ae8fc79233a74fe545aa3d40bb7
2017-12-09 13:56:54 +00:00
Nicolas Geoffray
73fce7397e
Merge "Revert "Remove empty ScopedArray constructor.""
...
am: f6a0a7491b
Change-Id: I9c49b4209e98e90bea62ad1656f7405d771395c9
2017-12-09 13:38:43 +00:00
Nicolas Geoffray
f6a0a7491b
Merge "Revert "Remove empty ScopedArray constructor.""
2017-12-09 13:26:00 +00:00
Nicolas Geoffray
e1cbeef15c
Revert "Remove empty ScopedArray constructor."
...
Libcore tests still fail.
This reverts commit cee368b2b8 .
Change-Id: I4bcdb7bf08d09d563e54cd8fe005402ae3579164
2017-12-09 13:25:26 +00:00
Hugo Benichi
71a1b532b5
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
380a063858 .
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
2017-12-09 13:02:51 +09:00
Siyuan Zhou
89df84bfb4
Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am: 5323d42b82
...
am: c044749416
Change-Id: If096fea07e31abbd8c5c418c776296c1200009d9
2017-12-09 03:18:08 +00:00
Siyuan Zhou
c044749416
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
...
am: 5323d42b82
Change-Id: Iaf53e8a99b61d68c3b920b76c78e9208845c56f3
2017-12-09 03:06:26 +00:00
Treehugger Robot
5323d42b82
Merge "BootReceiver: Added an event log after the dropbox file copy is successful."
2017-12-09 02:55:20 +00:00
Roshan Pius
a312cf38f9
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e339662247
...
am: 66c8516600
Change-Id: I9c7175d9e2db45780f14630db43a6ab5672dfe3d
2017-12-09 01:58:08 +00:00
Roshan Pius
66c8516600
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
...
am: e339662247
Change-Id: I402078a9ad6d92441cf34ca0b9459ee51adac984
2017-12-09 01:48:34 +00:00
Treehugger Robot
e339662247
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
2017-12-09 01:34:07 +00:00
Etan Cohen
8b4960ec91
Merge "[AWARE] Make PeerHandle comparable/hashable" am: 8d621cc042
...
am: bd82991016 -s ours
Change-Id: I0d878f4ae7067e875879e683525d20338f2e3405
2017-12-09 00:26:47 +00:00
Etan Cohen
bd82991016
Merge "[AWARE] Make PeerHandle comparable/hashable"
...
am: 8d621cc042
Change-Id: I31a1ebcecd49b620462f2fb917e6c0c0d8f4d06e
2017-12-09 00:14:11 +00:00
Etan Cohen
8d621cc042
Merge "[AWARE] Make PeerHandle comparable/hashable"
2017-12-08 23:58:36 +00:00
Siyuan Zhou
070e318501
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 bafcd7b595 )
2017-12-08 22:51:23 +00:00
Jack He
91c8a6edc1
Merge "Bluetooth: Fix boolean logic in quiet mode enable" am: 1801711c53
...
am: b9d49781ac
Change-Id: I8173afb73788a3de9ce7b1af07e653f9b76fbefa
2017-12-08 22:41:35 +00:00
Jack He
b9d49781ac
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
...
am: 1801711c53
Change-Id: I58d0f361db35998b30c70cfd380e35b63e543524
2017-12-08 22:30:56 +00:00
Roshan Pius
f1967c4125
Revert "Send empty LinkProperties when entering StoppedState."
...
This reverts commit b3f9f4a305 .
Reason for revert: Crash in WifiStateMachine (b/70394432)
Change-Id: I3a96c822eddcebcdd6621cee878b865171d094e8
2017-12-08 22:29:50 +00:00
Jack He
1801711c53
Merge "Bluetooth: Fix boolean logic in quiet mode enable"
2017-12-08 22:13:27 +00:00
Seigo Nonaka
2f4f1d42f9
Merge "Remove empty ScopedArray constructor." am: e7120f5056
...
am: 1a8fb13d2e
Change-Id: Ic7ab0ef3a691e5332fd02a5eb5cf08277fe44f5d
2017-12-08 20:30:40 +00:00
Seigo Nonaka
1a8fb13d2e
Merge "Remove empty ScopedArray constructor."
...
am: e7120f5056
Change-Id: I451928750550a4b29c6637bb351e5d18f16d04d2
2017-12-08 20:22:03 +00:00
Jack He
a6e031c9f5
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
2017-12-08 12:21:37 -08:00
Adil Aliyev
3ce32d174e
Merge "Add Azerbaijani keyboard layout" am: 12fc68681b
...
am: f189fbc969
Change-Id: I554f281025231a0de61abc1ff3224573b55e29cc
2017-12-08 20:20:35 +00:00
Treehugger Robot
e7120f5056
Merge "Remove empty ScopedArray constructor."
2017-12-08 20:07:33 +00:00
Adil Aliyev
f189fbc969
Merge "Add Azerbaijani keyboard layout"
...
am: 12fc68681b
Change-Id: I89b3c7f86f3571b30003087e68fbbbc46e01dd88
2017-12-08 20:07:09 +00:00
Treehugger Robot
12fc68681b
Merge "Add Azerbaijani keyboard layout"
2017-12-08 19:53:14 +00:00
Felipe Leme
33a431e9a7
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
2017-12-08 19:19:09 +00:00
Felipe Leme
ed6f463636
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
2017-12-08 18:53:17 +00:00
Felipe Leme
d62d68785e
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
...
am: bd355dbf58
Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604
2017-12-08 18:39:01 +00:00
Felipe Leme
7c3716792a
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev
...
am: 613d0cd8fb
Change-Id: Iee0adf135a684e5338250628f35b754a3e69b3d0
2017-12-08 18:18:49 +00:00
TreeHugger Robot
bd355dbf58
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
2017-12-08 18:16:24 +00:00
TreeHugger Robot
613d0cd8fb
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev
2017-12-08 18:05:59 +00:00
Adil Aliyev
10df49258c
Add Azerbaijani keyboard layout
...
KCM for Azerbaijani keyboard is added.
Change-Id: I6190607b4319a98f41d776b476b68e08ce4b07a2
Signed-off-by: Adil Aliyev <adilaliev@gmail.com >
2017-12-09 01:56:05 +09:00
Colin Cross
a7cfd1e93d
Merge "Remove logtags property" am: f2ed7683da
...
am: 9367657b27
Change-Id: Ic49a94bdf60bde65b02535377163e2da062d4a43
2017-12-08 16:35:56 +00:00
Colin Cross
9367657b27
Merge "Remove logtags property"
...
am: f2ed7683da
Change-Id: I599af7003bd4ef6cbb8f99ad4caba10ada2f1f43
2017-12-08 16:26:26 +00:00
Colin Cross
f2ed7683da
Merge "Remove logtags property"
2017-12-08 16:14:07 +00:00
susanta.patra
1b0b22ce08
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 >
2017-12-08 11:55:40 +05:30
Erik Kline
91bb7b17d2
Merge "Refactor to IpNeighborMonitor and single-threaded semantics" am: b501e7e25b
...
am: c4ca15786f
Change-Id: Ic6466a83f6b8e128a74321bb37da21e6d2c174e7
2017-12-08 06:07:53 +00:00
Erik Kline
c4ca15786f
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
...
am: b501e7e25b
Change-Id: Iddf69a93400af2262e4522592f9898ee0b79314c
2017-12-08 05:58:32 +00:00
Treehugger Robot
b501e7e25b
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
2017-12-08 05:44:26 +00:00
Eric Erfanian
4f6d728e62
Merge "Add assisted dialing properties to the framework." into oc-mr1-dev
...
am: 5d04d92265
Change-Id: Ib505b78a810099534907696b546213ad557343fb
2017-12-08 05:20:16 +00:00