summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: c6218f79...Serik Beketayev2020-12-102-16/+1
|\
| * Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7 am: c6218f7977Serik Beketayev2020-12-102-16/+1
| |\
| | * Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7Serik Beketayev2020-12-102-16/+1
| | |\
| | | * Merge "[Mainline Migration] Migrate NetworkUtils"Serik Beketayev2020-12-092-16/+1
| | | |\
| | | | * [Mainline Migration] Migrate NetworkUtilsSerik Beketayev2020-12-062-16/+1
* | | | | Merge "Introduce new App Ops permission USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER"Meng Wang2020-12-101-1/+23
|\ \ \ \ \
| * | | | | Introduce new App Ops permission USE_ICC_AUTH_WITH_DEVICE_IDENTIFIERMeng Wang2020-12-081-1/+23
* | | | | | Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a am: b76f77b9b0 ...Jeff Sharkey2020-12-091-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a am: b76f77b9b0Jeff Sharkey2020-12-091-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Add OWNERS to HDMI control directories" am: fd2f7c893aJeff Sharkey2020-12-091-1/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Add OWNERS to HDMI control directoriesMarvin Ramin2020-12-091-1/+4
| * | | | | Merge "Add per-file OWNERS for BatteryStats" am: cac4499628 am: d8a9268460Dmitri Plotnikov2020-12-091-0/+6
| |\| | | |
| | * | | | Merge "Add per-file OWNERS for BatteryStats" am: cac4499628Dmitri Plotnikov2020-12-091-0/+6
| | |\| | |
| | | * | | Merge "Add per-file OWNERS for BatteryStats"Dmitri Plotnikov2020-12-091-0/+6
| | | |\ \ \
| | | | * | | Add per-file OWNERS for BatteryStatsDmitri Plotnikov2020-12-081-0/+6
| | | * | | | Merge changes from topic "install-hints"Christian Wailes2020-12-092-0/+72
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Adds an "install scenario" field to the appropriate datastructures am: d42204...Chris Wailes2020-12-092-0/+72
| |\| | | | |
| | * | | | | Adds an "install scenario" field to the appropriate datastructures am: d42204...Chris Wailes2020-12-092-0/+72
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Adds an "install scenario" field to the appropriate datastructuresChris Wailes2020-12-072-0/+72
* | | | | | | Merge "Cleanup IPinnedStackController and IPinnedStackListener 2/N"Hongwei Wang2020-12-091-13/+0
|\ \ \ \ \ \ \
| * | | | | | | Cleanup IPinnedStackController and IPinnedStackListener 2/NHongwei Wang2020-12-081-13/+0
* | | | | | | | Merge "Add DPM.getKeyPairGrants()"Pavel Grafov2020-12-092-1/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Add DPM.getKeyPairGrants()Pavel Grafov2020-12-032-1/+46
* | | | | | | | | Merge "Support multi-channel FF vibration effect for input device."TreeHugger Robot2020-12-087-79/+383
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support multi-channel FF vibration effect for input device.Chris Ye2020-11-277-79/+383
* | | | | | | | | | resolve merge conflicts of 358f0d4fc8c248498cf113c41e043877a14e89a1 to masterJeff Sharkey2020-12-0897-39/+466
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0Jeff Sharkey2020-12-0813-6/+30
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge changes from topic "dec5" am: c2793cf12bJeff Sharkey2020-12-0813-6/+30
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge changes from topic "dec5"Jeff Sharkey2020-12-0897-39/+467
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | Improve OWNERS coverage across frameworks/base/.Jeff Sharkey2020-12-0813-6/+30
| * | | | | | | | | Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c am: c7c4a74a78Jeff Sharkey2020-12-0884-33/+437
| |\| | | | | | | |
| | * | | | | | | | Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9cJeff Sharkey2020-12-0884-33/+437
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Improve OWNERS coverage across frameworks/base/.Jeff Sharkey2020-12-0884-33/+437
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Merge "Add VERSION_CODES constant for S" am: dfe33cb756 am: 230a340757Anton Hansson2020-12-071-0/+5
| |\| | | | | | |
| | * | | | | | | Merge "Add VERSION_CODES constant for S" am: dfe33cb756Anton Hansson2020-12-071-0/+5
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Add VERSION_CODES constant for S"Anton Hansson2020-12-071-0/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Add VERSION_CODES constant for SAnton Hansson2020-11-301-0/+5
| | * | | | | | | | Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-masterTreeHugger Robot2020-12-074-26/+66
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ DO NOT MERGE - Merge RQ1A.201205.011Xin Li2020-12-074-26/+66
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | DO NOT MERGE: Revert "Don't let IME window fit status bar"Tiger Huang2020-10-141-11/+15
| | | | * | | | | | | | Validate user-supplied tree URIs in DocumentsProvider callsAbhijeet Kaur2020-10-131-5/+12
| | | | * | | | | | | | Validate user-supplied URIs in DocumentsProvider callsAbhijeet Kaur2020-10-131-7/+18
| | | | * | | | | | | | Require permission to create trusted displaysAndrii Kulian2020-10-132-3/+21
* | | | | | | | | | | | Temporarily replace "android.com" accounts.Jeff Sharkey2020-12-084-4/+4
* | | | | | | | | | | | Merge "Support single conversation in People Space widget"Anna Zappone2020-12-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Support single conversation in People Space widgetAnna Zappone2020-12-081-2/+3
* | | | | | | | | | | | Merge "Use equals() to check equality of PictureInPictureParams."Garfield Tan2020-12-083-1/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Use equals() to check equality of PictureInPictureParams.Garfield Tan2020-12-043-1/+48
* | | | | | | | | | | | Merge "Generic Test profile on debuggable builds"Adam Bookatz2020-12-071-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Generic Test profile on debuggable buildsAdam Bookatz2020-12-071-0/+6