summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH0Einky@build012016-09-181-0/+3
| | | | | Change-Id: I8ea062b1a69130f6aabb6a6a217346bc28e2ca4e Ticket: RM-214
* Automatic translation importclyde@build012016-08-221-0/+111
| | | | | Change-Id: I94d915fa24938a7963aee27fb63b36b8ba95f186 Ticket: RM-214
* Automatic translation importpinky@build012016-08-181-0/+111
| | | | | Change-Id: Id3b6ca8ec23fa0d3cebce0fc1ed0e633fca42e87 Ticket: RM-214
* Automatic translation importclyde@build012016-08-131-0/+111
| | | | | Change-Id: Ib671200b24f4d027ef7abb9cf162119618369205 Ticket: RM-214
* Automatic translation importpinky@build012016-06-201-0/+79
| | | | | Change-Id: Ibfb940d5c6c20db3fa2100d789aab78977c97f11 Ticket: RM-214
* Automatic translation importAbhisek Devkota2016-05-181-0/+1
| | | | | Change-Id: If9a1d9ce3ffe3b8c62a0cee9d75eb9b7849cb064 Ticket: RM-214
* Automatic translation importAbhisek Devkota2016-05-1417-0/+1887
| | | | | Change-Id: Ib92f16e649602faa33a0841600d43a5ea14290c1 Ticket: RM-214
* Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-4/+45
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/ManagedProvisioning into HEAD Android 6.0.1 release 3
| * Add extra checks and timeouts to account migration. DO NOT MERGEBenjamin Franz2015-10-141-4/+45
| | | | | | | | | | | | | | | | | | | | Adding an extra check to verify that the account type is ready on the target user. Also, adding a timeout to the copyAccountToUser call to avoid managed provisioning getting stuck in an endless loop in case somehting goes wrong here. Bug: 23798494 Change-Id: Ieea43bbd9c3db29c125eff342aadb86b242cba91
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-055-37/+37
|\ \ | | | | | | | | | Android 6.0.0 release 26
| * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| |\ \ | | |/ | |/|
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-250-0/+0
| | |\
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-180-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | |\
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-050-0/+0
| | | | | |\
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-300-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-220-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-210-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-180-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-120-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-182-34/+34
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09633062a0bd326a83b47ec639d25f738f8a2ff5 Auto-generated-cl: translation import
| * / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2015-08-241-1/+1
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I877c01a83ab65ddb569051aa55214cac138ccc4d Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | | am eb18ce02: Fix NullPointerException when showing DeleteManagedProfileDialogRubin Xu2015-08-171-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb18ce020febefd5c683fea8ade52ad57299ccf0': Fix NullPointerException when showing DeleteManagedProfileDialog
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-052-2/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I556b82bbb59d2518dc9702139df03bcd89836df8 Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | am b1f11c0a: Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" ↵Jukka Zitting2015-08-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'b1f11c0accdf0f1eae4a6eed19bc3f7f181aa60f': Increase Wi-Fi connection timeout from 30 to 60 seconds
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5fc43bb5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fc43bb58083f895660a1c7a19acc6dbb1ca5f45': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3178-78/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb24e60d467ce1a51f04863b69b75c5456e4c37a Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | | am 45fd7228: Merge "Set device owner as profile owners on secondary users" ↵Rubin Xu2015-07-301-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '45fd722869942810bdfab7af090fd8786d4422e8': Set device owner as profile owners on secondary users
| * | | | | | | | | | | | | | | | am df02ac7d: Merge "Update the user consent string for device owner ↵Nicolas Prévot2015-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provisioning flow." into mnc-dev * commit 'df02ac7dd3eceff329e3c22ab31c8461965bbf25': Update the user consent string for device owner provisioning flow.
| * | | | | | | | | | | | | | | | am 362e215e: Merge "Ensure ManagedProvisioning finish() calls set result ↵Alan Treadway2015-07-284-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code." into mnc-dev * commit '362e215efab31b6aa3c238826f49b461ae9e6fda': Ensure ManagedProvisioning finish() calls set result code.
| * | | | | | | | | | | | | | | | am 9c64d6b5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c64d6b5c03b89b4e8b8d47753899614e3a8574b': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-212-1/+102
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadfe5abf06ba885dec3c91b974ce3b82a1e8d99a Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-2077-0/+154
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie02da6538805f864fe96e2c309e62329ceb0830b Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | am 0e9f1183: Strings for the progress dialog shown when clearing FRPEsteban Talavera2015-07-171-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e9f11836e66d87959a3cc30d62d225e6210e9f9': Strings for the progress dialog shown when clearing FRP
| * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-152-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-152-5/+5
| | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41bda8c9f08ee555aad1c4faf9d68812b8f1915c Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | am ac0d197d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac0d197d61b1f5144bf7c20b85b7e2732b30b320': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | am 8e1c5db7: Check for invalid Wifi security type in ManagedProvisioningRubin Xu2015-07-131-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8e1c5db7598f647c9a4c4d0b46776ac142679538': Check for invalid Wifi security type in ManagedProvisioning
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 073c85a3: Merge "Warn about theft protection in all provisioning flows." ↵Rubin Xu2015-07-134-4/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '073c85a31d3b97460aad6e92dca1ed9d593a2c48': Warn about theft protection in all provisioning flows.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am adcee75c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adcee75c925c36c9fd494c3d036096a38be759c2': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-118-17/+17
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I86e9838ece83cb0f5ee674ebc132085e66cbfcef Auto-generated-cl: translation import
| * | | | | | | | | | | | | | | | am b039f9de: Merge "call startActivityForResult on remove account intent" ↵Rubin Xu2015-07-102-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'b039f9dea4b8fbab2e1e1a7b9a5fa0e576bda730': call startActivityForResult on remove account intent
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary users" into ↵Craig Lafayette2015-07-094-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '90d051c39c941b4e3aedc05816e7f9e4f6d75d0c': Don't show Wi-Fi select for EDU secondary users
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:57:32 +0000