Commits · ad267bbe00193d1ed43fe3e55ec937f2ea53b9ef · halo / packages_apps_ManagedProvisioning

22 Jul, 2015 1 commit
- merge in mnc-dr-release history after reset to mnc-dr-dev · ad267bbe
  The Android Automerger authored 9 years ago
  
  ad267bbe
21 Jul, 2015 4 commits
- am 9c64d6b5: (-s ours) Import translations. DO NOT MERGE · d610e69b
  Geoff Mendal authored 9 years ago
```
* commit '9c64d6b5':
  Import translations. DO NOT MERGE
```
  d610e69b
- Import translations. DO NOT MERGE · a264f086
  Geoff Mendal authored 9 years ago
```
Change-Id: Iadfe5abf06ba885dec3c91b974ce3b82a1e8d99a
Auto-generated-cl: translation import
```
  a264f086
- Import translations. DO NOT MERGE · 9c64d6b5
  Geoff Mendal authored 9 years ago
```
Change-Id: I83dc2e145367f8947869300d4099e5a748e293f6
Auto-generated-cl: translation import
```
  9c64d6b5
- merge in mnc-dr-release history after reset to mnc-dr-dev · 56e16078
  The Android Automerger authored 9 years ago
  
  56e16078
20 Jul, 2015 1 commit

Import translations. DO NOT MERGE · b28a3f90

Geoff Mendal authored 9 years ago

Change-Id: Ie02da6538805f864fe96e2c309e62329ceb0830b
Auto-generated-cl: translation import

b28a3f90

19 Jul, 2015 1 commit
- merge in mnc-dr-release history after reset to mnc-dr-dev · 4071406c
  The Android Automerger authored 9 years ago
  
  4071406c
17 Jul, 2015 2 commits
- am 0e9f1183: Strings for the progress dialog shown when clearing FRP · f1c2dc56
  Esteban Talavera authored 9 years ago
```
* commit '0e9f1183':
  Strings for the progress dialog shown when clearing FRP
```
  f1c2dc56
- Strings for the progress dialog shown when clearing FRP · 0e9f1183
  Esteban Talavera authored 9 years ago
```
Bug: 22292322
Change-Id: I9c80c4f072be7a0f47a13fcbc51676414332cf69
```
  0e9f1183
16 Jul, 2015 1 commit
- merge in mnc-dr-release history after reset to mnc-dr-dev · b5ea5d2f
  The Android Automerger authored 9 years ago
  
  b5ea5d2f
15 Jul, 2015 4 commits
- Merge "Import translations. DO NOT MERGE" into mnc-dr-dev · 139ca533
  Geoff Mendal authored 9 years ago
  
  139ca533
- Import translations. DO NOT MERGE · c8d4b45a
  Geoff Mendal authored 9 years ago
```
Change-Id: I41bda8c9f08ee555aad1c4faf9d68812b8f1915c
Auto-generated-cl: translation import
```
  c8d4b45a
- am ac0d197d: (-s ours) Import translations. DO NOT MERGE · 05c0531a
  Geoff Mendal authored 9 years ago
```
* commit 'ac0d197d':
  Import translations. DO NOT MERGE
```
  05c0531a
- Import translations. DO NOT MERGE · ac0d197d
  Geoff Mendal authored 9 years ago
```
Change-Id: I35a3a3207563965504492c7caec810eb071d2eb6
Auto-generated-cl: translation import
```
  ac0d197d
14 Jul, 2015 1 commit
- merge in mnc-dr-release history after reset to mnc-dr-dev · 18311972
  The Android Automerger authored 9 years ago
  
  18311972
13 Jul, 2015 5 commits
- am 8e1c5db7: Check for invalid Wifi security type in ManagedProvisioning · e12df056
  Rubin Xu authored 9 years ago
```
* commit '8e1c5db7':
  Check for invalid Wifi security type in ManagedProvisioning
```
  e12df056
- am 073c85a3: Merge "Warn about theft protection in all provisioning flows." into mnc-dev · a7a0d81b
  Rubin Xu authored 9 years ago
```
* commit '073c85a3':
  Warn about theft protection in all provisioning flows.
```
  a7a0d81b
- am adcee75c: (-s ours) Import translations. DO NOT MERGE · 62e6170e
  Geoff Mendal authored 9 years ago
```
* commit 'adcee75c':
  Import translations. DO NOT MERGE
```
  62e6170e
- Check for invalid Wifi security type in ManagedProvisioning · 8e1c5db7
  Rubin Xu authored 9 years ago
```
Do not crash if invalid security type is provided.

Bug: 22426580
Change-Id: Ie0280f7e4aa336ef51c17b5bf5249a500d271bf6
```
  8e1c5db7
- Merge "Warn about theft protection in all provisioning flows." into mnc-dev · 073c85a3
  Rubin Xu authored 9 years ago
  
  073c85a3
