summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix NullPointerException when showing DeleteManagedProfileDialogRubin Xu2015-08-141-1/+4
| | | | | | | | | | If the device has a managed profile but the corresponding DPC is removed from primary user, show default DPC icon and name instead of crashing NullPointerException when starting ManagedProvisioning and asking user to confirm deleting existing profile. Bug: 23204984 Change-Id: I5e75c2883148b743b842568ff33ae43e3016d784
* Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" into mnc-devJukka Zitting2015-08-041-1/+1
|\
| * Increase Wi-Fi connection timeout from 30 to 60 secondsJukka Zitting2015-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our reliability testing lab we're seeing around 2% of provisioning attempts fail because of Wi-Fi connection timeouts. In these somewhat rare cases establishing the connection takes more than 30 seconds, which causes the "Couldn't connect to Wi-Fi" dialog to pop up a few seconds before the connection actually does come up. This change reduces the rate of this false positive to less than 0.1% in our test environment (failure rate at 45s would be about 0.5%), and should improve the experience of the unlucky users who otherwise would hit this issue. The downside is that users with incorrect Wi-Fi settings will have to wait a bit longer before encountering this error. Bug: 22770007 - AddWifiNetworkTask times out too soon Change-Id: Icb07d29fbc603901839bc067abd1b2f590d23bcb
* | Set device owner as profile owners on secondary usersRubin Xu2015-07-291-0/+13
|/ | | | | | | Only applies to device iniitializer case. Bug: 21800830 Change-Id: Ibbd3200b342839a2d785a3943eabb76747856b36
* Ensure ManagedProvisioning finish() calls set result code.Alan Treadway2015-07-224-6/+10
| | | | | | | | | | | | To allow DPC apps to reliably differentiate between success and failure cases when invoking ManagedProvisioning via startActivityForResult(), this change attempts to ensure that all exit points set the returned result code to an appropriate value. Specifically, RESULT_CANCELED in all cases except provisioning success. Bug: 21063241 Change-Id: I15b1179127b5b85c4b8df1718702818684ded7c7
* Check for invalid Wifi security type in ManagedProvisioningRubin Xu2015-07-131-1/+10
| | | | | | | Do not crash if invalid security type is provided. Bug: 22426580 Change-Id: Ie0280f7e4aa336ef51c17b5bf5249a500d271bf6
* Merge "Warn about theft protection in all provisioning flows." into mnc-devRubin Xu2015-07-133-4/+34
|\
| * Warn about theft protection in all provisioning flows.Rubin Xu2015-07-103-4/+34
| | | | | | | | | | | | | | | | | | 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
* | Merge "call startActivityForResult on remove account intent" into mnc-devRubin Xu2015-07-101-2/+1
|\ \
| * | call startActivityForResult on remove account intentRubin Xu2015-07-091-2/+1
| |/ | | | | | | | | | | | | | | 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
* / Don't show Wi-Fi select for EDU secondary usersCraig Lafayette2015-07-084-4/+10
|/ | | | | | | | Ensure that Wi-Fi selection doesn't show for secondary users when a DIA is installed. Bug: 22229283 Change-Id: I8279a409aaccbf4e9edc9acd4be7c4b9ac476dfe
* Merge "Also fetch disabled activities when disabling system apps." into mnc-devEsteban Talavera2015-07-071-1/+2
|\
| * Also fetch disabled activities when disabling system apps.Nicolas Prevot2015-07-031-1/+2
| | | | | | | | | | | | | | | | | | | | Before this cl: when creating a work profile inside ManagedProvisioning: If a system app had an activity with a launcher icon, but this activity was disabled, the system app would be installed inside the work profile. It must not be. BUG:21762028 Change-Id: I9cb208ed468399b263d84f28106bf2f50dd7cb24
* | Merge "Comment that account migration must happen after setting the profile ↵Benjamin Franz2015-07-061-0/+3
|\ \ | | | | | | | | | owner." into mnc-dev
| * | Comment that account migration must happen after setting the profile owner.Nicolas Prevot2015-07-031-0/+3
| |/ | | | | | | | | | | | | | | Otherwise, during a time interval, some apps may think that the account is not associated with a profile owner. BUG:22258118 Change-Id: I6849007c90db500a9b7e8cff38e67c089ed4bfae
* | Merge "Code defensively when showing profile deletion dialog" into mnc-devRubin Xu2015-07-011-7/+24
|\ \ | |/ |/|
| * Code defensively when showing profile deletion dialogRubin Xu2015-06-291-7/+24
| | | | | | | | | | | | | | | | | | In cases when device reboots before a managed profile is fully setup, we could end up with a managed profile without profile owner app. Watch out for this case when showing the profile deletion dialog. Bug: 22163660 Change-Id: I27193aa08b33343abf1a64b7c4ec1b44897a064a
* | Merge "Avoid deleting IMEs during DO provisioning." into mnc-devSudheer Shanka2015-06-291-3/+25
|\ \
| * | Avoid deleting IMEs during DO provisioning.Sudheer Shanka2015-06-291-3/+25
| | | | | | | | | | | | | | | Bug: 22001750 Change-Id: I387ff3190d506409a9c7d573cf5bfca1ef99b475
* | | Start MP on secondary users only if a DIA is installed.Craig Lafayette2015-06-241-7/+7
| |/ |/| | | | | | | Bug: 21718395 Change-Id: I406bf2a0c5ada824c79f819fdea44e2fa32e5dd4
* | Ignore internal extras if ManagedProvisioning is started by untrusted intentRubin Xu2015-06-246-18/+84
| | | | | | | | | | Bug: 21997606 Change-Id: I0a8991720e2b342760adec30d32d67937615c5e1
* | Merge "Resume the PO provisioning after the encryption reboot." into mnc-devSudheer Shanka2015-06-2312-347/+500
|\ \ | |/ |/|
| * Resume the PO provisioning after the encryption reboot.Sudheer Shanka2015-06-2212-347/+500
| | | | | | | | | | Bug: 21749003 Change-Id: Ic104f58acda5d12f727d05ba2f42c1e57c480dc6
* | Deprecate SHA-1 in ManagedProvisioningRubin Xu2015-06-163-37/+65
| | | | | | | | | | | | | | | | Use SHA-256 by default. Still supports SHA-1 if the device owner is provisioned by an old Nfc programmer. Bug: 20633794 Change-Id: I7049bc20b150fe6555be879d191a941f7790f4c4
* | Do not validate FRP if started by setup wizardRubin Xu2015-06-121-0/+14
|/ | | | | | | | | | | If started by LEGACY_ACTION_PROVISION_MANAGED_DEVICE or ACTION_PROVISION_MANAGED_DEVICE, do not validate FRP as setup wizard must have already validated it. In fact SUW might have just added an account which will confuse MP about whether FRP is activated by a previous account or the newly-added account. Bug: 21748042 Change-Id: I34211ce16965f723080983a5f93c4a2a8a9f5c47
* Merge "Show a confirmation dialog when user cancels PO flow." into mnc-devSudheer Shanka2015-06-121-0/+25
|\
| * Show a confirmation dialog when user cancels PO flow.Sudheer Shanka2015-06-121-0/+25
| | | | | | | | | | Bug: 21751582 Change-Id: Ia3177489db8ff19d591d3231c47c4a23c3b3264a
* | Parse AdminExtrasBundle if started by ACTION_PROVISION_MANAGED_DEVICERubin Xu2015-06-121-9/+10
| | | | | | | | | | Bug: 21797182 Change-Id: I6b9b6600795607d04adc2addc291eb0f3a4e6575
* | Merge "Change references to APK Certificate to Signature" into mnc-devRubin Xu2015-06-123-49/+47
|\ \ | |/ |/|
| * Change references to APK Certificate to SignatureRubin Xu2015-06-113-49/+47
| | | | | | | | | | | | | | | | | | The fact that currently apk signature is certificates is just implementation details. Bug: 20820366 Change-Id: Ie1d489a3a096a4dfa5c01c0ec530b03e5107ef6d
* | Merge "Improve accessibility services by adding talk back descriptions." ↵Sudheer Shanka2015-06-126-3/+31
|\ \ | |/ |/| | | into mnc-dev
| * Improve accessibility services by adding talk back descriptions.Sudheer Shanka2015-06-116-3/+31
| | | | | | | | | | Bug: 21161750 Change-Id: I5b1b260eb00d31ec2e6e550d26207b23927857aa
* | Merge "Update some strings." into mnc-devSudheer Shanka2015-06-112-2/+0
|\ \
| * | Update some strings.Sudheer Shanka2015-06-112-2/+0
| |/ | | | | | | | | Bug: 20518822 Change-Id: I4bcc11ae32ac14035beb8c5efd66cad30dd84417
* / Remove device initializer references from comments.Julia Reynolds2015-06-101-10/+2
|/ | | | | Bug: 21605288 Change-Id: I45ed97d74b9c0a09f6d62caf9f52335782a32557
* Merge "After encryption, set an action to the intent to resume ↵Nicolas Prevot2015-06-092-1/+3
|\ | | | | | | provisioning." into mnc-dev
| * After encryption, set an action to the intent to resume provisioning.Nicolas Prevot2015-06-092-1/+3
| | | | | | | | | | | | | | | | | | A previous change requires all intents targeting DeviceOwnerProvisioningActivity to have an action. BUG:21721505 Change-Id: Ifc971e961a088ceff792249aa30b1535095c1dc9
* | Merge "Don't stay stuck after connecting to wifi." into mnc-devNicolas Prevot2015-06-091-12/+17
|\ \ | |/ |/|
| * Don't stay stuck after connecting to wifi.Nicolas Prevot2015-06-081-12/+17
| | | | | | | | | | | | | | | | During device owner owner setup, after connecting to wifi, ManagedProvisioning did not continue the provisioning. BUG:21622105 Change-Id: I7418db7e9a84c72e488d00060cc6caf8c6f10d4d
* | Prevent ManagedProvisioning secondary user crashCraig Lafayette2015-06-092-2/+17
|/ | | | | | | | - Handle null action in DeviceOwnerPreProvisioningActivity - Create action to start provisioning on secondary users Bug: 21656244 Change-Id: Ie54bbadded822ed805ca500b9e70fe014aef07e3
* Merge "Remove FRP wipe via NFC bump." into mnc-devCraig Lafayette2015-06-085-218/+27
|\
| * Remove FRP wipe via NFC bump.Craig Lafayette2015-06-085-218/+27
| | | | | | | | | | | | | | | | - Remove the WipeResetProtectionTask - Move FRP check to DeviceOwnerPreProvisioningActivity Bug: 21558883 Change-Id: Ic686c72d4a3984436f1bb28c271c248fedc46091
* | Merge "Remove wifi requirement for DO setup." into mnc-devSudheer Shanka2015-06-083-21/+20
|\ \ | |/ |/|
| * Remove wifi requirement for DO setup.Sudheer Shanka2015-06-053-21/+20
| | | | | | | | | | Bug: 21301214 Change-Id: If40a04b3b59b3df607b13dddb678c38614846668
* | Merge "Use the public ACTION_PROVISION_MANAGED_DEVICE action in ↵Nicolas Prevot2015-06-043-23/+61
|\ \ | |/ |/| | | ManagedProvisioning." into mnc-dev
| * Use the public ACTION_PROVISION_MANAGED_DEVICE action in ManagedProvisioning.Nicolas Prevot2015-06-043-23/+61
| | | | | | | | | | | | BUG: 21488186 Change-Id: If11089101ebbd4c12d7f37ecd9272e9a9625d5ad
* | Avoid NPE in InstallPackageTaskBenjamin Franz2015-06-041-36/+32
|/ | | | | | | | | Currently if the download fails, a NPE is thrown because packageName is null. Also, renamed some variables to follow naming convention. Bug: 20042470 Change-Id: Id620d8074593879053d79654642528961e686314
* Remove Bluetooth provisioning.Craig Lafayette2015-06-0312-1444/+8
| | | | | Bug: 21559093 Change-Id: Ibcb41b4be8c9ef2019273a2c1be516607bc9daa4
* Merge "In ManagedProvisioning, look at canAddMoreManagedProfiles()." into ↵Nicolas Prevot2015-05-192-9/+5
|\ | | | | | | mnc-dev
| * In ManagedProvisioning, look at canAddMoreManagedProfiles().Nicolas Prevot2015-05-132-9/+5
| | | | | | | | | | | | Instead of looking at canAddMoreUsers() Change-Id: I6a3ac63d9c88d2861cb92aa6f015d78054bfd787