summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r37' into ↵lineage-17.1Kevin F. Haggerty2020-06-0129-201/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-17.1_merge-android-10.0.0_r37 Android 10.0.0 Release 37 (QQ3A.200605.001) * tag 'android-10.0.0_r37': Import translations. DO NOT MERGE DO NOT MERGE: Chassify PermissionController Import translations. DO NOT MERGE Change-Id: I9d0c14dc1562c68a53f8cafe01024f244c7ba8b2
| * Snap for 6320329 from 42838e2ee7b30538fd43bbf530b108ef03a59a82 to ↵android-build-team Robot2020-03-2120-45/+45
| |\ | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: Id588bc85c6248b808f002741d64f9a55a651abd5
| | * Import translations. DO NOT MERGEBill Yi2020-03-2020-45/+45
| | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I01027c32c8666e6f3153d735722e3fce5263a927
| * | Snap for 6300693 from e861749b6537943ed0197dc712f8a8722baf0cac to ↵android-build-team Robot2020-03-169-152/+39
| |\| | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I51681fd08200048d748c2f1d1fcbbf275a312d58
| | * DO NOT MERGE: Chassify PermissionControllerCole Faust2020-03-139-152/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was chassified in P, but never made it's way to Q because it was renamed from PackageInstaller -> PermissionController Not using baselayouts yet. Fixes: 151254284 Test: Manually Change-Id: Ia489787a89b076722c540a19521a344b71816a31
| * | Snap for 6131975 from d08040fabe25bd81db1100c578b98bf03884a1a0 to ↵android-build-team Robot2020-01-143-4/+4
| |\| | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I7ab379bb6ceba2bd0c87f08233bc995ce1492ca6
| | * Import translations. DO NOT MERGEBill Yi2020-01-123-4/+4
| |/ | | | | | | | | Change-Id: I51baf91ec9e6e777ac2310d1751f84a36abfe7a9 Auto-generated-cl: translation import
* | Automatic translation importMichael Bestas2020-04-231-1/+309
| | | | | | | | Change-Id: I64932f7be7310b1041db347dacfd9147811e76de
* | Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31Luca Stefani2020-03-07263-24438/+24474
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 10.0.0 release 31 * tag 'android-10.0.0_r31': Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..." Import translations. DO NOT MERGE Remove permission usage from settings search Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Always copy file before parsing it for installing DO NOT MERGE Set module versions to 299900000 Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules. [DO NOT MERGE] Grant all access_media_location permission Update PermissionChecker usages to avoid unnecessary attribution. Keep "None" set for assistant upon device upgrade. Fix crash when role data isn't loaded after restoring state. add java_api_finder plugin to mainline module PermissionController to generate java APIs used by PermissionController. Change-Id: Ie5962d1e418b1bdd9cbc997a00234dcf91a50029
| * \ Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362, ↵android-build-team Robot2020-01-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | 10101479, 10101363, 10101110, 10101480, 10102031, 10102032, 10101596, 10101364] into qt-qpr2-release Change-Id: I8dd0879c79c85f4d330dfb671ff0ae7a2d3ea475
| | * | Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..."Akshay Thakker2020-01-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..." Revert submission 618813-1573140820154-3a63801 Reverted Changes: I03dd46c2d: DO NOT MERGE Set module versions to 299900000 Dev ... Id4339413c: DO NOT MERGE Set module versions to 299900000 Dev ... I9c0cec312: DO NOT MERGE ANYWHERE Set module versions to 29990... I0580a3d45: DO NOT MERGE Set module versions to 299900000 Dev ... I5b61aded4: DO NOT MERGE Set module versions to 299900000 Dev ... Bug: b/144902035 Change-Id: Iea351a061fd98d25bffefcfd5aeebc462ca266c1 (cherry picked from commit 8aad30431894337083e5cfc1517c381b5bc97bdb)
| * | Snap for 6095135 from 3a9807f25f579ff097280e7c1ae390e9ebed5a18 to ↵android-build-team Robot2019-12-243-3/+3
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: If1483c94ea1bd96b1569e41f28d66258b92ab8dd
| | * Import translations. DO NOT MERGEBill Yi2019-12-223-3/+3
| | | | | | | | | | | | | | | Change-Id: I5b0157f86e869676488493233ab144334239044b Auto-generated-cl: translation import
| * | Snap for 6091187 from b65c7fa0d652407c06945d6c1d3ea50a39fad483 to ↵android-build-team Robot2019-12-212-21/+8
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: Icdcb6c4021c8bb6c7cacd992dd0f38fafaf9a737
| | * Remove permission usage from settings searchNate Myren2019-12-192-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ability to find the permission dashboard by searching settings, and remove the code to handle that intent in the ManagePermissionActivityTrampoline. Fixes: 146560886 Test: Go to settings-> search "permission". The "permission dashboard" should not be in the options Change-Id: Ib9fc8ab635ed648bc05dcdb23f3d086062bee84c
| * | Snap for 6047316 from 5538e7c238c7f66c9b379d218f71afeb20fe1f08 to ↵android-build-team Robot2019-12-041-2/+2
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: Ia974f6ebabda2727e6455d2aa80759140bae28c4
| | * Import translations. DO NOT MERGEBill Yi2019-12-021-2/+2
| | | | | | | | | | | | | | | Change-Id: I168ec6b2ee12cdb9fad96e5e3c329822f0aaf8f8 Auto-generated-cl: translation import
| * | Snap for 6034952 from db202f80676042b5558cd22dbd1e1a52fd33c9c1 to ↵android-build-team Robot2019-11-27255-24416/+24416
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: Idac948e42d7ceac3ba5be5b98d4f2e8a1b7c1450
| | * Import translations. DO NOT MERGEBill Yi2019-11-25255-24416/+24416
| | | | | | | | | | | | | | | Change-Id: If238052a1a028f37a172eddb01dcc64b370c8875 Auto-generated-cl: translation import
| * | Snap for 5999326 from d7fe1125c647a4df66ba69196600ec12c08090e9 to ↵android-build-team Robot2019-11-1140-82/+82
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: Ic26ae6d81b04b56c85f1449a02c9563693771b1f
| | * Import translations. DO NOT MERGEBill Yi2019-11-0940-82/+82
| | | | | | | | | | | | | | | Change-Id: I05523f884507065a210e77c3383c01681868bb3d Auto-generated-cl: translation import
| * | Snap for 5998981 from 3ffb677244a3b6770845076b6a1badd228090efe to ↵android-build-team Robot2019-11-101-1/+1
| |\| | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: I8cba1ec6d6995ebcd2be534d4eb1aab95d748062
| | * Merge "DO NOT MERGE Set module versions to 299900000 Dev branch modules need ↵Akshay Thakker2019-11-071-1/+1
| | |\ | | | | | | | | | | | | to have a super high version code so that they can be sideloaded on any device running any version of modules." into qt-qpr1-dev
| | | * DO NOT MERGE Set module versions to 299900000Akshay2019-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules. Bug:143377911 Change-Id: I0580a3d452a7c4241ba7eb162f7431ece63d9fed
| * | | Snap for 5991964 from c7f9ea7fde9b891a4135fa8e54f06f417d7d732f to ↵android-build-team Robot2019-11-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: I9f4a9313c6f35f2f71b53b6371f999f994df6f7c
| | * | [automerger skipped] Always copy file before parsing it for installing am: ↵Philip P. Moltmann2019-11-060-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | cede54cce1 am: d8b1a3522f -s ours am: c85d1bd3c9 -s ours am: 6c855d397f -s ours am: 855968203e -s ours am: fd1324ebba -s ours am skip reason: change_id Ib2abc1d84311dec40e2f9e78551850984cd7ab82 with SHA1 731ab89e06 is in history Change-Id: I872870fb506c15c5e3acc905e09d8a14d6163d16
| | | * [automerger skipped] Always copy file before parsing it for installing am: ↵Philip P. Moltmann2019-11-060-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cede54cce1 am: d8b1a3522f -s ours am: c85d1bd3c9 -s ours am: 6c855d397f -s ours am: 855968203e -s ours am skip reason: change_id Ib2abc1d84311dec40e2f9e78551850984cd7ab82 with SHA1 731ab89e06 is in history Change-Id: Ic0a334803af61daaa3884540abe290afc2aaceac
| | | | * [automerger skipped] Always copy file before parsing it for installing am: ↵Philip P. Moltmann2019-11-060-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cede54cce1 am: d8b1a3522f -s ours am: c85d1bd3c9 -s ours am: 6c855d397f -s ours am skip reason: change_id Ib2abc1d84311dec40e2f9e78551850984cd7ab82 with SHA1 731ab89e06 is in history Change-Id: Ifde8f9ad9b830915ee174e6c55727820cd14390f
| | | | | * [automerger skipped] Always copy file before parsing it for installing am: ↵Philip P. Moltmann2019-11-060-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cede54cce1 am: d8b1a3522f -s ours am: c85d1bd3c9 -s ours am skip reason: change_id Ib2abc1d84311dec40e2f9e78551850984cd7ab82 with SHA1 731ab89e06 is in history Change-Id: I8800a564653c277ae485b4132dc3b0d07b505d94
| | | | | | * [automerger skipped] Always copy file before parsing it for installing am: ↵Philip P. Moltmann2019-11-060-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cede54cce1 am: d8b1a3522f -s ours am skip reason: change_id Ib2abc1d84311dec40e2f9e78551850984cd7ab82 with SHA1 731ab89e06 is in history Change-Id: I580a688c26f94b035730d72400d8e8a911cb7304
| | | | | | | * Always copy file before parsing it for installingPhilip P. Moltmann2019-11-062-16/+13
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: cede54cce1 Change-Id: Ief5f92017590a69a70a2192e60298bc49488c2cd
| | | | | | | | * Always copy file before parsing it for installingPhilip P. Moltmann2019-11-062-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 731ab89e06eb9a8d0b0ba8fc7e4df45c42c8741e) Fixes: 129039920 Fixes: 140195904 Merged-In: Ib2abc1d84311dec40e2f9e78551850984cd7ab82
| * | | | | | | | Snap for 5968679 from ea47782c915259d5ea0aa9063ce67d3a5439b891 to ↵android-build-team Robot2019-10-265-3/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: If2e22da7d7b94d85dd21e0839255c5cb1a4ea472
| | * | | | | | | [DO NOT MERGE] Grant all access_media_location permission am: 1a633927ddPhilip P. Moltmann2019-10-250-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7f6badbaf Change-Id: I0f07b8ecde554a128fce3232a0e7befdde357f5f
| | | * | | | | | [DO NOT MERGE] Grant all access_media_location permissionPhilip P. Moltmann2019-10-251-2/+42
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1a633927dd Change-Id: I0bc8a9113ac8d8bc9b188c301133f3f4c127806c
| | | | * | | | | [DO NOT MERGE] Grant all access_media_location permissionPhilip P. Moltmann2019-10-241-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Manual testing: All combinations of - App targetSdk = 28 and 29 (and 22 for extra credit) - App having the <uses-permission> tag for ACCESS_MEDIA_LOCATION or not - Upgrade from P->Q-QPR and from vanilla Q->Q-QPR Further upgrade of targetSdk from 28->29 while on Q-QPR ==> All permission behavior should make sense. Sometimes there are weird, but expected behaviors. Hence we need to collect the results and then look at the unexpected ones. See SplitPermissionTest for some tests I added for the location-background permission which was split from the fine/coarse-location permissions Bug: 140961754 Change-Id: I11f0b77d86d0c07b9bcd41eee337f36bacf0dabd (cherry picked from commit 0573d628b3ee3dc73f49920271a4d27f6c07e1d9)
| | * | | | | | | Merge "Keep "None" set for assistant upon device upgrade." into qt-qpr1-devTreeHugger Robot2019-10-244-0/+40
| | |\ \ \ \ \ \ \
| | | * | | | | | | Keep "None" set for assistant upon device upgrade.Hai Zhang2019-10-014-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the assistant role is added for the first time, the device is upgrading, and legacy role resolution didn't set any holder, it implies the user selected "None" for assistant, and we need to keep that in our new implementation. Fixes: 141255935 Test: manual Test: Upgrade P => Q without this CL and "None" assistant is lost Test: Upgrade P => Q with this CL and "None" assistant is kept Test: Fresh Q with this CL gets the default assistant set Change-Id: Ie2668d29c43751686dbe9523bcc298b73618fc91 (cherry picked from commit 2055184476e39e013219924616fc3d9b002ad494)
| | * | | | | | | | Merge "Fix crash when role data isn't loaded after restoring state." into ↵TreeHugger Robot2019-10-241-3/+10
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev
| | | * | | | | | | | Fix crash when role data isn't loaded after restoring state.Hai Zhang2019-10-011-3/+10
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where we have a saved state but view model is destroyed, ListView.getCheckedItemPosition() may return a valid position when we haven't got the item loaded yet. This change ensures we don't enable the positive button before role data is loaded, and updates the UI again when we have the data available. Fixes: 141367460 Test: presubmit Change-Id: Ia24cb6396f9038cac4f9bd490705ebca2c4b4a4a (cherry picked from commit 43d3eec93e10ca6977ed3c1bf0c94f394c7d1d26)
| * | | | | | | | | Snap for 5922641 from ab2e1ec8e5eac06f3288d57a9591a609cd0ece8e to ↵android-build-team Robot2019-10-052-6/+63
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: I0a73f762fad7001fa5a218653c3ab47c80990221
| | * | | | | | | | Merge "Update PermissionChecker usages to avoid unnecessary attribution." ↵Philip P. Moltmann2019-10-042-6/+63
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-dev am: 22e3396d74 am: 16c43ba73d Change-Id: Ie694894d0c91d3ffa261aeda5cfa718554675132
| | | * | | | | | | Merge "Update PermissionChecker usages to avoid unnecessary attribution." ↵Philip P. Moltmann2019-10-042-6/+63
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-dev am: 22e3396d74 Change-Id: I474178fabd33738a10088e1f47ee8526e65672db
| | | | * | | | | | Merge "Update PermissionChecker usages to avoid unnecessary attribution." ↵Philip P. Moltmann2019-10-042-6/+63
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-dev
| | | | | * | | | | | Update PermissionChecker usages to avoid unnecessary attribution.Svet Ganov2019-10-032-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had accidental usages of the PermissionChecker for cases where no private data was provided to the app but the checkPermission API on the latter also did blame data access on the app. The PermissionChecker was designed to handle IPC calls and not for generic API checks. To avoid future accidental incorrect PermissionChecker usages this change renames the existing APIs of the latter to clearly indicate that they should be used for data delivery and also adds sibling methods for doing the same permission checks for preflight purposes. Also the documentation is improved to furhter assist developers. In addition, this change fixes accidental permission checker usages that blame when they should not by using the new preflight flavor of the permission check APIs. Test: atest com.android.settingslib.location.RecentLocationAppsTest atest CtsPermissionTestCases added: LocationAccessCheckTest#notificationOnlyForAccessesSinceFeatureWasEnabled added: LocationAccessCheckTest#noNotificationIfFeatureDisabled added: LocationAccessCheckTest#noNotificationIfBlamerNotSystemOrLocationProvider added: LocationAccessCheckTest#testOpeningLocationSettingsDoesNotTriggerAccess bug:141028068 Merged-In: I902a0ab049783a222ac2acdfac93ecd49f34dece Change-Id: I902a0ab049783a222ac2acdfac93ecd49f34dece
| * | | | | | | | | | Snap for 5919859 from a5075bbd58961399b6e39128d8f13481441512ae to ↵android-build-team Robot2019-10-041-0/+2
| |\| | | | | | | | | | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr2-release Change-Id: I42d1f0d55713464d0ee87ee42579af6214ed20fc
| | * | | | | | | | Merge "add java_api_finder plugin to mainline module PermissionController to ↵Kun Niu2019-10-031-0/+2
| |/| | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate java APIs used by PermissionController." into qt-dev am: ebe20e59c4 am: f41f8e8461 Change-Id: Iaa5c4a222ebfb67151d7ceef06ddf496a159719b
| | * | | | | | | Merge "add java_api_finder plugin to mainline module PermissionController to ↵Kun Niu2019-10-031-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate java APIs used by PermissionController." into qt-dev am: ebe20e59c4 Change-Id: I2e7ec9286c062caacfe8e0b7b0ef282ba64fcc7e
| | | * | | | | | Merge "add java_api_finder plugin to mainline module PermissionController to ↵TreeHugger Robot2019-10-031-0/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | generate java APIs used by PermissionController." into qt-dev
| | | | * | | | | add java_api_finder plugin to mainline module PermissionController to ↵Kun Niu2019-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate java APIs used by PermissionController. Bug: 129294170 Test: m PermissionController RUN_ERROR_PRONE=true |& tee permissioncontroller_error_prone.out Change-Id: I74fdaf4e4558976e44675abdc31a13558fb42686 Merged-In: I74fdaf4e4558976e44675abdc31a13558fb42686 (cherry picked from commit edb0cb3fa9bc9bf248a8cf41e32ec07ed587cf13)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 02:40:59 +0000