Steven Moreland
efb7925e7a
Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c
...
am: 68b580f346
2017-03-28 01:21:58 +00:00
Steven Moreland
68b580f346
Merge "Revert "Development Options: toggle binderized hals""
...
am: 21de66bc0c
2017-03-28 01:18:00 +00:00
Treehugger Robot
21de66bc0c
Merge "Revert "Development Options: toggle binderized hals""
2017-03-28 01:12:14 +00:00
Robin Lee
90f009ebb5
Merge "[VpnSettings]Crash when activity has been recycled" am: fb81f50c27
...
am: c834ed1e4e
2017-03-27 16:25:24 +00:00
Robin Lee
c834ed1e4e
Merge "[VpnSettings]Crash when activity has been recycled"
...
am: fb81f50c27
2017-03-27 16:22:56 +00:00
Robin Lee
fb81f50c27
Merge "[VpnSettings]Crash when activity has been recycled"
2017-03-27 16:18:20 +00:00
Zhihong Li
76fb361b9d
Merge "Show correct Wi-Fi status when switching to multi window mode" am: 4cc1f72576
...
am: a4def43fad
2017-03-25 04:23:32 +00:00
Zhihong Li
a4def43fad
Merge "Show correct Wi-Fi status when switching to multi window mode"
...
am: 4cc1f72576
2017-03-25 04:21:03 +00:00
Treehugger Robot
4cc1f72576
Merge "Show correct Wi-Fi status when switching to multi window mode"
2017-03-25 04:14:58 +00:00
Ajay Panicker
4d20929038
Merge "Add default value to Bluetooth AVRCP version property get" am: 84cf0b2a4b
...
am: 0347c57ef5
2017-03-25 01:02:50 +00:00
Ajay Panicker
0347c57ef5
Merge "Add default value to Bluetooth AVRCP version property get"
...
am: 84cf0b2a4b
2017-03-25 01:00:51 +00:00
Treehugger Robot
84cf0b2a4b
Merge "Add default value to Bluetooth AVRCP version property get"
2017-03-25 00:58:14 +00:00
liurong
2710b99d2f
[VpnSettings]Crash when activity has been recycled
...
This is a case we found in monkey test, the main thread handles message while the activity has been recycled. It will raise a NullPointerException when we use getActivity() in following lines.
Assumpt the situation is: settings run in background and activity been recycled quickly, but handler still in the process.
Test: NA
Change-Id: I19db4f13e13294618ec8e42e4d9c54ce23504344
Signed-off-by: liurong <liurong@xiaomi.com >
2017-03-24 15:21:23 +00:00
Ajay Panicker
0ae97550ee
Merge "AVRCP version interop pereference (2/3)" am: db66a7b664
...
am: da582fa40d
2017-03-23 18:03:57 +00:00
Ajay Panicker
250e18c439
Add default value to Bluetooth AVRCP version property get
...
When the property isn't set a crash can occur since we try to look up an
empty property value.
Bug: 36531010
Test: Open Developer options after a factory reset
Change-Id: I82c0fde00774ab1a4f3e4c44a715c74d4a7804e9
2017-03-23 10:57:30 -07:00
Ajay Panicker
da582fa40d
Merge "AVRCP version interop pereference (2/3)"
...
am: db66a7b664
2017-03-23 17:56:28 +00:00
Treehugger Robot
db66a7b664
Merge "AVRCP version interop pereference (2/3)"
2017-03-23 17:49:58 +00:00
Steven Moreland
544c820ac7
Revert "Development Options: toggle binderized hals"
...
This reverts commit 73dd0ae30e
2017-03-23 05:07:53 +00:00
Sanket Padawe
5642aa4ae8
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: bd9ce2e4b1
...
am: f54df6ccfb
2017-03-23 00:58:29 +00:00
Sanket Padawe
f54df6ccfb
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
...
am: bd9ce2e4b1
2017-03-23 00:45:56 +00:00
Sanket Padawe
bd9ce2e4b1
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
2017-03-22 21:27:22 +00:00
Ajay Panicker
e50b0d490a
AVRCP version interop pereference (2/3)
...
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug: 35956792
Test: Select AVRCP version through developer option
Merged-In: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
Change-Id: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
2017-03-22 18:50:28 +00:00
Sanket Padawe
a71788362c
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
Bug: 35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Merged-in: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
2017-03-21 22:31:58 +00:00
Marie Janssen
912c74e02e
Merge "Bluetooth: stop pairing service correctly" am: 4e32e87e57
...
am: b7c50119e5
2017-03-20 21:49:43 +00:00
Marie Janssen
b7c50119e5
Merge "Bluetooth: stop pairing service correctly"
...
am: 4e32e87e57
2017-03-20 21:45:41 +00:00
Treehugger Robot
4e32e87e57
Merge "Bluetooth: stop pairing service correctly"
2017-03-20 21:37:37 +00:00
Marie Janssen
d06f49189c
Bluetooth: stop pairing service correctly
...
If BluetoothPairingService was stopped and restarted, it would receive
a null intent, and it also would not signal correctly when it needed to
be stopped.
Since restarts can happen, check that we are still bonding when starting.
Also prevent crashes when we might be called with a null intent.
Test: initiate pairing remotely, adb am kill service, notice no crash
Bug: 36130262
Change-Id: I408811935fdb36591826f4481d103cf4799db27e
2017-03-20 12:23:26 -07:00
liurong
e821a7af23
Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a
...
am: 7e51242c05
2017-03-16 17:30:51 +00:00
liurong
7e51242c05
Merge "Optimized Code: call direct method to get integer extra"
...
am: b7fa46453a
2017-03-16 17:27:51 +00:00
Treehugger Robot
b7fa46453a
Merge "Optimized Code: call direct method to get integer extra"
2017-03-16 17:23:30 +00:00
liurong
c2daeaf7e7
Optimized Code: call direct method to get integer extra
...
Description: Make the default preferred sim slot as the first one(0) when get PREFERRED_SIM.
Test: NA
Change-Id: Id54bdbefd413c58ecd637cb8ff522861ead79331
Signed-off-by: liurong <liurong@xiaomi.com >
2017-03-16 22:02:32 +08:00
Marie Janssen
895ac35f4d
Merge "Bluetooth: leave screen off for permission request" am: 172b01035d
...
am: 09f5638b92
2017-03-15 23:00:06 +00:00
Marie Janssen
09f5638b92
Merge "Bluetooth: leave screen off for permission request"
...
am: 172b01035d
2017-03-15 22:57:38 +00:00
Treehugger Robot
172b01035d
Merge "Bluetooth: leave screen off for permission request"
2017-03-15 22:49:57 +00:00
Jay
94854cc57b
Merge "Improve Wi-Fi Settings UI in guest mode" am: 31f64a1253
...
am: 241d902200
2017-03-15 19:24:13 +00:00
Jay
241d902200
Merge "Improve Wi-Fi Settings UI in guest mode"
...
am: 31f64a1253
2017-03-15 19:18:43 +00:00
Treehugger Robot
31f64a1253
Merge "Improve Wi-Fi Settings UI in guest mode"
2017-03-15 19:11:26 +00:00
Jay
a620f52e64
Improve Wi-Fi Settings UI in guest mode
...
Progress bar is still seen along with a permission forbidden tip in
guest mode and it's confusing. It should be hidden because actually
nothing happens there.
When Wi-Fi is off, Wi-Fi OFF tip should be shown even in guest mode
becuase it should be consistent with Wi-Fi status.
Improves d8c3ca43163427a75c8b70114096238177f97af0.
Bug:31235488
Test: manual inspection.
Change-Id: I611719db253a0aec03d61e881af0e5dc3869d50b
Merged-In: If89728e293721cea45dcd717316d87f6df17ea7c
2017-03-15 11:11:15 -07:00
Jeff Sharkey
11324dcedf
Merge "Fix network name for Passpoint network" am: 742bd03f12
...
am: a41debeacd
2017-03-12 23:13:42 +00:00
Jeff Sharkey
a41debeacd
Merge "Fix network name for Passpoint network"
...
am: 742bd03f12
2017-03-12 23:09:11 +00:00
Jeff Sharkey
742bd03f12
Merge "Fix network name for Passpoint network"
2017-03-12 23:03:20 +00:00
Marie Janssen
14ef1e4417
Bluetooth: leave screen off for permission request
...
Test: pair to a carkit, disable pbap, reconnect from carkit
Bug: 32555940
Change-Id: I06d6cc0873f9f991e68f1de9b629dbe3a7bb7701
2017-03-10 09:57:03 -08:00
Dmitry Dementyev
dd48f602bb
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486 am: d5f3ae5cac
...
am: 0fb3d55e3a
2017-03-09 18:32:28 +00:00
Dmitry Dementyev
7a3593cbc6
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20 am: c28fb3e071
...
am: 5330df501f
2017-03-09 18:32:13 +00:00
Dmitry Dementyev
0fb3d55e3a
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486
...
am: d5f3ae5cac
2017-03-09 18:29:27 +00:00
Dmitry Dementyev
5330df501f
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20
...
am: c28fb3e071
2017-03-09 18:29:12 +00:00
Dmitry Dementyev
d5f3ae5cac
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151
...
am: efb9f74486
2017-03-09 18:25:27 +00:00
Dmitry Dementyev
c28fb3e071
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
...
am: 3b5b2d6d20
2017-03-09 18:25:11 +00:00
Dmitry Dementyev
efb9f74486
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863
...
am: 2569925151
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
...
am: 8c5c5b5cec
2017-03-09 18:22:11 +00:00
