Commit Graph

13520 Commits

Author SHA1 Message Date
Marie Janssen
b7c50119e5 Merge "Bluetooth: stop pairing service correctly"
am: 4e32e87e57

Change-Id: Ied66e2bf14771853be46c09b0720c9978d53e3c9
2017-03-20 21:45:41 +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
7e51242c05 Merge "Optimized Code: call direct method to get integer extra"
am: b7fa46453a

Change-Id: Ib7194de15766eb4912e7bbd43b308bd51dd5496a
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
09f5638b92 Merge "Bluetooth: leave screen off for permission request"
am: 172b01035d

Change-Id: Id768f3a4cdbb4286cd1096f94b6fb5b11bae6cc8
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
241d902200 Merge "Improve Wi-Fi Settings UI in guest mode"
am: 31f64a1253

Change-Id: I15f05538344aa615a4f69eebf7fdec66efc3cf29
2017-03-15 19:18:43 +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
a41debeacd Merge "Fix network name for Passpoint network"
am: 742bd03f12

Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2
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
Jaewoong Jung
015fe72cd3 Merge "Changes event handling phases for DeviceListPreferenceFragment."
am: 084c20409b

Change-Id: Ic0abdcd7a7de944b3348590cdfa922fcf1dcbed1
2017-03-07 02:27:15 +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
58e9855b53 Merge "Display the correct default for mobile data always on."
am: 737d42a0db

Change-Id: I5302cc5cc7d0847e127fcbf8af42fb6eef54c303
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
398eca1067 Merge "Unify the design of add icon in setting"
am: bc9731a575

Change-Id: Ieae295ad277877e52399032908677c15180159d3
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
c5848718ee Merge "wifi: use Passpoint API when forgetting a Passpoint network"
am: ff960ed859

Change-Id: I0e085c5c31656c943d7674770ea9f28d963f2726
2017-03-02 16:57:25 +00:00
Treehugger Robot
ff960ed859 Merge "wifi: use Passpoint API when forgetting a Passpoint network" 2017-03-02 16:52:42 +00:00
long.x.qiao
19000b747c Merge "Show search results when query string contains trailing space"
am: 8eb0c24e5a

Change-Id: Ic0382e8b3ce65b52ae2d77987ff4a79945fddb4f
2017-03-01 19:25:42 +00:00
Peter Qiu
4ec020a424 wifi: use Passpoint API when forgetting a Passpoint network
Use WifiManager#removePasspointConfiguration when forgetting a
Passpoint network to remove the configuration.

This maintains the legacy behavior, where forgetting a Passpoint
network/AP will remove its provider's profile.

Bug: 34207710
Test: manual test
Change-Id: I8b7f6d9fb20fa9f0f0d90566f76c2a39308ce420
2017-03-01 10:13:07 -08:00
long.x.qiao
9973b01489 Show search results when query string contains trailing space
The query expression used to search for a term prefix is the prefix
itself with a '*' character appended to it. However, if query string
contains trailing space, the query expresssion (e.g. "screen *") doesn't
work. So to fix this issue, the unnecessary trailing space should be
removed.

Bug: 35231587
Test: manual - go to search in Settings and enter "screen "

Change-Id: Ifa5d96f5d38ad5454272f140da440b8ff55d5614
2017-03-01 21:00:57 +09:00
Meng Wang
e21cbcb6b4 Merge "WiFiCallingSettings: don't start carrier app in onResume"
am: 05c88316ec

Change-Id: I1e212c2486e896ad9945d7881f01895fedb27615
2017-02-27 18:29:48 +00:00
Treehugger Robot
05c88316ec Merge "WiFiCallingSettings: don't start carrier app in onResume" 2017-02-27 18:25:05 +00:00
Meng Wang
d3b0c37ef2 WiFiCallingSettings: don't start carrier app in onResume
onResume initialize UI before registering switch change listener.
So that listener is not invoked in UI initialization, but only real
switch change by user.

Bug: 33680334
Test: make
Test: manual - carrier app is not invoked in onResume
Change-Id: I7ca1eb1eab214b50c8de72946590c1ecb676d4df
2017-02-25 10:23:23 -08:00
Marie Janssen
019c8f38fe Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth"
am: 17ad73ed9b

Change-Id: Ib26f0014a8ef37f0c1b0e738597690343c30e940
2017-02-25 13:44:29 +00:00
Marie Janssen
41cdfd8887 Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth
Bluetooth is the receiver for the OPEN_RECEIVED_FILES intent, so we
should aim the intent directly at them.

Test: go to BT settings and click "Open Received Files" in the context
Change-Id: I057215f1faf04c8c735a7e9340325716225ad22d
Fix: 35246073
2017-02-25 13:39:16 +00:00
Chen Xu
fbf747bb76 Merge "move ACTION_CARRIER_SETUP intent to public api"
am: d989558616

Change-Id: Ic1b747c58bd8dc786e98bb3786e7ccecee7889be
2017-02-25 01:11:04 +00:00
Chen Xu
d989558616 Merge "move ACTION_CARRIER_SETUP intent to public api" 2017-02-25 01:05:30 +00:00
fionaxu
181138d2d1 move ACTION_CARRIER_SETUP intent to public api
As per CDD: The "android.*" namespace for intent constants is reserved
for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.)
ACTION_CARRIER_SETUP intent is generally useful for carrier privileged
apps which is unbundled carrier apps, thus move to public APIs 33679956

