summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* Code defensively when showing profile deletion dialogRubin Xu2015-06-291-7/+24
* Ignore internal extras if ManagedProvisioning is started by untrusted intentRubin Xu2015-06-246-18/+84
* 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
* | Deprecate SHA-1 in ManagedProvisioningRubin Xu2015-06-163-37/+65
* | Do not validate FRP if started by setup wizardRubin Xu2015-06-121-0/+14
|/
* 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
* | Parse AdminExtrasBundle if started by ACTION_PROVISION_MANAGED_DEVICERubin Xu2015-06-121-9/+10
* | 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
* | Merge "Improve accessibility services by adding talk back descriptions." into...Sudheer Shanka2015-06-126-3/+31
|\ \ | |/ |/|
| * Improve accessibility services by adding talk back descriptions.Sudheer Shanka2015-06-116-3/+31
* | Merge "Update some strings." into mnc-devSudheer Shanka2015-06-112-2/+0
|\ \
| * | Update some strings.Sudheer Shanka2015-06-112-2/+0
| |/
* / Remove device initializer references from comments.Julia Reynolds2015-06-101-10/+2
|/
* Merge "After encryption, set an action to the intent to resume provisioning."...Nicolas Prevot2015-06-092-1/+3
|\
| * After encryption, set an action to the intent to resume provisioning.Nicolas Prevot2015-06-092-1/+3
* | 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
* | Prevent ManagedProvisioning secondary user crashCraig Lafayette2015-06-092-2/+17
|/
* 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
* | 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
* | Merge "Use the public ACTION_PROVISION_MANAGED_DEVICE action in ManagedProvis...Nicolas Prevot2015-06-043-23/+61
|\ \ | |/ |/|
| * Use the public ACTION_PROVISION_MANAGED_DEVICE action in ManagedProvisioning.Nicolas Prevot2015-06-043-23/+61
* | Avoid NPE in InstallPackageTaskBenjamin Franz2015-06-041-36/+32
|/
* Remove Bluetooth provisioning.Craig Lafayette2015-06-0312-1444/+8
* Merge "In ManagedProvisioning, look at canAddMoreManagedProfiles()." into mnc...Nicolas Prevot2015-05-192-9/+5
|\
| * In ManagedProvisioning, look at canAddMoreManagedProfiles().Nicolas Prevot2015-05-132-9/+5
* | Merge "Fix Bluetooth deadlock." into mnc-devCraig Lafayette2015-05-192-45/+73
|\ \
| * | Fix Bluetooth deadlock.Craig Lafayette2015-05-192-45/+73
* | | Remove Bluetooth log spam in ManagedProvisioningCraig Lafayette2015-05-191-3/+5
|/ /
* | Merge "Make the capture sound intent cross profile." into mnc-devEsteban Talavera2015-05-181-0/+1
|\ \
| * | Make the capture sound intent cross profile.Sander Alewijnse2015-04-301-0/+1
* | | Merge "DO NOT MERGE Add blacklisting functionality to provisioning. Already i...Sander Alewijnse2015-05-144-54/+97
|\ \ \
| * | | DO NOT MERGE Add blacklisting functionality to provisioning.Sander Alewijnse2015-05-144-54/+97
* | | | Merge "Update for API change: remove initializer name." into mnc-devJulia Reynolds2015-05-132-8/+5
|\ \ \ \
| * | | | Update for API change: remove initializer name.Julia Reynolds2015-05-122-8/+5
| | |_|/ | |/| |
* | | | Add a screen with MDM info for DO provisioning.Sudheer Shanka2015-05-135-135/+254
| |/ / |/| |
* | | Merge "No factory reset when wifi connect fails during provisioning." into mn...Sander Alewijnse2015-05-122-4/+28
|\ \ \ | |/ / |/| |
| * | No factory reset when wifi connect fails during provisioning.Sander Alewijnse2015-05-122-4/+28
| |/
* | Merge "Redesign ManagedProvisioning UI using setup wizard library." into mnc-devSudheer Shanka2015-05-117-150/+106
|\ \
| * | Redesign ManagedProvisioning UI using setup wizard library.Sudheer Shanka2015-05-117-150/+106
| |/
* | Merge "Allow Channel to be overridden" into mnc-devJoe Delfino2015-05-112-12/+20
|\ \
| * | Allow Channel to be overriddenJoe Delfino2015-05-112-12/+20
| |/
* | Merge "Prevent ManagedProvisioning from killing DMAgent in SUW/DO flow." into...Alan Treadway2015-05-111-1/+4
|\ \
| * | Prevent ManagedProvisioning from killing DMAgent in SUW/DO flow.Alan Treadway2015-05-081-1/+4
* | | Update corresponding to framework API changesCraig Lafayette2015-05-062-5/+6
|/ /