Eric Sandness
ba4e378cd5
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 am: 31f1136d1d
...
Change-Id: If0a1ad7c0a57e083017b72ccd446486d4f115889
2020-03-17 21:12:33 +00:00
Eric Sandness
248117ed17
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: 2f0b328750
...
Change-Id: Ibc4e63891aea6c75ecc8039b67b4739f987f6d3f
2020-03-17 21:03:10 +00:00
Eric Sandness
f9720237fc
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1
...
Change-Id: If1b396d0d51b0e6cf27dec1fd67aee92e81151f9
2020-03-17 21:02:58 +00:00
Eric Sandness
31f1136d1d
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17
...
Change-Id: I496a3bd8d3537355b746cdd275de7924c63bf064
2020-03-17 21:02:48 +00:00
Eric Sandness
2f0b328750
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea
...
Change-Id: I96d55ab5a3bfb3adf1fb76fae54d08e7f1bf11e6
2020-03-17 20:46:30 +00:00
Eric Sandness
ea2c433f17
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea
...
Change-Id: Ibe1ecf76d11cfcb70935c88fb5c0df69eeab567a
2020-03-17 20:46:06 +00:00
Eric Sandness
e6951038a1
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f
...
Change-Id: Ibec79237493fc8ac537a57588db0751fcd92f91c
2020-03-17 20:46:05 +00:00
Eric Sandness
29a37648ea
Use ChooseLockGeneric When Started By Admin App am: 7430932305
...
Change-Id: I1a2cacc0c556b9ebdedf579ffe8516b7851f02dd
2020-03-17 20:34:49 +00:00
Eric Sandness
66df88126f
Use ChooseLockGeneric When Started By Admin App am: 7430932305
...
Change-Id: I78fd46587c0d3c598867c972bb9c9df038b30a1b
2020-03-17 20:34:12 +00:00
Eric Sandness
7430932305
Use ChooseLockGeneric When Started By Admin App
...
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity. If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric. Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.
Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
2020-03-17 17:16:08 +00:00
Automerger Merge Worker
c8ada7e6ce
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours am: b7d23d13b8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2b0f6ab540998a2e3392d7ad5c7f5e025c03e82c
2020-03-17 16:10:32 +00:00
Automerger Merge Worker
fb47646e1f
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b am: 0eb0fce1be
...
Change-Id: I8be4153c518f3dcbb2437a365162f00075a24109
2020-03-17 16:10:22 +00:00
Automerger Merge Worker
47a206c730
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: b98a90bfa2 -s ours am: 8064cadb1a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3bcea10b5ff297b09d93280ab802866a2756be60
2020-03-17 15:57:10 +00:00
Automerger Merge Worker
96fd8defda
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: a62897caa5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I41cbef92e34842dce60c66296b12bd1e12ed1fc2
2020-03-17 15:56:38 +00:00
Automerger Merge Worker
5cadbf8bdf
Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp am: 47a86f9fe4
...
Change-Id: I7ef3699a50468e6ef89c2563067151d2cba20ce2
2020-03-17 15:55:49 +00:00
Automerger Merge Worker
c41ada31ec
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: 71a49d8c8b
...
Change-Id: I4b3d3346c7add55cd30444adb28a41e520603980
2020-03-17 15:55:22 +00:00
Automerger Merge Worker
b7d23d13b8
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iebba4194d915bfd2b104a16a8eae123999663a21
2020-03-17 15:55:21 +00:00
Automerger Merge Worker
0eb0fce1be
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b
...
Change-Id: I5fa9faddac76db810c6c4350ded943dc802405d2
2020-03-17 15:55:01 +00:00
Automerger Merge Worker
8064cadb1a
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: b98a90bfa2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic8470477a77d37ea21517396ee1acfa2434a7e1b
2020-03-17 15:43:38 +00:00
Automerger Merge Worker
0245d4c0f6
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I55acec4120aa0844e55e4591c6073a1902b00bbe
2020-03-17 15:43:36 +00:00
Automerger Merge Worker
a62897caa5
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I85c005713515e9397827f38651326f5f63d47f80
2020-03-17 15:43:25 +00:00
Automerger Merge Worker
47a86f9fe4
Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp
2020-03-17 15:42:59 +00:00
Automerger Merge Worker
71a49d8c8b
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793
...
Change-Id: I66efa1d7430a50a3a8f5bf6f04ade55377d2bfaf
2020-03-17 15:42:53 +00:00
Automerger Merge Worker
75ae98d1be
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932
...
Change-Id: Ia679b9dca2a3f98eca1647e276db82ff426c0791
2020-03-17 15:42:53 +00:00
Automerger Merge Worker
e4ff0ee00b
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793
...
Change-Id: If5483f1abf573bfef6b5c33931b4514952eff52f
2020-03-17 15:42:40 +00:00
Automerger Merge Worker
b98a90bfa2
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8ce297d4d28cbf33b51c59c9ed71c12044c211e3
2020-03-17 15:27:12 +00:00
Automerger Merge Worker
d9dcf5bed2
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I322de6c13adf1a7d3ca194d6b4b9a8d3f6a270d6
2020-03-17 15:27:08 +00:00
Automerger Merge Worker
b67ed25932
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
...
Change-Id: I7c2992488d3ab3d552a12e207093d1deffee4ded
2020-03-17 15:26:33 +00:00
Automerger Merge Worker
2779662793
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
...
Change-Id: I5c40a566a91465c230c98be2201d158c945c7103
2020-03-17 15:26:05 +00:00
Automerger Merge Worker
f9b7313545
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id75d1c9d9ba97160bfa72e8bcdde3a0407856157
2020-03-17 15:11:40 +00:00
Alex Johnston
e61aaaab51
Merge "Fix strings for certificate installation in Settings" into rvc-dev
2020-03-17 15:07:18 +00:00
Automerger Merge Worker
c07d8efd60
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: e735954a98 am: 5ebbcfcffc
...
Change-Id: I2031b25b6767f547110a59adfaacbb4ff6bbd20c
2020-03-17 14:26:51 +00:00
Automerger Merge Worker
5ebbcfcffc
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: e735954a98
...
Change-Id: I4cc601929f2ed4931ee70620361af01c03fd5da1
2020-03-17 14:14:30 +00:00
Automerger Merge Worker
943eafc205
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: 618ebc3fdf am: 1f15f102f4
...
Change-Id: Ifdab74bf168fa0e601c2a06d84349e13940bc7a2
2020-03-17 14:05:27 +00:00
Automerger Merge Worker
3f8733ddca
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: af6b6d2276
...
Change-Id: Id745b84d1ead45bdeb65224e949b678432231168
2020-03-17 14:05:20 +00:00
Automerger Merge Worker
9430e394a9
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 3be6478734 am: 9ca7eb9e70
...
Change-Id: Ic726a43a5351f978bebea143716c303940f4bdf9
2020-03-17 14:01:03 +00:00
Automerger Merge Worker
1f15f102f4
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: 618ebc3fdf
...
Change-Id: Ie00c26d735c95696f5dcaeaed56354adcbe82232
2020-03-17 13:48:16 +00:00
Automerger Merge Worker
e735954a98
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a
...
Change-Id: Ib20cbc26491d8b64b8971da3751da666e3878bbd
2020-03-17 13:48:15 +00:00
Automerger Merge Worker
af6b6d2276
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a
...
Change-Id: I3f07c8c044cfccbdfaf2f4b7f0274bff79a611e4
2020-03-17 13:48:00 +00:00
Automerger Merge Worker
042ed76cd9
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c am: a782ff473d
...
Change-Id: I6fe2033346739c8063676d7eb7b890d41f4a2389
2020-03-17 13:35:51 +00:00
Automerger Merge Worker
5826fc7933
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 4f19e358c8
...
Change-Id: I6fbaa60443140b003b97785a35698ec44582cdec
2020-03-17 13:35:39 +00:00
Automerger Merge Worker
9ca7eb9e70
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 3be6478734
...
Change-Id: I59b98492af621e8a1e548d334eaa2515a5690dd3
2020-03-17 13:35:29 +00:00
Automerger Merge Worker
618ebc3fdf
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
...
Change-Id: I5914dc21bfa9659fe8ad7abfff027aa10ab5c210
2020-03-17 13:28:15 +00:00
Automerger Merge Worker
a4ad8f636a
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
...
Change-Id: If102804bbb1335393bcd208f32cf66ab9a58e41d
2020-03-17 13:28:11 +00:00
Automerger Merge Worker
a782ff473d
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: c63489139c
...
Change-Id: I85bf952698a5407186fe560b9151ece6825ca348
2020-03-17 13:15:28 +00:00
Automerger Merge Worker
3be6478734
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2
...
Change-Id: I0d4b0f84938382a99d8898902ed290bbb2884b75
2020-03-17 13:15:17 +00:00
Automerger Merge Worker
4f19e358c8
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2
...
Change-Id: I4fd74c8dba82fb6d92147c6b72bcbbe142704ea1
2020-03-17 13:15:07 +00:00
Yanting Yang
9204d76c45
Merge "Remove the index of the homepage category tiles" into rvc-dev
2020-03-17 13:11:40 +00:00
Automerger Merge Worker
c63489139c
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
...
Change-Id: Ic2788de5e3d7926813d5f36293cef55f67edc131
2020-03-17 13:03:09 +00:00
Automerger Merge Worker
85b0f5fcd2
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
...
Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
2020-03-17 13:03:00 +00:00
