Commit Graph

30383 Commits

Author SHA1 Message Date
Shinji Sogo
27ca1272a5 Merge "Cleanup unused WifiP2pSettings code in WifiSettings"
am: cd1f7a3146

Change-Id: I18adec05022abe4d96f3aac2e893a5b5cbc7f2dc
2017-06-16 18:53:50 +00:00
Treehugger Robot
cd1f7a3146 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" 2017-06-16 18:41:42 +00:00
Shinji Sogo
ba1b520505 Cleanup unused WifiP2pSettings code in WifiSettings
Cleanup commented code giving access to WifiP2pSettings from option menu
is not needed anymore.

Bug: 38333540
Test: Manual test
Change-Id: I5884ec219ba09601d9602f026fa8ad89f765934f
2017-06-07 22:55:24 +00:00
Hiroki Yamamoto
56a8267f59 Merge "NFC: Reset Tap&pay summary text if default payment is not set"
am: e990bf3041

Change-Id: I2b2978a82a9dbee948b4e50f2b85978b9ddb58e5
2017-06-06 19:22:09 +00:00
Treehugger Robot
e990bf3041 Merge "NFC: Reset Tap&pay summary text if default payment is not set" 2017-06-06 19:12:55 +00:00
Hiroki Yamamoto
a322f6eab3 NFC: Reset Tap&pay summary text if default payment is not set
Reset Tap&pay summary text even default payment is null
to show the correct status that is no payment service.

Test: manual
Bug: 62366917
Change-Id: Ida9cf0b205e56163505862498b1ac4d679c2c92a
2017-06-06 11:23:03 +00:00
Thecrazyskull
6270dce2cd Merge "ConditionManager: don't crash when trying to add unexpected condition"
am: 46f7199cb1

Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac
2017-06-03 23:55:52 +00:00
Treehugger Robot
46f7199cb1 Merge "ConditionManager: don't crash when trying to add unexpected condition" 2017-06-03 23:49:39 +00:00
Mikhail Malakhov
933cdd5503 Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am: c7697e9b8a

Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
2017-06-03 22:16:48 +00:00
Treehugger Robot
c7697e9b8a Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" 2017-06-03 22:11:13 +00:00
Thecrazyskull
f7791d75bf ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition

Test: none

Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
2017-06-02 22:50:47 +00:00
Sheng Wang
161e3d14e1 Merge "Volume can not be updated in Sound&notification"
am: c0fdbab185

Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
2017-06-02 00:21:45 +00:00
Treehugger Robot
c0fdbab185 Merge "Volume can not be updated in Sound&notification" 2017-06-02 00:14:16 +00:00
Mikhail Malakhov
bd5729b7dc 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>
2017-06-02 00:38:27 +03:00
xudiwen
957c4d7720 Merge "NullPointerException when running monkey test in IccLockSettings"
am: 2c8d826b01

Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
2017-06-01 19:01:50 +00:00
Treehugger Robot
2c8d826b01 Merge "NullPointerException when running monkey test in IccLockSettings" 2017-06-01 18:51:44 +00:00
xudiwen
18615600ae 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>
2017-05-10 09:40:41 +08:00
nharold
98f209c6e5 Merge "Update references to use PhoneConstantConversion"
am: 79694e79d1

Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
2017-05-06 01:57:56 +00:00
nharold
79694e79d1 Merge "Update references to use PhoneConstantConversion" 2017-05-06 01:45:37 +00:00
Nathan Harold
01fc5e4ffc Update references to use PhoneConstantConversion
Bug: 33414487
Change-Id: I391671e38406235da48bddf61a70699974367e33
2017-05-02 13:44:27 -07:00
Miao Miao (苗苗)
c6e3467cc2 Merge "Settings crash when receiving data state broadcast"
am: 2ed42d009b

Change-Id: Ie0dcb238e132705022408e2f0cacd35597ff86f1
2017-05-02 17:44:08 +00:00
Treehugger Robot
2ed42d009b Merge "Settings crash when receiving data state broadcast" 2017-05-02 17:39:45 +00:00
Jaekyun Seok
f8aaf9ecdc Merge "Generate license html file from xml files of partitions"
am: 04a7e0a73a