12 Jul, 2015 1 commit
- merge in mnc-dr-release history after reset to mnc-dr-dev · 6f366988
  The Android Automerger authored 9 years ago
  
  6f366988
11 Jul, 2015 3 commits
- Import translations. DO NOT MERGE · 649dc46a
  Geoff Mendal authored 9 years ago
```
Change-Id: I86e9838ece83cb0f5ee674ebc132085e66cbfcef
Auto-generated-cl: translation import
```
  649dc46a
- Import translations. DO NOT MERGE · adcee75c
  Geoff Mendal authored 9 years ago
```
Change-Id: I8242ba5ff4bf0d5bd40ed4ac8a12908a5968660e
Auto-generated-cl: translation import
```
  adcee75c
- merge in mnc-dr-release history after reset to mnc-dr-dev · 6a347462
  The Android Automerger authored 9 years ago
  
  6a347462
10 Jul, 2015 3 commits
- Warn about theft protection in all provisioning flows. · 6f4ef25d
  Rubin Xu authored 9 years ago
```
Introduce consent dialog to NFC device owner flows if FRP is applicable.
Tweak user consent message to warn about theft protection being disabled.

Bug: 21941508

Change-Id: Icce131e0d45af2ec104d9b2465702e3f83f2a193
```
  6f4ef25d
- am b039f9de: Merge "call startActivityForResult on remove account intent" into mnc-dev · 3284ddf0
  Rubin Xu authored 9 years ago
```
* commit 'b039f9de':
  call startActivityForResult on remove account intent
```
  3284ddf0
- Merge "call startActivityForResult on remove account intent" into mnc-dev · b039f9de
  Rubin Xu authored 9 years ago
  
  b039f9de
09 Jul, 2015 3 commits
- call startActivityForResult on remove account intent · 0ed8f62f
  Rubin Xu authored 10 years ago
```
This is to allow the account authenticator to know ManagedProvisioning
is calling, so it can make its warning message more specific.

Bug: 19398713
Change-Id: Ie1ff98601dd035a1d53086c886de312a9ff711f3
```
  0ed8f62f
- am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary users" into mnc-dev · f9bab601
  Craig Lafayette authored 9 years ago
```
* commit '90d051c3':
  Don't show Wi-Fi select for EDU secondary users
```
  f9bab601
- Merge "Don't show Wi-Fi select for EDU secondary users" into mnc-dev · 90d051c3
  Craig Lafayette authored 9 years ago
  
  90d051c3
08 Jul, 2015 4 commits
- Don't show Wi-Fi select for EDU secondary users · 0a7e7664
  Craig Lafayette authored 9 years ago
```
Ensure that Wi-Fi selection doesn't show for secondary users
when a DIA is installed.

Bug: 22229283
Change-Id: I8279a409aaccbf4e9edc9acd4be7c4b9ac476dfe
```
  0a7e7664
- am a0cc1d21: (-s ours) Import translations. DO NOT MERGE · e91e0567
  Geoff Mendal authored 9 years ago
```
* commit 'a0cc1d21':
  Import translations. DO NOT MERGE
```
  e91e0567
- Import translations. DO NOT MERGE · a0cc1d21
  Geoff Mendal authored 9 years ago
```
Change-Id: I8b8dbc1c87872b6dbe2d7266a2b661345271f358
Auto-generated-cl: translation import
```
  a0cc1d21
- merge in mnc-dr-release history after reset to mnc-dr-dev · 6b02ebc2
  The Android Automerger authored 9 years ago
  
  6b02ebc2
07 Jul, 2015 2 commits
- am 0ed91ac2: Merge "Also fetch disabled activities when disabling system apps." into mnc-dev · 86820233
  Esteban Talavera authored 9 years ago
```
* commit '0ed91ac2':
  Also fetch disabled activities when disabling system apps.
```
  86820233
- Merge "Also fetch disabled activities when disabling system apps." into mnc-dev · 0ed91ac2
  Esteban Talavera authored 9 years ago
  
  0ed91ac2
06 Jul, 2015 4 commits
- merge in mnc-dr-release history after reset to mnc-dr-dev · 7f90370f
  The Android Automerger authored 9 years ago
  
  7f90370f
- am d03eacd8: (-s ours) Import translations. DO NOT MERGE · 7148615f
  Geoff Mendal authored 9 years ago
```
* commit 'd03eacd8':
  Import translations. DO NOT MERGE
```
  7148615f
- Import translations. DO NOT MERGE · d03eacd8
  Geoff Mendal authored 9 years ago
```
Change-Id: I699d44e8d89f6003ea2ac78ba78145dadaf28d77
Auto-generated-cl: translation import
```
  d03eacd8
- Merge "Comment that account migration must happen after setting the profile owner." into mnc-dev · 2cee833b
  Benjamin Franz authored 9 years ago
  
  2cee833b