Commit Graph

35979 Commits

Author SHA1 Message Date
Suprabh Shukla
c62f6f30bc Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
am: 28f6dd01bc  -s ours

Change-Id: Ia95e462a6e007f0e87cfddb75b13f8ee7a89971a
2017-08-16 20:38:24 +00:00
Suprabh Shukla
5575d285db Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
am: 0e22588ed0  -s ours

Change-Id: I8025d40c5c1b3b6992d759a7f6a5355207236dff
2017-08-16 20:37:36 +00:00
Suprabh Shukla
28f6dd01bc Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours
am: a6b4e032c8  -s ours

Change-Id: I141ba4edaa9fa21b95d7f8d353764db26d9a5b6a
2017-08-16 20:24:28 +00:00
Suprabh Shukla
0e22588ed0 Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours
am: 142433924f  -s ours

Change-Id: Id62e3af77aba546d3a83a8467dc60af88fbf6083
2017-08-16 20:23:41 +00:00
Suprabh Shukla
a6b4e032c8 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours
am: df39274478  -s ours

Change-Id: I487f45dcd45eecbc587af45bdc748c842d6414d6
2017-08-16 20:18:15 +00:00
Suprabh Shukla
142433924f Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours
am: 3dd026d5dc  -s ours

Change-Id: I55000b3f1b300a833bb643816413a83d65ebedec
2017-08-16 20:17:28 +00:00
Suprabh Shukla
df39274478 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours
am: 05fec2162a  -s ours

Change-Id: I75623b15f15658930e459710fb46cc2f55d788e8
2017-08-16 20:09:35 +00:00
Suprabh Shukla
3dd026d5dc Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours
am: 6d7bb4c4d0  -s ours

Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf
2017-08-16 20:08:56 +00:00
Suprabh Shukla
05fec2162a Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours
am: b2f5566de5  -s ours

Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7
2017-08-16 20:04:24 +00:00
Suprabh Shukla
6d7bb4c4d0 Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
am: 817c35056c  -s ours

Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f
2017-08-16 20:03:34 +00:00
Suprabh Shukla
b2f5566de5 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours
am: de8e1f4be5  -s ours

Change-Id: I991cd251a7f54d16dff7df676aff5fed265a07d3
2017-08-16 19:59:04 +00:00
Suprabh Shukla
817c35056c Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
am: 2e6cf5dcde  -s ours

Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61
2017-08-16 19:55:14 +00:00
Suprabh Shukla
de8e1f4be5 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours
am: d22de194f5  -s ours

Change-Id: I953f903e7298541160ed8c17f274a832618c152e
2017-08-16 19:55:01 +00:00
Suprabh Shukla
d22de194f5 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours
am: 7bd8e120cb  -s ours

Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f
2017-08-16 19:51:02 +00:00
Suprabh Shukla
baf4375f01 Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
am: aedf7cdfdb  -s ours

Change-Id: I0a6af74c670ecfde23b1d5217f67ebccb14c0080
2017-08-16 19:49:08 +00:00
Suprabh Shukla
7bd8e120cb Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours
am: 0dba51f9f0  -s ours

Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389
2017-08-16 19:47:06 +00:00
Suprabh Shukla
2e6cf5dcde Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
am: 72beaddfd4  -s ours

Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1
2017-08-16 19:46:49 +00:00
Suprabh Shukla
0dba51f9f0 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours
am: 78a9d598f1  -s ours

Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b
2017-08-16 19:43:31 +00:00
Suprabh Shukla
aedf7cdfdb Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52
am: 616c84ccb0  -s ours

Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef
2017-08-16 19:40:30 +00:00
Suprabh Shukla
72beaddfd4 Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
am: ccad4a3621

Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f
2017-08-16 19:39:49 +00:00
Suprabh Shukla
78a9d598f1 Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2  -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63
2017-08-16 19:38:35 +00:00
Suprabh Shukla
616c84ccb0 Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
am: 1370eb3d52

Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126
2017-08-16 19:34:24 +00:00
Suprabh Shukla
ccad4a3621 Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece

Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd
2017-08-16 19:33:34 +00:00
Suprabh Shukla
93a9e9f7f2 Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05
2017-08-16 19:33:30 +00:00
Suprabh Shukla
1370eb3d52 Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
am: 1e9af33c41

Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa
2017-08-16 19:30:03 +00:00
Suprabh Shukla
d27e28eab7 Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429
2017-08-16 19:27:40 +00:00
Suprabh Shukla
26f4aceece Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250
2017-08-16 19:26:00 +00:00
Suprabh Shukla
1e9af33c41 Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67
2017-08-16 19:25:59 +00:00
Suprabh Shukla
08207f457d Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6
2017-08-16 19:22:01 +00:00
Nick Desaulniers
e625c2f64e Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804
2017-08-16 18:37:21 +00:00
Nick Desaulniers
f25a418e24 Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am: 33046b4ec2  -s ours

Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9
2017-08-16 18:34:27 +00:00
Treehugger Robot
33046b4ec2 Merge "DeviceInfoSettingsTest: test parsing llvm kernel" 2017-08-16 18:00:44 +00:00
Nick Desaulniers
4021eb5229 DeviceInfoSettingsTest: test parsing llvm kernel
Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.

Bug: 32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2
2017-08-16 09:51:41 -07:00
Suprabh Shukla
9ffee0d534 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.


Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:43:10 +00:00
Suprabh Shukla
8e08a9bb71 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 03:35:43 +00:00
Suprabh Shukla
af5d8b9b03 Disabling the activate button when paused
This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
2017-08-15 02:37:37 +00:00
mingliang.x.lei
c46b5e60b9 Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286
am: 8d3bb3e2ad

Change-Id: Iebccb788115a2be1fca3144199fc3e857a11556f
2017-08-09 18:36:33 +00:00
mingliang.x.lei
8d3bb3e2ad Merge "Fix memory leak in Bluetooth settings"
am: 5a652c0286

Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
2017-08-09 18:34:07 +00:00
Treehugger Robot
5a652c0286 Merge "Fix memory leak in Bluetooth settings" 2017-08-09 18:27:43 +00:00
Maurice Lam
d415cbfc0d Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
am: dbfde54fb6

Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
2017-08-08 23:05:55 +00:00
Maurice Lam
dbfde54fb6 Merge "Show help string when onEnrollmentHelp() is called"
am: 5a926705ef

Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
2017-08-08 22:56:38 +00:00
Maurice Lam
5a926705ef Merge "Show help string when onEnrollmentHelp() is called" 2017-08-08 22:02:20 +00:00
Bill Yi
335a436998 Import translations. DO NOT MERGE
am: c89d5b0093  -s ours

Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
2017-08-07 05:50:24 +00:00
Bill Yi
c89d5b0093 Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Jian Zhou
86535a3d15 Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb
am: 3aee5e1ad0

Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5
2017-07-27 18:24:10 +00:00
Ryusuke Sawa
6b46a9df49 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a
am: b0e008841f

Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d
2017-07-27 18:23:51 +00:00
Jian Zhou
3aee5e1ad0 Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am: 41b4d908bb

Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
2017-07-27 18:22:21 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
Treehugger Robot
41b4d908bb Merge "Settings: Fix SparseArray null pointer issue in monkey issues" 2017-07-27 18:16:08 +00:00
Treehugger Robot
fd7dec5d4a Merge "Show Error dialog when WPS is interrupted" 2017-07-27 18:15:35 +00:00