Change-Id: I37430af516f99081e2bddcdd9eb4ae5d64a0c18d
2017-05-01 23:15:34 +00:00
Treehugger Robot
04a7e0a73a Merge "Generate license html file from xml files of partitions" 2017-05-01 23:08:19 +00:00
Jaekyun Seok
fa0242c2e3 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 74812873f4)
2017-05-01 22:10:06 +00:00
Ajay Panicker
7469ff3e1c Merge "Limit btsnoop file size (4/8)"
am: 7baae2a924

Change-Id: I62ac2896f84a32d622fcc139c42ead660f4945bc
2017-04-27 17:06:18 +00:00
Treehugger Robot
7baae2a924 Merge "Limit btsnoop file size (4/8)" 2017-04-27 17:02:05 +00:00
Miao Miao (苗苗)
e4b5d69493 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
2017-04-27 07:57:23 +00:00
rongrong.x.gao
220e085953 Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
am: 2503ea04fb

Change-Id: Ic3daed07e1d94ad7f4154affe51855d0462753a6
2017-04-27 04:05:09 +00:00
Treehugger Robot
2503ea04fb Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" 2017-04-27 03:56:27 +00:00
Ajay Panicker
9090f85a12 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
2017-04-27 00:15:16 +00:00
rongrong.x.gao
f5761e7b79 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
2017-04-25 13:39:01 +09:00
Sheng Wang
176ee343b4 Volume can not be updated in Sound&notification
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
2017-04-22 13:40:21 +09:00
Marie Janssen
28bbd5bacb Merge "Bluetooth: Make pairing notification cancellable"
am: 6c142b35b4

Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
2017-04-21 18:38:40 +00:00
Treehugger Robot
6c142b35b4 Merge "Bluetooth: Make pairing notification cancellable" 2017-04-21 18:31:46 +00:00
Anas Karbila
aaf9fdc5cf Merge "Settings: PreviewPagerAdapter: copy the full theme"
am: b6bbbc91ca

Change-Id: I083114a9c4658e8c02be0445bc0b54ba3b225217
2017-04-20 23:19:55 +00:00
Treehugger Robot
b6bbbc91ca Merge "Settings: PreviewPagerAdapter: copy the full theme" 2017-04-20 23:14:20 +00:00
Marie Janssen
c79470d089 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
2017-04-20 15:22:20 -07:00
Anas Karbila
ada2ea57b4 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
2017-04-20 20:11:00 +00:00
Anas Karbila
282a2317b9 Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
am: 31ec85a913

Change-Id: Ibaa2a738d9f14570be88968cf340d474118358a4
2017-04-13 17:22:04 +00:00
Treehugger Robot
31ec85a913 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" 2017-04-13 17:14:21 +00:00
Anas Karbila
e17dc5eeb0 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>
2017-04-13 13:04:41 +00:00
Honglu Yin
4604741c51 Merge "Title is different after tapping "Memory used by apps""
am: 7d9146e10a

Change-Id: I26268a618800ffacec55f26830d0d2a265efe8f8
2017-04-10 23:04:57 +00:00
Jack He
9e1e430f06 Merge "Add developer menu entry to enable Bluetooth inband ringing"
am: 3d08bedba2

Change-Id: I70542c676f8c738e0d846dd119a9af4ebc293175
2017-04-10 23:00:11 +00:00
Treehugger Robot
7d9146e10a Merge "Title is different after tapping "Memory used by apps"" 2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2 Merge "Add developer menu entry to enable Bluetooth inband ringing" 2017-04-10 22:47:55 +00:00
Marie Janssen
c27d7effb0 Merge "Bluetooth: only unregisterReceiver if we register"
am: 4dc556bda8

Change-Id: I3df22131a424007c5e0448166787598c7d77ea92
2017-04-06 00:14:07 +00:00
Marie Janssen
4dc556bda8 Merge "Bluetooth: only unregisterReceiver if we register" 2017-04-06 00:01:58 +00:00
Robin Lee
543a98806f Merge "RejectedExecutionException in DataUsageLIst"
am: 7a8121fdd9

Change-Id: I787cbc2abf247206d6945bdd4bda33479f78b634
2017-04-05 13:40:46 +00:00
Robin Lee
7a8121fdd9 Merge "RejectedExecutionException in DataUsageLIst" 2017-04-05 13:35:52 +00:00