summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge cherrypicks of [2947251, 2947338, 2947252, 2947253, 2946095, 2946096, ↵lineage-15.0android-build-team Robot2017-09-222-25/+7
|\ | | | | | | | | | | 2946097, 2946098, 2947211, 2947212, 2947254, 2947255, 2947256, 2947257, 2947258, 2947349, 2947350, 2947351, 2947352, 2947353, 2946976, 2946977, 2946978, 2946979, 2946980, 2947354, 2947355, 2947435, 2947356, 2947357, 2947358, 2947359, 2947360, 2947418, 2947421, 2947422, 2947306] into oc-r3-release Change-Id: Ia3f12e54646efc8255fe96023abbc122264aa26d
| * Backport overlay security fixPhil Weaver2017-09-222-25/+7
|/ | | | | | | | | | | | | | Replacing app opps fix with the flag that is used elsewhere. Bug: 37442941 Test: Verified that toast and system overlay still goes away on permission and a11y service capability screens. Merged-In: I27d357b2aa61193380b7ef1dcc88bbac9553644e Change-Id: Ib7a7251109ed0f125db2bd49f5fc0baa67207b5d (cherry picked from commit bb1948fe1a3fa2ca93f508af2e97f5ec21e71ade)
* Merge cherrypicks of [2686743, 2686091, 2686092, 2686125, 2686126, 2686127, ↵android-build-team Robot2017-08-083-3/+3
|\ | | | | | | | | | | 2686744, 2686745, 2686543, 2686746, 2686747, 2686748, 2686749, 2686750, 2686751, 2686544, 2686545, 2686546, 2686547, 2686548, 2686549, 2686550, 2686821, 2686242, 2686243, 2686128, 2686754, 2686755, 2686551, 2686244, 2686552, 2686756, 2686265, 2686245, 2686246, 2686266, 2686096, 2686757, 2686758, 2686759, 2686900, 2686901, 2686902, 2686903, 2686904] into oc-r3-release Change-Id: I0ecd23e0f05adfa93826cfa685af6217b8867bfe
| * Import translations. DO NOT MERGEBill Yi2017-08-083-3/+3
|/ | | | | | | Change-Id: I38d21c8a4da36283bfbfad3c96841586810f3a87 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import (cherry picked from commit 14fb6934dfd2ed5179d25a0f8437b805e0ff64b7)
* release-request-f4ecf242-5d1c-45e0-8c7c-ede48d1a9e82-for-git_oc-release-4111 ↵android-build-team Robot2017-06-181-1/+1
|\ | | | | | | | | | | 650 snap-temp-L02200000075283731 Change-Id: Ia232ee791185824e90240d52f19cf0aa9b5cc86a
| * Import translations. DO NOT MERGEBill Yi2017-06-161-1/+1
| | | | | | | | | | Change-Id: I7fed09741f6279aa7e556872f7dd838d8dd49e5b Auto-generated-cl: translation import
* | release-request-bfd62fea-ae1d-4d0d-80fd-4ff0d407c488-for-git_oc-release-4102 ↵android-build-team Robot2017-06-154-8/+27
|\| | | | | | | | | | | 265 snap-temp-L40000000074340189 Change-Id: I1b0abb9831e7b84c649609c9209fc14972e05a77
| * Merge "Disable overlays while installer is resumed" into oc-devPhilip P. Moltmann2017-06-144-8/+27
| |\
| | * Disable overlays while installer is resumedPhilip P. Moltmann2017-06-134-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The install button can be disabled for other reasons, hence we have to store the enabled state independant of the resumed/paused state. Test: gts-tradefed run gts-dev -m PackageInstallerTapjacking Fixes: 62239598 Change-Id: I2effa0f5afacfaed217a030550a778e32912cfbb
* | | release-request-7d12f16b-b4a7-4324-8b59-be2d4e07dcb3-for-git_oc-release-4094 ↵android-build-team Robot2017-06-131-1/+1
|\| | | | | | | | | | | | | | | | | 438 snap-temp-L80000000073561277 Change-Id: I5461be66f05486de9eadc096a2396dd22bab23a7
| * | Import translations. DO NOT MERGEBill Yi2017-06-121-1/+1
| |/ | | | | | | | | Change-Id: I4eb9d67eac46e981bc27106e8bc9d440e45f04de Auto-generated-cl: translation import
* | release-request-18270495-77c6-4d95-8968-eb22e3d2fe8b-for-git_oc-release-4057 ↵android-build-team Robot2017-06-0181-83/+2
|\| | | | | | | | | | | 656 snap-temp-L93200000069424216 Change-Id: Iedfbc4059bb818f31e9e5bdc4bba321add2257cf
| * Import translations. DO NOT MERGEBill Yi2017-05-3181-83/+2
| | | | | | | | | | Change-Id: I9dc36c79650bc89ad706bbb06f1735c204170b06 Auto-generated-cl: translation import
* | release-request-fca2b5ac-03eb-4055-a549-b4fc2b292b64-for-git_oc-release-4049 ↵android-build-team Robot2017-05-282-10/+0
|\| | | | | | | | | | | 993 snap-temp-L04900000068539456 Change-Id: Icaa8da8874d397caae1ea8a3f3d8fc03b291037f
| * Merge "Revert "Using SecureTouchListener for install button during install ↵TreeHugger Robot2017-05-252-10/+0
| |\ | | | | | | | | | confirmation"" into oc-dev
| | * Revert "Using SecureTouchListener for install button during install ↵Suprabh Shukla2017-05-242-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmation" This reverts commit 38e0f956664f2997941e2087284366e0d0dadbf7. Bug: 35056974, 38306660 Change-Id: Ib00be0c4e8be9156b0bdb1f303e1e518136d55ac
* | | release-request-aaaef485-cf88-426c-8186-1f3903a60dd5-for-git_oc-release-4038 ↵android-build-team Robot2017-05-242-2/+2
|\| | | | | | | | | | | | | | | | | 872 snap-temp-L67700000067294126 Change-Id: Iba3e83b697fd50039d76fd670df7b4945bbf6bd3
| * | Import translations. DO NOT MERGEBill Yi2017-05-242-2/+2
| | | | | | | | | | | | | | | Change-Id: I542f219844c412e83f478ff35af6bd8985aceff9 Auto-generated-cl: translation import
* | | release-request-94bbded7-c270-40fa-9a74-fedecfd046c6-for-git_oc-release-4034 ↵android-build-team Robot2017-05-231-1/+1
|\| | | | | | | | | | | | | | | | | 177 snap-temp-L73200000066785187 Change-Id: I37c912e57e1008d2b34c24a8ae7daec0a8fdc545
| * | Using MATCH_ANY_USER while uninstallingSuprabh Shukla2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We changed MATCH_UNINSTALLED_PACKAGES to not return package information for other users. Test: Manual. Tapping 'Uninstall for all users' works as expected. Bug: 37226817 Change-Id: I9c8be07575f48a4e17d29a38f50308fc98d4c226
* | | release-request-6c498b17-9310-412b-ad36-3dcf25ffef73-for-git_oc-release-4017 ↵android-build-team Robot2017-05-174-3/+6
|\| | | | | | | | | | | | | | | | | 086 snap-temp-L16500000064871237 Change-Id: I4479aaf41f980ef5776b7c33d79d9c89e8610463
| * | Merge "Allow permission grant UI to show on top of keyguard" into oc-devTreeHugger Robot2017-05-161-0/+3
| |\ \
| | * | Allow permission grant UI to show on top of keyguardSvet Ganov2017-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interestingly, setting showForAllUsers which is supposed to be a repacement for showOnLockScreen does not work. Further, the latter seems to be not only deprecated but also completely ignored, potentially breaking apps. Anyway, setting the flags (FLAG_SHOW_WHEN_LOCKED, FLAG_TURN_SCREEN_ON) works fine. This change allows apps that show on top of keyguard to ask for permissions - a use case is a communication app receiving a call but needing a permission to handle it. Test: manual bug:38312872 Change-Id: I22457ee8b0e68ebd81e7e5f0f0aa216d8f83b9d1
| * | | Import translations. DO NOT MERGEBill Yi2017-05-153-3/+3
| |/ / | | | | | | | | | | | | Change-Id: Ie33b9a229da77cd2759979fd37208fe7727a7156 Auto-generated-cl: translation import
* | | release-request-5a7e5327-d009-4ff8-bf4d-786449486bec-for-git_oc-release-4008 ↵android-build-team Robot2017-05-1534-73/+46
|\| | | | | | | | | | | | | | | | | 030 snap-temp-L55500000063978094 Change-Id: I0dd3e4385ff3dae22a05fb8bd2bd68c44b5ffd3e
| * | Merge "Import translations. DO NOT MERGE" into oc-devBill Yi2017-05-1532-64/+34
| |\ \
| | * | Import translations. DO NOT MERGEBill Yi2017-05-1332-64/+34
| | | | | | | | | | | | | | | | | | | | Change-Id: Icf506c9ac9636616baf01d8c26838922f25ee19a Auto-generated-cl: translation import
| * | | Properly cound disabled individually revocable permissionsSvet Ganov2017-05-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: manual bug:37263576 Change-Id: I018946a18db8a01cc4f27ef68bf21efc51453986
| * | | Merge "Fix missing case to update permission group subtitle" into oc-devSvetoslav Ganov2017-05-142-6/+12
| |\ \ \ | | |/ / | |/| |
| | * | Fix missing case to update permission group subtitleSvet Ganov2017-05-142-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permissions in some groups are individually controlled if permission review mode is enabled. We were not properly updating the subtitle of a group with individually controlled permissions. Also while at this fix a bug where we grnated an intividually controller group if the user granted two permissions in the group. Test: manual bug:33463159 bug:35622170 Change-Id: I0913531d69668ccf2c2fdd3cdf0d9e9a42e67dc0
* | | | release-request-951b3a8b-6c0c-4d2e-8af4-1c3f7e209f66-for-git_oc-release-4006 ↵android-build-team Robot2017-05-1486-11/+122
|\| | | | | | | | | | | | | | | | | | | | | | | 899 snap-temp-L39600000063784275 Change-Id: I68b9b355c5fb3257f70650068d89b6a2d8def9da
| * | | Import translations. DO NOT MERGEBill Yi2017-05-1186-11/+122
| |/ / | | | | | | | | | | | | Change-Id: Id4c73827999639c045a4b0146e357783a975502c Auto-generated-cl: translation import
* | | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-100-0/+0
|\ \ \ | |/ / |/| |
| * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-090-0/+0
| |\ \ | | |/ | |/|
| | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-070-0/+0
| | |\
| | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | |\
| | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | | |\
| | | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | | |/| | | | |/|/
| | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | | |\ | | | | |/ | | | |/|
| | | * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | |\|
| | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | | |\ | | | | |/ | | | |/|
| | | * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-030-0/+0
| | | |\|
| | | | * merge in oc-release history after reset to ↵gitbuildkicker2017-05-030-0/+0
| | | | |\ | | | | |/ | | | |/| | | | | | e3b38660eb56d1695ed6c9b9c23407a40ab0f49d
| | | * | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-030-0/+0
| | | |\|
| | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-020-0/+0
| | | | |\
| | | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-05-010-0/+0
| | | | | |\
| | | | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-270-0/+0
| | | | | | |\
| | | | | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-230-0/+0
| | | | | | | |\
| | | | | | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-200-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in oc-release history after reset to oc-devgitbuildkicker2017-04-180-0/+0
| | | | | | | | | |\