summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importcm-14.1Michael Bestas2019-08-061-0/+1
| | | | Change-Id: I816df5c8b7021bf04d58717ae035c0c5be90729a
* Automatic translation importMichael Bestas2019-03-1013-1783/+354
| | | | Change-Id: I5f1dd20a39bf115ce2ef83aed2888f6fd17909bd
* Automatic translation importMichael Bestas2018-10-142-5/+91
| | | | Change-Id: I3c2756e64f3171b0bbcaff4eb02b1ac63aae4b68
* RESTRICT AUTOMERGE: Always use safe labelsTodd Kennedy2018-08-081-2/+2
| | | | | | | | | | For display purposes, we should always be using safe labels. This prevents excessively long labels from preventing app uninstallation. Bug: 62537081 Test: Manual. Install APK from bug and see that it can be uninstalled Change-Id: Ic0e0d47f5ff76e4a73b30988d0a024fb3ee651ae (cherry picked from commit 25e686d3cf555b99993e8a5c7edb2375171e5392)
* Automatic translation importMichael Bestas2018-02-043-0/+272
| | | | Change-Id: I7c0b443507e11bc914a89b959a1f043323bff9d4
* Automatic translation importMichael W2018-01-132-10/+45
| | | | Change-Id: I79ac56bf6716df9229c64d1f826350464c1579ab
* Automatic translation importAbhisek Devkota2017-12-162-0/+242
| | | | Change-Id: I90f67cc457a8a64c84b53963cab2e41c8b8dca53
* Automatic translation importAbhisek Devkota2017-12-121-0/+121
| | | | Change-Id: I4f6bc295c169fdaea398da54169a1d1ec34203a5
* DO NOT MERGE Fixing Install button not enabled on resumeSuprabh Shukla2017-12-111-1/+1
| | | | | | | | | | | | | | | In cases where an app had a long list of permissions the Install button was not being enabled. Test: Manually clicked on an apk that required a long list of permissions. Checked that the install button is enabled. Switch out and back to the activity to force a pause/resume. The button gets disabled and enabled as expected. Also the existing test passes as before: gts-tradefed run gts-dev -m PackageInstallerTapjacking Bug: 35056974 Change-Id: I2ef7d5ce4e137969c70d2929271620c2bcb723f2 (cherry picked from commit 4c6afe94942c33e293d456be70ffa933d7d3e374)
* Revert "Revert "DO NOT MERGE Disable overlays while installer is resumed""Dan Pasanen2017-12-111-2/+23
| | | | | | This reverts commit 4b0c302eae8d772d09346718559cc42548485f75. Change-Id: Ic69486cc7d1f374a8aba1f4a566e1d96722975fc
* Backport overlay security fixPhil Weaver2017-11-152-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)
* Revert "DO NOT MERGE Disable overlays while installer is resumed"Gabriele M2017-10-151-23/+2
| | | | | | | | | | | | | | | | | If mOkCanInstall is false when onResume() is called, the button gets disabled and never re-enabled. This fix is for branches that have change I42c15d05dffc1f6db69c9f67148f7ceb6e8bd8ae ("Split layout for confirm step.") which causes the button to be disabled and enabled for different reasons. Here the button is constantly enabled and its action changes depending on the value of mOkCanInstall. The attribute filterTouchesWhenObscured should prevent tapjacking when overlays are present, so revert this commit. This reverts commit cec631f26e2cbd7c51fd7c28e05d379d6d0f86db. REGRESSION-1262 Change-Id: I819aab95506672d291e07193b71f074292862754
* DO NOT MERGE Disable overlays while installer is resumedSuprabh Shukla2017-10-021-2/+23
| | | | | | | | | | | The install button can be disabled for other reasons, hence we have to store the enabled state independent of the resumed/paused state. Test: gts-tradefed run gts-dev -m PackageInstallerTapjacking Bug: 35056974 Change-Id: I2effa0f5afacfaed217a030550a778e32912cfbb (cherry picked from commit 172eddd2ff07d9849496de586b3a785d8abc4441)
* Automatic translation importAbhisek Devkota2017-09-181-40/+6
| | | | Change-Id: Ifd0f0f30d2af96e04f3ff71f9c03275fb01332ee
* Automatic translation importAbhisek Devkota2017-05-181-1/+1
| | | | Change-Id: I26a9d9e5f82ab57fd2bdf1167bd8992abd6a6443
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-05242-2269/+1535
|\ | | | | | | | | | | | | | | Android 7.1.2 Release 2 (N2G47E) # gpg: Signature made Mon 03 Apr 2017 01:41:50 AM CDT # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
| * Import translations. DO NOT MERGEBill Yi2017-02-036-21/+21
| | | | | | | | | | Change-Id: Ia5fe61f4c5d9a846f69eaece6d0bf26362a48ddb Auto-generated-cl: translation import
| * Don't show dialog when create the base view.Shijian Li2017-02-011-1/+0
| |\ | | | | | | | | | | | | | | | am: f44d80b62c Change-Id: I11cdcc5060319b4f613be187a742a0a79f57f080
| | * Don't show dialog when create the base view.Shijian Li2017-01-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, there will be a screen with background color splashes if the user has any permission revoked in a group as user fixed. Bug: 34722442 Change-Id: I38a3793a366c8132f5b7c5294c478b4876cd4b9e
| * | Merge "Set USER_FIXED for all non-granted permissions as long as one in the ↵Shijian Li2017-01-240-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | group is changed." into cw-f-dev am: 0b37fee3ac Change-Id: I4dd0d5600d990cdfd2af4e39da0245a4b33bd70b
| | * Merge "Set USER_FIXED for all non-granted permissions as long as one in the ↵TreeHugger Robot2017-01-242-0/+41
| | |\ | | | | | | | | | | | | group is changed." into cw-f-dev
| * | \ Set USER_FIXED for all non-granted permissions as long as one in the group ↵Shijian Li2017-01-242-0/+41
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | is changed. am: 275897a5a5 Change-Id: Id4ddf57e660e0ea339f8bafa1aa02dcce0c0c894
| | * | Set USER_FIXED for all non-granted permissions as long as one in the groupShijian Li2017-01-232-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is changed. This only applies to individually controlled permission group. Test: Manually test on a local build. Bug: 34561693 Change-Id: I24f83a56d4011253ed2aa78dd0613021dfe56136
| * | | Tweak resource selector to only pick width for watch percentage size.Michael Kwan2017-01-235-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | am: 38a75aef51 Change-Id: Icc95e751beba2e4459a60a9dc680e54fa30dc7f9
| | * | Tweak resource selector to only pick width for watch percentage size.Michael Kwan2017-01-215-0/+0
| | |/ | | | | | | | | | | | | Bug: 32643912 Change-Id: Ie6298f96448d97e49eab90d1e2271863cfd6bbd2
| * | Partial cherry-pick changes on permission model change.Shijian Li2017-01-203-33/+26
| |\ \ | | |/ | | | | | | | | | | | | am: b8e4193e57 Change-Id: I06ddf41de29c70df865434685ee7cb652cfddbbd
| | * Partial cherry-pick changes on permission model change.Shijian Li2017-01-193-33/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meanwhile, aligned with handheld logic that revoking individually controlled permission is marked as user fixed. The original commit id I1d6cbc478c789e7680f41b92b9f3fa2504576ecd. Test: Manual test on a local build. Bug: 34440353 Change-Id: Ie3bb75225246eefef954926f94295181f4daebd0
| * | Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ↵Philip P. Moltmann2017-01-100-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | dad7e5318d am: 9900459942 am: 3a5438889d am: b6d50f07b1 am: 4ffee84321 am: 18f598e2a2 Change-Id: I20fb970762802ce97de606f473023d0b5951d319
| | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ↵Philip P. Moltmann2017-01-100-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dad7e5318d am: 9900459942 am: 3a5438889d am: b6d50f07b1 am: 4ffee84321 Change-Id: I074d873cd93c6b95adad38cd583dcc779710019f
| | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ↵Philip P. Moltmann2017-01-100-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dad7e5318d am: 9900459942 am: 3a5438889d am: b6d50f07b1 Change-Id: Ideeceb3ba10e291da8b7e921d100b2b8282ed17b
| | | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ↵Philip P. Moltmann2017-01-100-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dad7e5318d am: 9900459942 am: 3a5438889d Change-Id: I0ecef80ad863dee7ab99e8899653263f6783839b
| | | | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27 am: ↵Philip P. Moltmann2017-01-100-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dad7e5318d am: 9900459942 Change-Id: Iaf35e56ab6d3a3cedaa433b0869b958afde0b634
| | | | | | * Prioritize package installer intent filter am: 17e1b04990 am: 84018d0e27Philip P. Moltmann2017-01-101-6/+6
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dad7e5318d Change-Id: I52596d2c5c73d356379e7cb0f77de00a0c6e0073
| | | | | | | * Prioritize package installer intent filter am: 17e1b04990Philip P. Moltmann2017-01-101-6/+6
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 84018d0e27 Change-Id: I4250f4d6dcb0dc75381879ffcacc1284f528cbf8
| | | | | | | | * Prioritize package installer intent filterPhilip P. Moltmann2017-01-101-6/+6
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 17e1b04990 Change-Id: Icbd59d008fa860967010d1130746f2a54bd3e8b1
| | | | | | | | | * Prioritize package installer intent filterPhilip P. Moltmann2016-12-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package Installer intent should always be handled by the package installer. Only privilegded apps can have a priority > 0. The K version is I79fd77b12bad9b79d1a53d08629a2b07919aad2c The L version is I27611baae21c3820f594e8f58aec34fc4d0b1ffb Bug: 32553261 Change-Id: I7f1726fc9665e57ec63c966570169216eb2e0764
| * | | | | | | | | Prioritize package installer intent filter am: 540a404bd4 am: 494808ab11 am: ↵Philip P. Moltmann2017-01-101-8/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9799139d75 am: 005b69861a Change-Id: Ia4f6b9001418e833585155f98209b7ebfa4f1d1d
| | * | | | | | | | Prioritize package installer intent filter am: 540a404bd4 am: 494808ab11Philip P. Moltmann2017-01-101-8/+8
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9799139d75 Change-Id: I0aeb291c5bbfb00d6a8999310c4f742717284bc6
| | | * | | | | | | Prioritize package installer intent filter am: 540a404bd4Philip P. Moltmann2017-01-101-8/+8
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 494808ab11 Change-Id: I643cda01d79fe47117bb0ee6ea544800eca17f42
| | | | * | | | | | Prioritize package installer intent filterPhilip P. Moltmann2017-01-101-8/+8
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 540a404bd4 Change-Id: I34da802f33372e9a8caa01ce70389d6851845881
| | | | | * | | | | Prioritize package installer intent filterPhilip P. Moltmann2016-12-091-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package Installer intent should always be handled by the package installer. Only privilegded apps can have a priority > 0. The K version is I79fd77b12bad9b79d1a53d08629a2b07919aad2c The L version is I27611baae21c3820f594e8f58aec34fc4d0b1ffb The M version is I7f1726fc9665e57ec63c966570169216eb2e0764 Bug: 32553261 Change-Id: I3d9054ddd475c7e77e1696e31285a6b47d59fa2a
| * | | | | | | | | Merge "Don't set USER_FIXED when revoking a permission inside Settings -> ↵Shijian Li2017-01-090-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | App." into cw-f-dev am: d5b0cf6133 Change-Id: I4f6ec606d876e592bf7432fd5c39b3731ab4cfa3
| | * | | | | | | | Merge "Don't set USER_FIXED when revoking a permission inside Settings -> ↵TreeHugger Robot2017-01-091-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | App." into cw-f-dev
| * | \ \ \ \ \ \ \ \ Don't set USER_FIXED when revoking a permission inside Settings -> App.Shijian Li2017-01-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f7d0ef9f74 Change-Id: I7cc4dcd66edcd68366f40fd67e812d76fb2dcb3b
| | * | | | | | | | | Don't set USER_FIXED when revoking a permission inside Settings -> App.Shijian Li2017-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Manually tested on a permission test apk. Bug: 34157400 Change-Id: Ia2ce3ac6c567f869535ec92a896c6d0fd9ec6318
| * | | | | | | | | | Add refresh logic for individually controlled permission in onResume.Shijian Li2017-01-091-3/+14
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8bb2553798 Change-Id: Ibd2704c76e63a57c9f4aee6085e909cf984df68f
| | * | | | | | | | | Add refresh logic for individually controlled permission in onResume.Shijian Li2017-01-091-3/+14
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Manually test with a testing apk. Bug: 34157556 Change-Id: I78ffbfa2fbbff14fb05242d7979cd226b1725ba7
| * | | | | | | | | Expand all permissions when permissions in a group are individually managed.Shijian Li2017-01-032-53/+116
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1019d73896 Change-Id: I1e9d82744c4294786ff7cce16ef2eca945c5de9c
| | * | | | | | | | Expand all permissions when permissions in a group are individually managed.Shijian Li2017-01-032-53/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Manually tested on sawshark_sw where WRITE_CONTACTS and READ_CONTACTS are shown separately for Android Wear App. Also tested on sawshark where only one "Contacts" group shown on behalf of WRITE_CONTACTS and READ_CONTACTS. Bug: 33856934 Change-Id: I299c54e38236d039204a01d8113f427b1fc71c43
| * | | | | | | | | Merge "stop incorrectly showing unknown sources prompt" am: 5e4d32ccfcDaniel Micay2016-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e931327ee0 Fixes: 33578153 Change-Id: I9b7f116b8c05d5e3da71d31266bf94ac38ef987d (cherry picked from commit b2ebcceb8d04dcf85e7d49af1630de60af2bf6f1)