Suprabh Shukla
81ba0cc873
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours am: 29c1777ca5
-s ours am: 694ab09ff3
-s ours am: a92a7e400f
-s ours am: cf0caf8f22
-s ours am: 3ce6d3ee87
-s ours
...
am: 202970aa92
-s ours
Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446
2017-08-16 20:10:37 +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
202970aa92
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours am: 29c1777ca5
-s ours am: 694ab09ff3
-s ours am: a92a7e400f
-s ours am: cf0caf8f22
-s ours
...
am: 3ce6d3ee87
-s ours
Change-Id: I8afbb6a39eb1cffe0cafc94a4b3c98629afce27c
2017-08-16 20:06:04 +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
3ce6d3ee87
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours am: 29c1777ca5
-s ours am: 694ab09ff3
-s ours am: a92a7e400f
-s ours
...
am: cf0caf8f22
-s ours
Change-Id: If3daaffd53e0ee3743f6f4a1608c5114cfa498b7
2017-08-16 20:02:33 +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
cf0caf8f22
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours am: 29c1777ca5
-s ours am: 694ab09ff3
-s ours
...
am: a92a7e400f
-s ours
Change-Id: I050ec3b9ce32d4a91add1447bab7845163348485
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
a92a7e400f
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours am: 29c1777ca5
-s ours
...
am: 694ab09ff3
-s ours
Change-Id: Ib0587f73a715928275159027c09286127d063684
2017-08-16 19:55:02 +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
Android Build Merger (Role)
910f4fb003
Merge "Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours am: f52c8ccbfc
-s ours" into oc-dr1-dev-plus-aosp
2017-08-16 19:51:50 +00:00
Suprabh Shukla
db8682996d
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours
...
am: baf4375f01
-s ours
Change-Id: I530a1f23f0a1804786fe3645a115176b53102a9b
2017-08-16 19:51:03 +00:00
Suprabh Shukla
9f458c77fd
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours am: aedf7cdfdb
-s ours
...
am: f52c8ccbfc
-s ours
Change-Id: I22a9fd9d0713277fa591b5a0ef7f6958931588b9
2017-08-16 19:51:03 +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
f52c8ccbfc
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d
am: 1e9af33c41
am: 1370eb3d52
am: 616c84ccb0
-s ours
...
am: aedf7cdfdb
-s ours
Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a
2017-08-16 19:48:33 +00:00
Suprabh Shukla
694ab09ff3
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours am: 9acf640efd
-s ours
...
am: 29c1777ca5
-s ours
Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197
2017-08-16 19:48:32 +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
29c1777ca5
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours am: 889036189b
-s ours
...
am: 9acf640efd
-s ours
Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0
2017-08-16 19:44:31 +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
9acf640efd
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
am: 24547155ea
-s ours
...
am: 889036189b
-s ours
Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994
2017-08-16 19:40:32 +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
889036189b
Disabling the activate button when paused am: de5df8b090
am: 779237e37f
...
am: 24547155ea
-s ours
Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2
2017-08-16 19:37:01 +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
24547155ea
Disabling the activate button when paused am: de5df8b090
...
am: 779237e37f
Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb
2017-08-16 19:32:31 +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
779237e37f
Disabling the activate button when paused
...
am: de5df8b090
Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055
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
4cdaebd0c4
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2
-s ours am: f25a418e24
...
am: e625c2f64e
Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b
2017-08-16 18:44:56 +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
de5df8b090
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:40:37 +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
Bill Yi
6ece6e96fb
Revert "Import translations. DO NOT MERGE"
...
am: d8d29f2964
-s ours
Change-Id: I6f29a8cc9f7667aa5209638e3caf1441216ea319
2017-08-14 13:35:42 +00:00
Bill Yi
d8d29f2964
Revert "Import translations. DO NOT MERGE"
...
This reverts commit a2a4037f59
.
Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import
2017-08-14 13:32:35 +00:00
Bill Yi
d3f28537a4
Import translations. DO NOT MERGE
...
am: a2a4037f59
-s ours
Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a
2017-08-12 18:39:26 +00:00