summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Snap for 7132927 from 2f54a425c16c7b3211988fdfdc0d7d6fc4d27675 to mainline-ex...android-mainline-11.0.0_r15android11-mainline-extservices-releaseandroid-build-team Robot2021-02-0814-56/+31
|\
| * Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodBill Yi2021-01-262-3/+3
| |\
| | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-01-252-3/+3
| * | Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodBill Yi2021-01-261-1/+1
| |\ \
| | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-01-251-1/+1
| | |/
| * | Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prodBill Yi2021-01-269-51/+25
| |\ \
| | * | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-01-259-51/+25
| | |/
| * / Update AttributionLabelLiveData on activeNate Myren2021-01-251-0/+1
| |/
| * Changer permission indicators feature to enabled by defaultNate Myren2021-01-211-1/+1
* | Snap for 7080740 from 5282a2d0db903c503b3364d8b03e962db1c62d98 to mainline-ex...android-build-team Robot2021-01-132-14/+1
|\|
| * If a proxy usage is not user sensitive, do not show proxyNate Myren2021-01-071-13/+1
| * Support more than one appop permission per roleEugene Susla2020-12-241-1/+0
|/
* Account for proxy chains with common chain nodesNate Myren2020-12-101-28/+32
* Import translations. DO NOT MERGE ANYWHEREBill Yi2020-12-095-21/+21
* No need to kill app if app-op was granted for modern appsPhilip P. Moltmann2020-12-021-1/+2
* Remove "phone" attribution from google FiNate Myren2020-11-193-127/+178
* Merge "Make auto revoke toggle disabled(instead of invisible) for exempted se...Eugene Susla2020-11-184-7/+6
|\
| * Make auto revoke toggle disabled(instead of invisible) for exempted servicesEugene Susla2020-11-164-7/+6
* | Import translations. DO NOT MERGE ANYWHEREXin Li2020-11-172-0/+26
|/
* Import translations. DO NOT MERGE ANYWHEREBill Yi2020-11-1385-21/+276
* Merge "Merge Indicators into mainline-prod" into mainline-prodNate Myren2020-11-1036-329/+1371
|\
| * Merge Indicators into mainline-prodPhilip P. Moltmann2020-11-0536-329/+1371
* | [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-090-0/+0
|\ \
| * \ [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-090-0/+0
| |\ \
| | * \ [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-090-0/+0
| | |\ \
| | | * \ [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-070-0/+0
| | | |\ \
| | | | * \ [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-070-0/+0
| | | | |\ \
| | | | | * \ Merge "DO NOT MERGE: Hide overlays over uninstall confirm dialog" into oc-dev...TreeHugger Robot2020-11-070-0/+0
| | | | | |\ \
| | | | | | * \ Merge "DO NOT MERGE: Hide overlays over uninstall confirm dialog" into oc-dev...TreeHugger Robot2020-11-070-0/+0
| | | | | | |\ \
| | | | | | | * \ Merge "DO NOT MERGE: Hide overlays over uninstall confirm dialog" into oc-devTreeHugger Robot2020-11-071-0/+4
| | | | | | | |\ \
* | | | | | | | | | [automerger skipped] DO NOT MERGE: Hide overlays over uninstall confirm dialo...Philip P. Moltmann2020-11-090-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] DO NOT MERGE: Hide overlays over uninstall confirm dialo...Philip P. Moltmann2020-11-090-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] DO NOT MERGE: Hide overlays over uninstall confirm dialo...Philip P. Moltmann2020-11-090-0/+0
| | |\| | | | | | |
| | | * | | | | | | [automerger skipped] DO NOT MERGE: Hide overlays over uninstall confirm dialo...Philip P. Moltmann2020-11-070-0/+0
| | | |\| | | | | |
| | | | * | | | | | [automerger skipped] DO NOT MERGE: Hide overlays over uninstall confirm dialo...Philip P. Moltmann2020-11-070-0/+0
| | | | |\| | | | |
| | | | | * | | | | DO NOT MERGE: Hide overlays over uninstall confirm dialog am: ffae6d17ca am: ...Philip P. Moltmann2020-11-071-0/+4
| | | | | |\| | | |
| | | | | | * | | | DO NOT MERGE: Hide overlays over uninstall confirm dialog am: ffae6d17caPhilip P. Moltmann2020-11-071-0/+4
| | | | | | |\ \ \ \ | | | | | | | | |/ / | | | | | | | |/| |
| | | | | | | * | | DO NOT MERGE: Hide overlays over uninstall confirm dialogPhilip P. Moltmann2020-11-061-0/+4
* | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-090-0/+0
|\| | | | | | | | |
| * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-090-0/+0
| |\| | | | | | | |
| | * | | | | | | | [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-090-0/+0
| | |\| | | | | | |
| | | * | | | | | | [automerger skipped] Merge "DO NOT MERGE: Hide overlays over uninstall confir...TreeHugger Robot2020-11-060-0/+0
| | | |\| | | | | |
| | | | * | | | | | Merge "DO NOT MERGE: Hide overlays over uninstall confirm dialog" into pi-devTreeHugger Robot2020-11-061-1/+3
| | | | |\ \ \ \ \ \
| | | | | * | | | | | DO NOT MERGE: Hide overlays over uninstall confirm dialogPhilip P. Moltmann2020-11-061-1/+3
* | | | | | | | | | | [automerger skipped] Merge "RESTRICT AUTOMERGE Don't allow tapjacking permiss...TreeHugger Robot2020-11-090-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | [automerger skipped] Merge "RESTRICT AUTOMERGE Don't allow tapjacking permiss...TreeHugger Robot2020-11-090-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Merge "RESTRICT AUTOMERGE Don't allow tapjacking permissioncontroller" into q...TreeHugger Robot2020-11-090-0/+0
| | |\| | | | | | | |
| | | * | | | | | | | Merge "RESTRICT AUTOMERGE Don't allow tapjacking permissioncontroller" into q...TreeHugger Robot2020-11-062-12/+41
| | | |\ \ \ \ \ \ \ \
* | | | | | | | | | | | [automerger skipped] RESTRICT AUTOMERGE resolve merge conflicts of a35f153639...Evan Severson2020-11-090-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | [automerger skipped] RESTRICT AUTOMERGE resolve merge conflicts of a35f153639...Evan Severson2020-11-090-0/+0
| |\| | | | | | | | | |