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
Dmitry Dementyev
2569925151
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
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
am: 0f04a5a93f
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
f1fb452863
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43
...
am: 3964c51bf2
2017-03-09 18:16:23 +00:00
Dmitry Dementyev
0f04a5a93f
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
Dmitry Dementyev
3964c51bf2
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217
...
am: def3eddb43
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
...
am: b7e2545217
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
...
am: 3a5e567ab9
2017-03-08 19:13:10 +00:00
Dmitry Dementyev
3a5e567ab9
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
...
am: 5c4276a258
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
5c4276a258
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
am: e24780ed4c
2017-03-08 19:08:40 +00:00
Dmitry Dementyev
e24780ed4c
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Jaewoong Jung
42786ef2f2
Merge "Changes event handling phases for DeviceListPreferenceFragment." am: 084c20409b
...
am: 015fe72cd3
2017-03-07 02:29:45 +00:00
Jaewoong Jung
015fe72cd3
Merge "Changes event handling phases for DeviceListPreferenceFragment."
...
am: 084c20409b
2017-03-07 02:27:15 +00:00
Treehugger Robot
084c20409b
Merge "Changes event handling phases for DeviceListPreferenceFragment."
2017-03-06 23:02:13 +00:00
Jaewoong Jung
7ca9a39960
Changes event handling phases for DeviceListPreferenceFragment.
...
Bug: 31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
(cherry picked from commit e8d5c8fda1
2017-03-06 13:02:35 -08:00
Lorenzo Colitti
db77518a65
Merge "Display the correct default for mobile data always on." am: 737d42a0db
...
am: 58e9855b53
2017-03-06 04:08:55 +00:00
Lorenzo Colitti
58e9855b53
Merge "Display the correct default for mobile data always on."
...
am: 737d42a0db
2017-03-06 04:04:55 +00:00
Treehugger Robot
737d42a0db
Merge "Display the correct default for mobile data always on."
2017-03-06 03:57:50 +00:00
minoru.x.sakuma
36b2de22cf
Merge "Unify the design of add icon in setting" am: bc9731a575
...
am: 398eca1067
2017-03-06 01:25:46 +00:00
minoru.x.sakuma
398eca1067
Merge "Unify the design of add icon in setting"
...
am: bc9731a575
2017-03-06 01:22:16 +00:00
Treehugger Robot
bc9731a575
Merge "Unify the design of add icon in setting"
2017-03-06 01:17:56 +00:00
Lorenzo Colitti
15fb2d1096
Display the correct default for mobile data always on.
...
Mobile data always on was enabled by changing the default in
ConnectivityService to 1. However, the default value in the
developer options setting was left at 0. This means that by
default (i.e., when the setting is empty), mobile data always on
is enabled but appears in developer options as disabled.
Fix this by changing the default in developer options. This is
simpler than the other options (adding database upgrade code to
settings, making the default be controlled by config.xml and
ensuring that when a config changed broadcast is received the
value is re-rease, hardcoding a default value as an @hide
constant in Settings, etc.)
Bug: 23113288
Test: setting is off after "adb shell settings delete global mobile_data_always_on"
Change-Id: I27e2c0af7a03e510e640dbcfa281449d00385154
2017-03-03 18:56:23 +09:00
minoru.x.sakuma
f014ae5bc5
Unify the design of add icon in setting
...
Add icon "+" displayed in APN setting differs from ones in other
settings like VPN settings, SIP accounts etc. Change the icon to
align with others.
Bug: 35936472
Test: Manually check icon display with fix
Change-Id: I99a57fbeb55bb04f911d28e85752ec04edab6f0e
2017-03-03 05:15:02 +00:00
Peter Qiu
d49c2ff80f
Merge "wifi: use Passpoint API when forgetting a Passpoint network" am: ff960ed859
...
am: c5848718ee
2017-03-02 16:59:23 +00:00
