summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add broadcast when notification block state changes"TreeHugger Robot2018-01-241-0/+12
|\
| * Add broadcast when notification block state changesJulia Reynolds2018-01-231-0/+12
* | Merge "Let the transport ask for non-incremental backup."Oscar Key2018-01-242-3/+32
|\ \
| * | Let the transport ask for non-incremental backup.Oscar Key2018-01-232-3/+32
* | | Merge "FRP: Explicitly throw UnsupportedOperation when FRP is not supported"Adrian Roos2018-01-241-7/+10
|\ \ \
| * | | FRP: Explicitly throw UnsupportedOperation when FRP is not supportedAdrian Roos2018-01-231-7/+10
| |/ /
* | | Merge "Put latest MediaControlView2/VideoView2 code"Jin Seok Park2018-01-242-0/+61
|\ \ \
| * | | Put latest MediaControlView2/VideoView2 codeHyundo Moon2018-01-242-0/+61
* | | | Merge "Add restore of Settings keys to SettingsBackupAgent.RESTORE_FROM_HIGHE...Michal Karpinski2018-01-241-0/+9
|\ \ \ \
| * | | | Add restore of Settings keys toMichal Karpinski2018-01-231-0/+9
* | | | | Merge "VideoView2: Add API for MediaRouter intergration"Sungsoo Lim2018-01-241-1/+19
|\ \ \ \ \
| * | | | | VideoView2: Add API for MediaRouter intergrationSungsoo Lim2018-01-241-1/+19
* | | | | | Merge "Add TunnelInterface API and KernelResourceRecords" am: f811dff3bc am: ...Benedict Wong2018-01-244-8/+162
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "Add TunnelInterface API and KernelResourceRecords" am: f811dff3bcBenedict Wong2018-01-244-8/+162
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Add TunnelInterface API and KernelResourceRecords"Benedict Wong2018-01-244-8/+162
| | |\ \ \ \ \ \
| | | * | | | | | Add TunnelInterface API and KernelResourceRecordsBenedict Wong2018-01-244-8/+162
* | | | | | | | | Merge "Add xfrm mark in IpSecConfig" am: 73f79ceae9 am: 4077e802adBenedict Wong2018-01-241-1/+31
|\| | | | | | | |
| * | | | | | | | Merge "Add xfrm mark in IpSecConfig" am: 73f79ceae9Benedict Wong2018-01-241-1/+31
| |\| | | | | | |
| | * | | | | | | Merge "Add xfrm mark in IpSecConfig"Benedict Wong2018-01-241-1/+31
| | |\| | | | | |
| | | * | | | | | Merge "Add xfrm mark in IpSecConfig"Benedict Wong2018-01-241-1/+31
| | | |\ \ \ \ \ \
| | | | * | | | | | Add xfrm mark in IpSecConfigDi Lu2018-01-181-1/+31
* | | | | | | | | | Merge "Resolve merge conflicts of 69791b68837bf5f19654937396f7e55e2117743e to...Neil Fuller2018-01-242-52/+232
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve merge conflicts of 69791b68837bf5f19654937396f7e55e2117743e to masterChalard Jean2018-01-242-52/+232
| |\| | | | | | | | |
| | * | | | | | | | | Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ... am: 6568...Chalard Jean2018-01-242-52/+233
| | |\| | | | | | | |
| | | * | | | | | | | Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...Chalard Jean2018-01-242-52/+233
| | | |\| | | | | | |
| | | | * | | | | | | Merge changes I3b16caad,Iaf5ea7ab,I09a94042,I69a39039,I35300309, ...Chalard Jean2018-01-242-52/+233
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Let network requests see VPNs.Chalard Jean2018-01-231-0/+11
| | | | | * | | | | | | Make sure listen requests from VPN apps see their own networksChalard Jean2018-01-231-4/+45
| | | | | * | | | | | | Remove UID_RANGES_ADDED and REMOVED.Chalard Jean2018-01-231-36/+0
| | | | | * | | | | | | Move VPN allowed UIDs into NetworkCapabilities.Chalard Jean2018-01-232-21/+185
| | | | | * | | | | | | Pre-import to remove a conflict.Chalard Jean2018-01-232-1/+2
* | | | | | | | | | | | Merge "Support conditional removal of oahl from bootclasspath"TreeHugger Robot2018-01-243-43/+232
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Support conditional removal of oahl from bootclasspathPaul Duffin2018-01-233-43/+232
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Unhide RecoverableKeyStoreLoader API."Dmitry Dementyev2018-01-2415-28/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Unhide RecoverableKeyStoreLoader API.Dmitry Dementyev2018-01-2315-28/+45
* | | | | | | | | | | | Merge "Implement activity --proto --processes"TreeHugger Robot2018-01-246-1/+191
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement activity --proto --processesYi Jin2018-01-236-1/+191
* | | | | | | | | | | | | Merge "Add APIs to manipulate Override APN."TreeHugger Robot2018-01-242-0/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add APIs to manipulate Override APN.yuemingw2018-01-242-0/+143
* | | | | | | | | | | | | Merge "Add API documentation for MediaControlView2"Jin Seok Park2018-01-241-20/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add API documentation for MediaControlView2Jin Seok Park2018-01-241-20/+35
* | | | | | | | | | | | | | Merge "Fixing bugs in Notification proto dumping."TreeHugger Robot2018-01-243-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixing bugs in Notification proto dumping.Kweku Adams2018-01-233-9/+13
* | | | | | | | | | | | | | | Merge "Added STORAGE_VOLUME_ACCESS_SETTINGS intent."TreeHugger Robot2018-01-241-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added STORAGE_VOLUME_ACCESS_SETTINGS intent.Felipe Leme2018-01-231-0/+15
* | | | | | | | | | | | | | | Merge "Propagate location mode properly from SettingsProvider"TreeHugger Robot2018-01-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Propagate location mode properly from SettingsProviderMakoto Onuki2018-01-231-0/+1
* | | | | | | | | | | | | | | | Merge "Fix wrong use if "!UserHandle.isApp()""TreeHugger Robot2018-01-242-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix wrong use if "!UserHandle.isApp()"Makoto Onuki2018-01-232-2/+30
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge changes Idd092c44,I85f7686eTreeHugger Robot2018-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 06:27:34 +0000