Jaekyun Seok
8b5389f707
Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
...
am: f8aaf9ecdc
2017-05-01 23:17:29 +00:00
Jaekyun Seok
f8aaf9ecdc
Merge "Generate license html file from xml files of partitions"
...
am: 04a7e0a73a
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
2151ee9b86
Merge "Limit btsnoop file size (4/8)" am: 7baae2a924
...
am: 7469ff3e1c
2017-04-27 17:08:48 +00:00
Ajay Panicker
7469ff3e1c
Merge "Limit btsnoop file size (4/8)"
...
am: 7baae2a924
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
rongrong.x.gao
4ccf08c6d4
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb
...
am: 220e085953
2017-04-27 04:07:11 +00:00
rongrong.x.gao
220e085953
Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
...
am: 2503ea04fb
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
Marie Janssen
c7ad828691
Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
...
am: 28bbd5bacb
2017-04-21 18:41:41 +00:00
Marie Janssen
28bbd5bacb
Merge "Bluetooth: Make pairing notification cancellable"
...
am: 6c142b35b4
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
bffc5230f7
Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
...
am: aaf9fdc5cf
2017-04-20 23:22:27 +00:00
Anas Karbila
aaf9fdc5cf
Merge "Settings: PreviewPagerAdapter: copy the full theme"
...
am: b6bbbc91ca
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
08cc4afc07
Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913
...
am: 282a2317b9
2017-04-13 17:27:36 +00:00
Anas Karbila
282a2317b9
Merge "Settings: Fix wrong wifi drawable in screen zooming preview"
...
am: 31ec85a913
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
Dmitry Dementyev
53e173c379
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours am: d4d2b47d48 -s ours
...
am: 521e705eaf
2017-04-12 20:32:11 +00:00
Dmitry Dementyev
521e705eaf
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours am: 43e154604a -s ours
...
am: d4d2b47d48
2017-04-12 20:26:40 +00:00
Dmitry Dementyev
d4d2b47d48
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours am: ed6872b3d5 -s ours
...
am: 43e154604a
2017-04-12 20:21:39 +00:00
Dmitry Dementyev
43e154604a
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours am: 89657550ac -s ours
...
am: ed6872b3d5
2017-04-12 20:15:40 +00:00
Dmitry Dementyev
ed6872b3d5
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours am: 704c02db08 -s ours
...
am: 89657550ac
2017-04-12 20:10:07 +00:00
Dmitry Dementyev
89657550ac
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours am: b23bdee761 -s ours
...
am: 704c02db08
2017-04-12 20:04:11 +00:00
Dmitry Dementyev
704c02db08
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours am: 56dc835f3c -s ours
...
am: b23bdee761
2017-04-12 20:00:05 +00:00
Dmitry Dementyev
b23bdee761
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours am: 5f32a5b5f3 -s ours
...
am: 56dc835f3c
2017-04-12 19:54:06 +00:00
Dmitry Dementyev
56dc835f3c
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours am: 2d9593f8f1 -s ours
...
am: 5f32a5b5f3
2017-04-12 19:49:07 +00:00
Dmitry Dementyev
5f32a5b5f3
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours am: 13b12fd61d -s ours
...
am: 2d9593f8f1
2017-04-12 19:44:05 +00:00
Dmitry Dementyev
2d9593f8f1
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours am: 22db6274bf -s ours
...
am: 13b12fd61d
2017-04-12 19:37:33 +00:00
Dmitry Dementyev
13b12fd61d
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054 -s ours
...
am: 22db6274bf
2017-04-12 19:32:36 +00:00
Dmitry Dementyev
22db6274bf
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
...
am: 0c07b38054
2017-04-12 19:26:32 +00:00
Dmitry Dementyev
0c07b38054
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
...
am: bac5163a9a
2017-04-12 19:21:36 +00:00
Dmitry Dementyev
bac5163a9a
Add permission check to Intents used by Authenticator Settings.
...
am: ea55e6331e
2017-04-12 19:16:01 +00:00
Honglu Yin
b9b563d243
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
...
am: 4604741c51
2017-04-10 23:22:49 +00:00
Jack He
336a7ccca7
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
...
am: 9e1e430f06
2017-04-10 23:11:42 +00:00
Honglu Yin
4604741c51
Merge "Title is different after tapping "Memory used by apps""
...
am: 7d9146e10a
2017-04-10 23:04:57 +00:00
Jack He
9e1e430f06
Merge "Add developer menu entry to enable Bluetooth inband ringing"
...
am: 3d08bedba2
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
f72e86f332
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8
...
am: c27d7effb0
2017-04-06 00:17:05 +00:00
Marie Janssen
c27d7effb0
Merge "Bluetooth: only unregisterReceiver if we register"
...
am: 4dc556bda8
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
1f9c67e982
Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9
...
am: 543a98806f
2017-04-05 13:43:17 +00:00
Robin Lee
543a98806f
Merge "RejectedExecutionException in DataUsageLIst"
...
am: 7a8121fdd9
2017-04-05 13:40:46 +00:00
