Commit Graph

30454 Commits

Author SHA1 Message Date
Steven Ng
56870f438c Fix phishing attack in ChooseLockGeneric
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
2017-05-17 18:37:01 +01:00
Steven Ng
a2af16bb34 Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev 2017-05-16 21:18:13 +00:00
Steven Ng
14153fd25b Fix phishing attack in ChooseLockGeneric
Cherry-pick of 436256c36d

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
2017-05-15 17:53:22 +00:00
Phil Weaver
8f58e8b6e9 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
am: 611fda4a97

Change-Id: I5dfd4f444b4d13c139d8119f0e879fe71de20ad2
2017-05-12 22:17:54 +00:00
Phil Weaver
611fda4a97 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239
am: 7f1bc85e4c

Change-Id: I3f92db015ad60b8e6257a71153a58a7883c1cac7
2017-05-12 22:16:26 +00:00
Phil Weaver
7f1bc85e4c Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a
am: 8247008239

Change-Id: Ieea167c11711139aff52c72c515b919240d7eb1a
2017-05-12 22:14:22 +00:00
Phil Weaver
8247008239 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
am: 9b8abd652a

Change-Id: I1eec44668bbd578003d3cc57763808ec2a80f0fa
2017-05-12 22:11:56 +00:00
Phil Weaver
9b8abd652a Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4
am: adf8f8bc60

Change-Id: Id26b90f8d4afbf6e50bc8e43afced432c70dba68
2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67
am: 11b6279ed4

Change-Id: I370c3f0ffc78f86b465d9721a753503b03d56d54
2017-05-12 22:07:24 +00:00
Phil Weaver
11b6279ed4 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
am: beb7f31d67

Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67 Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
am: 5d6d70a50e

Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e Don't enable a11y service if scary dialog obscured
am: 9a1b4eb21f

Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
2017-05-12 22:00:23 +00:00
Phil Weaver
9a1b4eb21f Don't enable a11y service if scary dialog obscured
Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
2017-05-09 10:51:32 -07:00
nharold
2e4950879a Merge "Update references to use PhoneConstantConversion" am: 79694e79d1
am: 98f209c6e5

Change-Id: I5c7760471d2e48df20955122507b503ca546954e
2017-05-06 02:07:30 +00: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 (苗苗)
b1480c8cab Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b
am: c6e3467cc2

Change-Id: If6ad081e117a94df84d041776649af63c392cc30
2017-05-02 17:46:41 +00: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
8b5389f707 Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
am: f8aaf9ecdc

Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
2017-05-01 23:17:29 +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
2151ee9b86 Merge "Limit btsnoop file size (4/8)" am: 7baae2a924
am: 7469ff3e1c

Change-Id: I34175cce212bd5c291481bee5758501b741f197c
2017-04-27 17:08:48 +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
4ccf08c6d4 Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb
am: 220e085953

Change-Id: Ia1596c05770c7ecf48830bf37f2f040c20931606
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

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
Marie Janssen
c7ad828691 Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
am: 28bbd5bacb

Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
2017-04-21 18:41:41 +00: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
bffc5230f7 Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
am: aaf9fdc5cf

Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
2017-04-20 23:22:27 +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
08cc4afc07 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913
am: 282a2317b9

Change-Id: I7775df15acf1cb74cad94e3e23dd6faf5d98412e
2017-04-13 17:27:36 +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
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  -s ours

Change-Id: I8ceb64d42fdb7853609ed94a8304ee71ac904e68
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  -s ours

Change-Id: Ib983d50a3e079c1cf72fddae475d10a441def7dd
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  -s ours

Change-Id: I5d559b468d1d6165162d78cbde84b45e05e7b5ec
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  -s ours

Change-Id: I0aafd94271cab6fd2fb9acebca3c41299ec9550f
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  -s ours

Change-Id: I3bb7c6e6f2a8abcad3304c43e611df855e79dad9
2017-04-12 20:10:07 +00:00