summaryrefslogtreecommitdiff
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9Neil Fuller2022-02-235-86/+90
|\
| * Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462Neil Fuller2022-02-235-86/+90
| |\
| | * Switch "UTC time" to "Unix epoch time"Neil Fuller2022-02-225-86/+90
* | | Merge "New @TestApi: DevicePolicyManager.isNewUserDisclaimerAcknowledged()" i...Yan Zhu2022-02-222-1/+22
|\ \ \
| * | | New @TestApi: DevicePolicyManager.isNewUserDisclaimerAcknowledged()Felipe Leme2022-02-172-1/+22
* | | | Merge "Update team OWNERS file." am: e96070ac89 am: 114d0c7773Joanne Chung2022-02-162-10/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Update team OWNERS file." am: e96070ac89Joanne Chung2022-02-162-10/+6
| |\ \ \ | | | |/ | | |/|
| | * | Update team OWNERS file.Joanne Chung2022-02-142-10/+6
| * | | Merge SP2A.220305.012Xin Li2022-02-142-29/+18
| |\ \ \
| | * | | *ServiceStartNotAllowedException shouldn't have a "cause"Makoto Onuki2022-01-231-0/+7
| | * | | Revert "Decode the input of both setStream and setResource calls first"Wu Ahan2022-01-201-29/+11
| * | | | Merge sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li2022-02-1137-441/+1121
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge "Rename resetNewUserDisclaimer() to acknowledgeNewUserDisclaimer()" int...Felipe Leme2022-02-152-5/+12
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Rename resetNewUserDisclaimer() to acknowledgeNewUserDisclaimer()Felipe Leme2022-02-102-5/+12
* | | | | Merge "Split out the ipsec API surface and use framework-connectivity-tiramis...Treehugger Robot2022-02-101-11/+0
|\ \ \ \ \
| * \ \ \ \ Merge "Split out the ipsec API surface and use framework-connectivity-tiramis...Treehugger Robot2022-02-101-11/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Split out the ipsec API surface and use framework-connectivity-tiramisuAaron Huang2022-02-101-11/+0
| | * | | | Merge SQ1A.220205.002Xin Li2022-02-071-11/+29
| | |\ \ \ \
| | | * | | | DO NOT MERGE: Decode the input of both setStream and setResource calls firstWu Ahan2021-12-151-11/+29
| * | | | | | Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a...TreeHugger Robot2022-01-271-10/+12
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a...TreeHugger Robot2022-01-271-10/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a...TreeHugger Robot2022-01-271-10/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Move CtsContentTestCases to group presubmit-large" into sc-dev am: a9a...TreeHugger Robot2022-01-271-10/+12
| | |\ \ \ \ \ \
| | | * | | | | | Move CtsContentTestCases to group presubmit-largeJackal Guo2022-01-241-10/+12
| | | * | | | | | Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResour...TreeHugger Robot2022-01-191-29/+11
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge "*ServiceStartNotAllowedException shouldn't have a "cause"" into sc-v2-devMakoto Onuki2022-01-211-0/+7
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 am: aca7bb4b9...Hans Boehm2022-01-272-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 am: aca7bb4b9fHans Boehm2022-01-272-4/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Prefer WeakReference.refersTo() to get()"Hans Boehm2022-01-272-4/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Prefer WeakReference.refersTo() to get()Hans Boehm2022-01-202-4/+3
* | | | | | | | | | | | Merge "Add device poliy manager support for profile network preference" am: 4...Sooraj Sasindran2022-01-254-0/+413
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Add device poliy manager support for profile network preference" am: 4...Sooraj Sasindran2022-01-254-0/+413
| |\| | | | | | | | | |
| | * | | | | | | | | | Add device poliy manager support for profile network preferenceSooraj Sasindran2022-01-244-0/+413
* | | | | | | | | | | | Merge "[MS66] Initialize TrafficStats with context" am: a411d32226 am: 71aca9...Junyu Lai2022-01-221-0/+8
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "[MS66] Initialize TrafficStats with context" am: a411d32226 am: 71aca9...Junyu Lai2022-01-221-0/+8
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "[MS66] Initialize TrafficStats with context"Junyu Lai2022-01-221-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | [MS66] Initialize TrafficStats with contextJunyu Lai2022-01-221-0/+8
| | | |/ / / / / / / / /
* | | | | | | | | | | | Merge "Create directories for wallpaper effects generation api and and owners...Sharon Su2022-01-221-0/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Create directories for wallpaper effects generation api and and owners...Sharon Su2022-01-221-0/+5
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge "Create directories for wallpaper effects generation api and and owners...Sharon Su2022-01-221-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Create directories for wallpaper effects generation api and and ownersSharon Su2022-01-201-0/+5
* | | | | | | | | | | | Merge changes from topic "presubmit-am-8bb7303602ce4e5599c16939f20f4126" into...Makoto Onuki2022-01-211-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ [automerge] *ServiceStartNotAllowedException shouldn't have a "cause" 2p: d43...Makoto Onuki2022-01-201-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | *ServiceStartNotAllowedException shouldn't have a "cause"Makoto Onuki2022-01-201-0/+7
* | | | | | | | | | | | | Merge "Add error handling for onConfigurationChanged" into sc-v2-dev am: bca4...Chilun Huang2022-01-211-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add error handling for onConfigurationChangedChilun2022-01-201-1/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Add OWNERS file for TrustManager et al." am: 20b5b3c157 am: c55ff91842...Dave McCloskey2022-01-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Add OWNERS file for TrustManager et al." am: 20b5b3c157 am: c55ff91842Dave McCloskey2022-01-201-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add OWNERS file for TrustManager et al.Dave McCloskey2022-01-191-0/+1
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge sc-qpr1 to aosp-master - DO NOT MERGEBill Yi2022-01-061-0/+8
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 17:24:32 +0000