Test: Manual
Bug: 33679956
Merged-in: I85dfa99d0b20bb1b534dfe8ead3c274a5c739786
Change-Id: I84ffd5f2c8c3418689ee3d5ff5ddc3f9f7959763
2017-02-24 10:45:12 -08:00
Marie Janssen
7b9f96983d Merge "Bluetooth: service for pairing notification"
am: 7dfc705ad9

Change-Id: Ib48d174e99ac1debd9cf578c222bdcfd5fc10ea1
2017-02-23 21:52:24 +00:00
Marie Janssen
d06d83c531 Bluetooth: service for pairing notification
Use a foreground service to show the notification, separating dialog
creation from the receiver.

Test: pair request from remote device while the screen is off
Bug: 35234069
Change-Id: Ia3be3e8efdacf465e095af5a498ef5eb0fca83cd
2017-02-21 14:43:40 -08:00
Philip P. Moltmann
afe6320d70 resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp
Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406
2017-02-14 09:51:34 -08:00
Philip P. Moltmann
9ac842a753 Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."" into nyc-mr2-dev 2017-02-14 16:03:28 +00:00
Philip P. Moltmann
b92663afb1 [DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."
This reverts commit 81758edffa.

Bug: 30662828
Change-Id: I5c877a3a888f075afcfb9f49ec92cf3ad43f6304
2017-02-13 23:44:55 +00:00
Pavlin Radoslavov
73aa2c6b3f Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c am: bd3f96703c
am: fae23e1e00

Change-Id: I55f901bee2b1a7368cf28cf0b2c6a89e8af27342
2017-02-11 01:31:52 +00:00
Pavlin Radoslavov
fae23e1e00 Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c
am: bd3f96703c

Change-Id: I04f7187c23a0f17c5ef2d37f75d892e4da54111e
2017-02-11 01:28:22 +00:00
Pavlin Radoslavov
bd3f96703c Merge "Add null pointer checks when updating A2DP configuration values"
am: 6f7437580c

Change-Id: I567042ca38e74e2ce228e4bb03c73095c8cf6513
2017-02-11 01:25:50 +00:00
Pavlin Radoslavov
c851f854bb Add null pointer checks when updating A2DP configuration values
Under expected circumstances, those null pointer checks are not
needed: onCreate() is always called before onCreateView(),
and the former creates the objects: mBluetoothSelectA2dpCodec,
mBluetoothSelectA2dpSampleRate, mBluetoothSelectA2dpBitsPerSample,
mBluetoothSelectA2dpChannelMode, mBluetoothSelectA2dpLdacPlaybackQuality .

For some unknown reason, somehow the following chain of calls is executed
before onCreate() :
  onCreateView() ->
  getActivity().registerReceiver(mBluetoothA2dpReceiver, ...) ->
  mBluetoothA2dpReceiver.onReceive(...) ->
  updateBluetoothA2dpConfigurationValues()

Adding the null pointer checks until the issue is understood.

Test: Code compilation
Bug: 35204511
Change-Id: I7c1d81015e66b26544b7b26f36cbc75f11713496
2017-02-10 12:52:04 -08:00
Marie Janssen
76405153d1 Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810 am: e7d5b13f53
am: deb32c220b

Change-Id: I9742b1388b6b8702df0459e77414e3eb273115a8
2017-02-10 18:20:28 +00:00
Marie Janssen
deb32c220b Merge "Remove Bluetooth autoconnect on dock" am: b65c7fc810
am: e7d5b13f53

Change-Id: I696af3c6b2c3a2538e93356041c16f9c7149265c
2017-02-10 18:18:00 +00:00
Marie Janssen
e7d5b13f53 Merge "Remove Bluetooth autoconnect on dock"
am: b65c7fc810

Change-Id: Id3cf62ca55ff39867041b495aa832e220fbf70ee
2017-02-10 18:15:28 +00:00
Treehugger Robot
b65c7fc810 Merge "Remove Bluetooth autoconnect on dock" 2017-02-10 18:12:01 +00:00
Sooraj Sasindran
f040f78303 Merge "Provide calling package name in cell info APIs"
am: 5c365f9b54

Change-Id: I342921d22c83aadd77b75078f5d5e9191c8b683f
2017-02-10 05:45:18 +00:00
Sooraj Sasindran
5c365f9b54 Merge "Provide calling package name in cell info APIs" 2017-02-10 05:38:41 +00:00
Marie Janssen
c2ab27e2f8 Remove Bluetooth autoconnect on dock
Test: compiles
Change-Id: I31305c70269c685893132f14975c32a051280afc
Fix: 35219649
2017-02-09 20:02:52 -08:00
Sooraj Sasindran
0ed4162914 Provide calling package name in cell info APIs
am: 63d90ed55d

Change-Id: Ia2a1d01f2bb8fb257f756f7df6dfbedb755e87b1
2017-02-10 03:04:08 +00:00