OSDN Git Service
Thecrazyskull [Sat, 3 Jun 2017 23:55:52 +0000 (23:55 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
am:
46f7199cb1
Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac
Treehugger Robot [Sat, 3 Jun 2017 23:49:37 +0000 (23:49 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
Mikhail Malakhov [Sat, 3 Jun 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am:
c7697e9b8a
Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
Treehugger Robot [Sat, 3 Jun 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
Thecrazyskull [Thu, 2 Mar 2017 19:55:59 +0000 (14:55 -0500)]
ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
Sheng Wang [Fri, 2 Jun 2017 00:21:45 +0000 (00:21 +0000)]
Merge "Volume can not be updated in Sound¬ification"
am:
c0fdbab185
Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
Treehugger Robot [Fri, 2 Jun 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Volume can not be updated in Sound¬ification"
Mikhail Malakhov [Thu, 20 Oct 2016 19:45:18 +0000 (22:45 +0300)]
Sometime, Settings app crash when AllowBindAppWidgetActivity closing
Process: com.android.settings
E AndroidRuntime: java.lang.RuntimeException:
Unable to destroy activity {com.android.settings/
com.android.settings.AllowBindAppWidgetActivity}:
java.lang.IllegalArgumentException: Receiver not registered:
android.app.Activity$1@
5817135
Change-Id: I0f8b61f4c1772b43bffd949928ccaafd295f5fac
Signed-off-by: Mikhail Malakhov <malakhv@gmail.com>
xudiwen [Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
am:
2c8d826b01
Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
Treehugger Robot [Thu, 1 Jun 2017 18:51:43 +0000 (18:51 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
xudiwen [Tue, 9 May 2017 09:30:57 +0000 (17:30 +0800)]
NullPointerException when running monkey test in IccLockSettings
In Android N, finish() in onCreate() cannot avoid onViewCreated() lifecycle
in Fragment, so a crash occurs in com.android.settings.IccLockSettings
because of insecure call in updatePreference().
It's a tiny bug only appears when running monkey test.
Test: run monkey test with page IccLockSettings.
This bug was reported to Google Issue Tracker.
Link: https://issuetracker.google.com/issues/38152568
Change-Id: I143b046fd7ac5ffba55e51254c7dd068274d342e
Signed-off-by: xudiwen <xudiwen@xiaomi.com>
nharold [Sat, 6 May 2017 01:57:56 +0000 (01:57 +0000)]
Merge "Update references to use PhoneConstantConversion"
am:
79694e79d1
Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge "Update references to use PhoneConstantConversion"
Nathan Harold [Tue, 20 Dec 2016 01:50:34 +0000 (17:50 -0800)]
Update references to use PhoneConstantConversion
Bug:
33414487
Change-Id: I391671e38406235da48bddf61a70699974367e33
Miao Miao (苗苗) [Tue, 2 May 2017 17:44:08 +0000 (17:44 +0000)]
Merge "Settings crash when receiving data state broadcast"
am:
2ed42d009b
Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
Treehugger Robot [Tue, 2 May 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Settings crash when receiving data state broadcast"
Jaekyun Seok [Mon, 1 May 2017 23:15:34 +0000 (23:15 +0000)]
Merge "Generate license html file from xml files of partitions"
am:
04a7e0a73a
Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
Treehugger Robot [Mon, 1 May 2017 23:08:17 +0000 (23:08 +0000)]
Merge "Generate license html file from xml files of partitions"
Jaekyun Seok [Tue, 18 Apr 2017 06:22:01 +0000 (15:22 +0900)]
Generate license html file from xml files of partitions
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug:
37099941
Merged-In: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
(cherry picked from commit
74812873f41adbd34ab3ff4fbd7dcbb8f6fde233)
Ajay Panicker [Thu, 27 Apr 2017 17:06:18 +0000 (17:06 +0000)]
Merge "Limit btsnoop file size (4/8)"
am:
7baae2a924
Change-Id: I62ac2896f84a32d622fcc139c42ead660f4945bc
Treehugger Robot [Thu, 27 Apr 2017 17:02:03 +0000 (17:02 +0000)]
Merge "Limit btsnoop file size (4/8)"
Miao Miao (苗苗) [Tue, 14 Mar 2017 07:51:54 +0000 (15:51 +0800)]
Settings crash when receiving data state broadcast
Stress/Stability testing, Settings crash when receiving data state
broadcast
Solution: Do null judgement before function was called
Test: Stress/Stability test
Change-Id: Id71448ed89eeffcea268c4a2e7154d9ea7639db4
rongrong.x.gao [Thu, 27 Apr 2017 04:05:09 +0000 (04:05 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
am:
2503ea04fb
Change-Id: Ic3daed07e1d94ad7f4154affe51855d0462753a6
Treehugger Robot [Thu, 27 Apr 2017 03:56:27 +0000 (03:56 +0000)]
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
Ajay Panicker [Tue, 18 Apr 2017 03:46:29 +0000 (20:46 -0700)]
Limit btsnoop file size (4/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
rongrong.x.gao [Mon, 18 Apr 2016 07:46:06 +0000 (15:46 +0800)]
Fix MUT cannot connect to AP by WPS after rotating MUT
While MUT is connecting to AP, rotate MUT,
then MUT can not connect to AP by WPS.
To ensure MUT can connect to AP by WPS, invoke startWps() to
re-connect after rotating MUT.
Bug:
37557898
Change-Id: Icbaff96895ad52f5c1bc6df5d180f69989527667
Sheng Wang [Fri, 19 Aug 2016 09:09:32 +0000 (17:09 +0800)]
Volume can not be updated in Sound¬ification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.
To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.
Bug:
37558283
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
Marie Janssen [Fri, 21 Apr 2017 18:38:40 +0000 (18:38 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
am:
6c142b35b4
Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
Treehugger Robot [Fri, 21 Apr 2017 18:31:44 +0000 (18:31 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
Anas Karbila [Thu, 20 Apr 2017 23:19:55 +0000 (23:19 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
am:
b6bbbc91ca
Change-Id: I083114a9c4658e8c02be0445bc0b54ba3b225217
Treehugger Robot [Thu, 20 Apr 2017 23:14:18 +0000 (23:14 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
Marie Janssen [Wed, 19 Apr 2017 20:47:07 +0000 (13:47 -0700)]
Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug:
36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
Anas Karbila [Thu, 20 Apr 2017 12:44:13 +0000 (21:44 +0900)]
Settings: PreviewPagerAdapter: copy the full theme
getThemeResId() returns the theme resource id which is defined inside AndroidManifest.xml.
If you set a theme via code (or add extra attributes using applyStyle method), the new theme will not be carried over.
Fix this by using setTo method with the context theme as argument.
Issue: https://issuetracker.google.com/
37543358
Test: set new theme via code (or add extra attributes using applyStyle method) and check if they are carried over to the configContext context
Change-Id: I82739fe47b2d5b2d05da4cb3759b630b10dc8c8f
Anas Karbila [Thu, 13 Apr 2017 17:22:04 +0000 (17:22 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
am:
31ec85a913
Change-Id: Ibaa2a738d9f14570be88968cf340d474118358a4
Treehugger Robot [Thu, 13 Apr 2017 17:14:21 +0000 (17:14 +0000)]
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
Anas Karbila [Sat, 8 Apr 2017 10:48:43 +0000 (19:48 +0900)]
Settings: Fix wrong wifi drawable in screen zooming preview
We should use the same wifi drawable for the screen
zooming preview as the one the real settings menu
is using.
Change-Id: Ibb0d45b9f5aa431b52864aa826ea84c49b2d3fa0
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Honglu Yin [Mon, 10 Apr 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Title is different after tapping "Memory used by apps""
am:
7d9146e10a
Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8
Jack He [Mon, 10 Apr 2017 23:00:11 +0000 (23:00 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
am:
3d08bedba2
Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
Treehugger Robot [Mon, 10 Apr 2017 22:53:07 +0000 (22:53 +0000)]
Merge "Title is different after tapping "Memory used by apps""
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer menu entry to enable Bluetooth inband ringing"
Marie Janssen [Thu, 6 Apr 2017 00:14:07 +0000 (00:14 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register"
am:
4dc556bda8
Change-Id: I3df22131a424007c5e0448166787598c7d77ea92
Marie Janssen [Thu, 6 Apr 2017 00:01:58 +0000 (00:01 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register"
Robin Lee [Wed, 5 Apr 2017 13:40:46 +0000 (13:40 +0000)]
Merge "RejectedExecutionException in DataUsageLIst"
am:
7a8121fdd9
Change-Id: I787cbc2abf247206d6945bdd4bda33479f78b634
Robin Lee [Wed, 5 Apr 2017 13:35:51 +0000 (13:35 +0000)]
Merge "RejectedExecutionException in DataUsageLIst"
Jack He [Fri, 31 Mar 2017 17:51:22 +0000 (10:51 -0700)]
Add developer menu entry to enable Bluetooth inband ringing
Bug:
19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
Hemant Gupta [Mon, 3 Apr 2017 17:50:36 +0000 (17:50 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am:
e270a6aa85
Change-Id: Ia5108737add480f2cce52663f13d496653c37320
Treehugger Robot [Mon, 3 Apr 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
Bill Yi [Sat, 1 Apr 2017 23:45:18 +0000 (16:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36832302
Change-Id: I940468be84cb7790fb9c205c3648e526a4b32422
Amit Mahajan [Thu, 30 Mar 2017 22:05:41 +0000 (22:05 +0000)]
Merge "Fix mvno match data is incorrect for APNs"
am:
a604afe5de
Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
Amit Mahajan [Thu, 30 Mar 2017 21:59:33 +0000 (21:59 +0000)]
Merge "Fix mvno match data is incorrect for APNs"
tiansiming [Mon, 6 Mar 2017 14:30:34 +0000 (22:30 +0800)]
RejectedExecutionException in DataUsageLIst
RejectedPolicy throw Exception which will interrupt users
Bug: https://code.google.com/p/android/issues/detail?id=237575
Test: open as many online apps as possible and then open the DataUsageList
Change-Id: I2dabc6ee53cd0f27f59098328fe2a16172f71d0b
Wei Huang [Mon, 23 Jan 2017 11:26:20 +0000 (20:26 +0900)]
Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug:
34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
Pavlin Radoslavov [Wed, 29 Mar 2017 22:47:40 +0000 (22:47 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
eeabd6b463
Change-Id: I1ead14c5b587c9934fcd1fff450221cf83c16a3d
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
Pavlin Radoslavov [Fri, 24 Feb 2017 18:25:09 +0000 (10:25 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: I6e3144ff93bfc289fb25f4961fc00f39e8222290
Hemant Gupta [Wed, 1 Mar 2017 09:36:58 +0000 (15:06 +0530)]
Bluetooth: Fix Resource Leak in OPP (1/2)
Handle onDestroy in DevicePickerFragment class, which would be
called when user presses back button and does not select any device.
This will send intent to class that called DevicePickerFragment that
no device is selected.
Test: Performed the usecase overnight and see if no crash is observed.
Bug:
35626275
Change-Id: Ib3965d7dea8d59b244abdc6ffe61ef21109346fb
Robin Lee [Wed, 29 Mar 2017 12:34:39 +0000 (12:34 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage"
am:
ec6da66728
Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
Robin Lee [Wed, 29 Mar 2017 12:29:35 +0000 (12:29 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage"
tiansiming [Tue, 7 Mar 2017 02:46:13 +0000 (10:46 +0800)]
Optimize code on get UidDetail in AppDataUsage
The class UidDetailProvider providers details about a specific UID,
we can directly apply it here.
Optimize: https://code.google.com/p/android/issues/detail?id=237810
Test: for case TrafficStats.UID_REMOVED
1.add an new User
2.generate some data traffic under the new user
3.switch to the phone owner
4.delete the User added just now
5.go to Data usage and open the item "Removed apps and users"
for case TrafficStats.UID_TETHERING
1.open tethering and generate some data traffic
2.go to Data usage and open the item "Tethering & portable hotspot"
Change-Id: I05aa522728b296d6c06580adf809f274491cdcea
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
fen wang [Tue, 28 Mar 2017 05:03:43 +0000 (05:03 +0000)]
Merge "Initialize LDAC to ABR mode"
am:
f80b445166
Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Initialize LDAC to ABR mode"
fen wang [Mon, 13 Mar 2017 10:57:25 +0000 (19:57 +0900)]
Initialize LDAC to ABR mode
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Steven Moreland [Tue, 28 Mar 2017 01:18:00 +0000 (01:18 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
am:
21de66bc0c
Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
Treehugger Robot [Tue, 28 Mar 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
Robin Lee [Mon, 27 Mar 2017 16:22:56 +0000 (16:22 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
am:
fb81f50c27
Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
Robin Lee [Mon, 27 Mar 2017 16:18:19 +0000 (16:18 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
Zhihong Li [Sat, 25 Mar 2017 04:21:03 +0000 (04:21 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode"
am:
4cc1f72576
Change-Id: Id60415285629e6d7a712a9f441e6e7839732bf94
Treehugger Robot [Sat, 25 Mar 2017 04:14:57 +0000 (04:14 +0000)]
Merge "Show correct Wi-Fi status when switching to multi window mode"
Ajay Panicker [Sat, 25 Mar 2017 01:00:51 +0000 (01:00 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get"
am:
84cf0b2a4b
Change-Id: I21a5388ee633edb4f7b59a61390b71ea59df7205
Treehugger Robot [Sat, 25 Mar 2017 00:58:13 +0000 (00:58 +0000)]
Merge "Add default value to Bluetooth AVRCP version property get"
liurong [Fri, 24 Mar 2017 12:11:48 +0000 (20:11 +0800)]
[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>
Marie Janssen [Thu, 23 Mar 2017 21:36:45 +0000 (14:36 -0700)]
Bluetooth: only unregisterReceiver if we register
We can get to onDestroy() without registering now.
Test: none
Fixes:
36501241
Change-Id: I90da3b350f9951993238d51f9fde86ccb335cafd
Ajay Panicker [Thu, 23 Mar 2017 00:43:51 +0000 (17:43 -0700)]
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
Ajay Panicker [Thu, 23 Mar 2017 17:56:28 +0000 (17:56 +0000)]
Merge "AVRCP version interop pereference (2/3)"
am:
db66a7b664
Change-Id: Ia70a81c027d2e81b01f279c2816de41ef915c0f8
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (2/3)"
Steven Moreland [Thu, 23 Mar 2017 05:07:46 +0000 (05:07 +0000)]
Revert "Development Options: toggle binderized hals"
This reverts commit
73dd0ae30e2779cb845d1ac6e785d619e1e1e310.
Reason for revert: b/
34274385 - This was a temporary setting.
Change-Id: I98b2d05c431bb5361b11cd3b05b7f5ac4e939e0e
Sanket Padawe [Thu, 23 Mar 2017 00:45:56 +0000 (00:45 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am:
bd9ce2e4b1
Change-Id: I361f7c1747ab1f16cce149d78cc219f83a16948c
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000 (21:27 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
Ajay Panicker [Mon, 20 Mar 2017 18:34:54 +0000 (11:34 -0700)]
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
Sanket Padawe [Mon, 20 Mar 2017 22:08:07 +0000 (15:08 -0700)]
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug:
35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Merged-in: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Marie Janssen [Mon, 20 Mar 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Bluetooth: stop pairing service correctly"
am:
4e32e87e57
Change-Id: Ied66e2bf14771853be46c09b0720c9978d53e3c9
Treehugger Robot [Mon, 20 Mar 2017 21:37:37 +0000 (21:37 +0000)]
Merge "Bluetooth: stop pairing service correctly"
Marie Janssen [Mon, 20 Mar 2017 18:01:19 +0000 (11:01 -0700)]
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
liurong [Thu, 16 Mar 2017 17:27:51 +0000 (17:27 +0000)]
Merge "Optimized Code: call direct method to get integer extra"
am:
b7fa46453a
Change-Id: Ib7194de15766eb4912e7bbd43b308bd51dd5496a
Treehugger Robot [Thu, 16 Mar 2017 17:23:29 +0000 (17:23 +0000)]
Merge "Optimized Code: call direct method to get integer extra"
liurong [Thu, 16 Mar 2017 11:52:40 +0000 (19:52 +0800)]
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>
Marie Janssen [Wed, 15 Mar 2017 22:57:38 +0000 (22:57 +0000)]
Merge "Bluetooth: leave screen off for permission request"
am:
172b01035d
Change-Id: Id768f3a4cdbb4286cd1096f94b6fb5b11bae6cc8
Treehugger Robot [Wed, 15 Mar 2017 22:49:56 +0000 (22:49 +0000)]
Merge "Bluetooth: leave screen off for permission request"
Jay [Wed, 15 Mar 2017 19:18:43 +0000 (19:18 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode"
am:
31f64a1253
Change-Id: I15f05538344aa615a4f69eebf7fdec66efc3cf29
Treehugger Robot [Wed, 15 Mar 2017 19:11:25 +0000 (19:11 +0000)]
Merge "Improve Wi-Fi Settings UI in guest mode"
Jay [Thu, 14 Jul 2016 08:31:03 +0000 (16:31 +0800)]
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
Jeff Sharkey [Sun, 12 Mar 2017 23:09:11 +0000 (23:09 +0000)]
Merge "Fix network name for Passpoint network"
am:
742bd03f12
Change-Id: Ia9ae9d6034f72be5f8d34340efce5b52d71fa6c2
Jeff Sharkey [Sun, 12 Mar 2017 23:03:20 +0000 (23:03 +0000)]
Merge "Fix network name for Passpoint network"
Marie Janssen [Fri, 10 Mar 2017 17:28:06 +0000 (09:28 -0800)]
Bluetooth: leave screen off for permission request
Test: pair to a carkit, disable pbap, reconnect from carkit
Bug:
32555940
Change-Id: I06d6cc0873f9f991e68f1de9b629dbe3a7bb7701
Zhihong Li [Fri, 23 Sep 2016 01:38:42 +0000 (09:38 +0800)]
Show correct Wi-Fi status when switching to multi window mode
In WifiSettings, when switching to multi window mode,
WifiSettings fragment is recreated and "onPause()" is called,
then WifiTracker stops and wrong Wi-Fi status is shown.
Move "WifiTracker.startTracking()" to "onStart()",
"WifiTracker.stopTracking()" to "onStop()"
to make sure to show correct Wi-Fi status.
Bug:
36078677
Test: Manual test OK
Change-Id: I215f180b1082f6039c03de8b4a3ca27d1f364c75
Jaewoong Jung [Tue, 7 Mar 2017 02:27:15 +0000 (02:27 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment."
am:
084c20409b
Change-Id: Ic0abdcd7a7de944b3348590cdfa922fcf1dcbed1
Treehugger Robot [Mon, 6 Mar 2017 23:02:12 +0000 (23:02 +0000)]
Merge "Changes event handling phases for DeviceListPreferenceFragment."
Jaewoong Jung [Thu, 13 Oct 2016 18:08:22 +0000 (11:08 -0700)]
Changes event handling phases for DeviceListPreferenceFragment.
Bug:
31273140
Test: Manual inspection.
Change-Id: If4622b8d367813eb86a54a45f2e8fa4a55ca38b1
(cherry picked from commit
e8d5c8fda16c75e4bcca3a218bc5cf7b254baa99)
Lorenzo Colitti [Mon, 6 Mar 2017 04:04:55 +0000 (04:04 +0000)]
Merge "Display the correct default for mobile data always on."
am:
737d42a0db
Change-Id: I5302cc5cc7d0847e127fcbf8af42fb6eef54c303
Treehugger Robot [Mon, 6 Mar 2017 03:57:50 +0000 (03:57 +0000)]
Merge "Display the correct default for mobile data always on."