summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importlineage-16.0Michael W2020-03-286-5/+29
| | | | Change-Id: I1e14d4d7b7099f8440d274a8d159b42c2a4e2646
* Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsiLuca Stefani2019-07-130-0/+0
|\ | | | | | | | | | | | | * aosp/pie-gsi: [RESTRICT AUTOMERGE]: OP_REQUEST_INSTALL_PACKAGES denied by default Change-Id: I6a6a354fda9794e3a697c42fdb40b86e6c87bd3f
| * Merge "Snap for 5622519 from 73e82477c145d8178180382a5ad2b9f9fa4b8235 to ↵Android Merger2019-07-090-0/+0
| |\ | | | | | | | | | pi-platform-release am: dbd2ae2b63" into pie-gsi
| | * Snap for 5622519 from 73e82477c145d8178180382a5ad2b9f9fa4b8235 to ↵android-build-team Robot2019-07-090-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: dbd2ae2b63 Change-Id: I3d866afee318554ea859e08aa491314d6430251d
| | * Snap for 5622519 from 73e82477c145d8178180382a5ad2b9f9fa4b8235 to ↵android-build-team Robot2019-07-080-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: Ic483292035424cb7669e98d125d777e1db809c0f
| | | * Merge cherrypicks of [7513497, 7518418, 7517880, 7517881, 7517882, 7517883, ↵android-build-team Robot2019-05-151-11/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 7517884, 7517885, 7517886, 7517956, 7517957, 7518438, 7518102, 7517887, 7518141, 7518142, 7518143, 7518144, 7517888, 7517889, 7517890, 7517891, 7518439, 7518440, 7518441, 7518442, 7518443, 7518029, 7518104, 7517892, 7517893, 7518061, 7518444, 7517894, 7517895, 7518030, 7518031, 7518445, 7517896, 7517969, 7517897, 7518105, 7518145, 7518146, 7518446] into pi-qpr3-b-release Change-Id: I1cbd744ec2d52fed9382926da7b52731817758f1
| | | | * [RESTRICT AUTOMERGE]: OP_REQUEST_INSTALL_PACKAGES denied by defaultChristopher Dombroski2019-05-151-11/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some system apps may download unknown content and the user should be explicitly asked whether they trust these files. System apps should explicitly use the extra NOT_UNKNOWN_SOURCE to bypass this check. Test: Builds, boots, existing tests pass: atest CtsPackageInstallTestCases Locally verified they pass if CtsPackageInstallTestCases.apk was signed by the platform cert. Bug: 123700348 Change-Id: I5a05b9a6d41bfbff9cd4cf2e26301dfa6fc64a9d (cherry picked from commit 4c5493f65ad4add90cc1e8ee02c0814fcf4f0c32)
| | | * Snap for 5335558 from c51083ab879a3f4c020f00eeb19c4627d35a8e04 to ↵android-build-team Robot2019-02-269-155/+155
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: If8a66d44931d800dcd664a90da2ff1dd30bd33a4
| * | | \ Merge "Snap for 5600800 from d6b752934f71c3c59b6339900f07b204dce0d505 to ↵Android Merger2019-07-091-11/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | pi-platform-release am: b5641733bf" into pie-gsi
| | * | | | Snap for 5600800 from d6b752934f71c3c59b6339900f07b204dce0d505 to ↵android-build-team Robot2019-07-091-11/+0
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: b5641733bf Change-Id: I6788febbaf0d36208899175056196fc520293155
| | * | | Snap for 5600800 from d6b752934f71c3c59b6339900f07b204dce0d505 to ↵android-build-team Robot2019-07-081-11/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I91c3e895f158fc6864659b4916c0a9cecdfb1c94
| * | \ \ \ Merge "Snap for 5450365 from b101f7ec0e6142b31946ae1a4da58ec4ef9ea690 to ↵Android Merger2019-05-1313-199/+199
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 4f09f8e946" into pie-gsi
| | * | | | | Snap for 5450365 from b101f7ec0e6142b31946ae1a4da58ec4ef9ea690 to ↵android-build-team Robot2019-05-1313-199/+199
| |/| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 4f09f8e946 Change-Id: I8fe515d36c01fa1e22c0912537395928e234140d
| | * | | | Snap for 5450365 from b101f7ec0e6142b31946ae1a4da58ec4ef9ea690 to ↵android-build-team Robot2019-05-0713-199/+199
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I8a6918b3903de0c044955b3309af8a4884e511d4
| * | \ \ \ \ Merge "Snap for 5240760 from 2d763bd5d06c08402d32a18260e56fee79c763df to ↵Android Merger2019-03-081-0/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: bd0a23fe61" into pie-gsi
| | * | | | | | Snap for 5240760 from 2d763bd5d06c08402d32a18260e56fee79c763df to ↵android-build-team Robot2019-03-081-0/+27
| |/| | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: bd0a23fe61 Change-Id: I8879e7c192714262515fefee2cd8007076f543a3
| | * | | | | Snap for 5240760 from 2d763bd5d06c08402d32a18260e56fee79c763df to ↵android-build-team Robot2019-03-081-0/+27
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I8fb14c11669cf84675976d1cae704e722132ebbb
| * | \ \ \ \ \ Merge "Snap for 5180536 from ded9a473ea2f7691b7e65296ec7d19c06d6dee99 to ↵Android Merger2019-02-119-29/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 0e9d43d382" into pie-gsi
| | * | | | | | | Snap for 5180536 from ded9a473ea2f7691b7e65296ec7d19c06d6dee99 to ↵android-build-team Robot2019-02-119-29/+29
| |/| | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 0e9d43d382 Change-Id: I0ecff6d3cbdc440ffe4a100684d5a11e2ed6e350
| | * | | | | | Snap for 5180536 from ded9a473ea2f7691b7e65296ec7d19c06d6dee99 to ↵android-build-team Robot2019-02-099-29/+29
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I4627d3100bc393cb063c311b1955a921d8366fdb
| * | \ \ \ \ \ \ Merge "Snap for 5230900 from 31195c7d898f1e59f04bc395727b17af3558e4dd to ↵Android Merger2019-01-151-2/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 675955185b" into pie-gsi
| | * | | | | | | | Snap for 5230900 from 31195c7d898f1e59f04bc395727b17af3558e4dd to ↵android-build-team Robot2019-01-141-2/+7
| |/| | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 675955185b Change-Id: I833a4da64a73d2f9197de3adf989c359b113dd19
| | * | | | | | | Snap for 5230900 from 31195c7d898f1e59f04bc395727b17af3558e4dd to ↵android-build-team Robot2019-01-141-2/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: Ib41162605d8a2a07f304b9bf00b39b93a122912e
| | | * | | | | | | January Pi-platform-release mergesAdam Seaton2019-01-111-2/+7
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22ea34108a31de5b18e9b1718fb0dbbe6d4eba90
| * | | | | | | | | Merge "Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release am: ↵Android Merger2018-11-304-5/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c31ef5458" into pie-gsi
| | * | | | | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-304-5/+5
| |/| | | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4c31ef5458 Change-Id: I22dee058d9ea7765656b8d9754208dca0a98c236
| | * | | | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-284-5/+5
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c0b882716a005ceb4a189fb38a1b9e447932fc3
* | | | | | | | | | Merge tag 'android-9.0.0_r44' into staging/lineage-16.0_merge-android-9.0.0_r44Kevin F. Haggerty2019-07-011-11/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 44 (PQ3A.190705.003) * tag 'android-9.0.0_r44': [RESTRICT AUTOMERGE]: OP_REQUEST_INSTALL_PACKAGES denied by default Change-Id: I6f3864e8ef3e861cbf34572f9a952bb7a93f607c
| * | | | | | | | | Merge cherrypicks of [7496339, 7495273, 7495624, 7496340, 7496341, 7496342, ↵android-build-team Robot2019-05-141-11/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7496343, 7495658, 7494789, 7494790, 7494791, 7496344, 7496345, 7496346, 7496347, 7496574, 7496348, 7496575, 7496576, 7496260, 7496349, 7496350, 7496440, 7496577, 7496578, 7496261, 7495625, 7496442, 7496351] into pi-qpr3-release Change-Id: I22c0d25a54e8b131261a0792f0e78b838fc89086
| | * | | | | | | | [RESTRICT AUTOMERGE]: OP_REQUEST_INSTALL_PACKAGES denied by defaultChristopher Dombroski2019-05-141-11/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some system apps may download unknown content and the user should be explicitly asked whether they trust these files. System apps should explicitly use the extra NOT_UNKNOWN_SOURCE to bypass this check. Test: Builds, boots, existing tests pass: atest CtsPackageInstallTestCases Locally verified they pass if CtsPackageInstallTestCases.apk was signed by the platform cert. Bug: 123700348 Change-Id: I5a05b9a6d41bfbff9cd4cf2e26301dfa6fc64a9d (cherry picked from commit 4c5493f65ad4add90cc1e8ee02c0814fcf4f0c32)
* | | | | | | | | Merge tag 'android-9.0.0_r37' into staging/lineage-16.0_merge-android-9.0.0_r37Kevin F. Haggerty2019-05-0613-199/+199
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 37 (PQ3A.190505.002) * tag 'android-9.0.0_r37': Import translations. DO NOT MERGE Ask for PIN when granting permissions in front of lock screen Import translations. DO NOT MERGE Change-Id: Iab277332700c3281996f52373f628ea72330127f
| * | | | | | | | Snap for 5339334 from c51083ab879a3f4c020f00eeb19c4627d35a8e04 to ↵android-build-team Robot2019-02-279-155/+155
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | pi-qpr3-release Change-Id: I95792c8d30b91f8754bf69e183c16d3d6a2c2bbf
| | * | | | | | Import translations. DO NOT MERGEBill Yi2019-02-209-155/+155
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I8f5514f4d986f5ff2eb75843cd18a723cd9a3195
| * | | | | | Ask for PIN when granting permissions in front of lock screen am: b5302e6789 ↵Philip P. Moltmann2019-01-081-0/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55c96e9be4 am: 7afcf03308 Change-Id: I13b21e5ce919c482e616cb40b7d65dc42a540d07
| | * \ \ \ \ \ Ask for PIN when granting permissions in front of lock screen am: b5302e6789Philip P. Moltmann2019-01-081-0/+27
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55c96e9be4 Change-Id: I790d9c25c31f8eaef6c045246eb36ec33d042f9e
| | | * \ \ \ \ \ Ask for PIN when granting permissions in front of lock screenPhilip P. Moltmann2019-01-081-0/+27
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b5302e6789 Change-Id: Ie5d7ce4e96e54b769914c77b32397b28e7249a6b
| | | | * | | | | | Ask for PIN when granting permissions in front of lock screenPhilip P. Moltmann2019-01-021-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: - Revoked all permissions from camera - Set lock screen PIN - Opened camera app -> Camera app asks for permissions - Locked screen - Granted permission from in front of lock screen Bug: 68777217, 65337954 Merged-In: I8358f1eba436786b25b2c2b0c12ac7dcfd334fec Change-Id: I3f252e2c325bd638ea29d1ce63b12e391e13c8f0
| * | | | | | | | | Import translations. DO NOT MERGEBill Yi2018-12-294-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I8c4207b21173a769bd69d965e0e75e4f355b2d7b
* | | | | | | | | | Automatic translation importMichael Bestas2019-04-081-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I04dc888c604bdd25d9626d64b11b163a70270f68
* | | | | | | | | | Automatic translation importMichael W2019-03-1121-2749/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3fd1ff7c8d03a1d6d8a99c6cf430bb56328e6ae
* | | | | | | | | | Merge tag 'android-9.0.0_r34' into lineage-16.0-android-9.0.0_r34Luca Stefani2019-03-081-0/+27
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 34 (PQ2A.190305.002) * tag 'android-9.0.0_r34': Ask for PIN when granting permissions in front of lock screen Change-Id: Ie1c1f6057a8009e7741951e37f12f04706e18088
| * | | | | | | | | Merge cherrypicks of [6072697, 6072075, 6072758, 6072124, 6072885, 6072886, ↵android-build-team Robot2019-01-161-0/+27
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6072887, 6072580, 6072581, 6072582, 6072583, 6072584, 6072132, 6072195, 6072133, 6072077, 6072134, 6072078, 6072211, 6072762, 6072763, 6072908, 6072909, 6072910, 6072911, 6072912, 6072913, 6072914, 6072930, 6072212, 6072743] into pi-qpr2-release Change-Id: I84387b1e56f01c89624d23bfe525cb585f7444d7
| | * | | | | | | | Ask for PIN when granting permissions in front of lock screenPhilip P. Moltmann2019-01-161-0/+27
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: - Revoked all permissions from camera - Set lock screen PIN - Opened camera app -> Camera app asks for permissions - Locked screen - Granted permission from in front of lock screen Bug: 68777217, 65337954 Merged-In: I8358f1eba436786b25b2c2b0c12ac7dcfd334fec Change-Id: I3f252e2c325bd638ea29d1ce63b12e391e13c8f0 (cherry picked from commit b5302e6789b7a0b8f5625e054fbb21d5916652be)
* | | | | | | | | PackageInstaller: Fix generating id in android namespaceMichael Bestas2019-03-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: res/layout-watch/wear_review_permission_title_pref.xml:23: warn: generated id 'android:id/icon' for external package 'android'. res/layout-watch/wear_review_permission_action_pref.xml:17: warn: generated id 'android:id/title' for external package 'android'. Change-Id: I6a909f73fb9273026e4013e8099ff346e58a81f3
* | | | | | | | | Automatic translation importMichael Bestas2019-02-264-275/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8494348323ab97f428c9c0bc75d3e4c10db0d653
* | | | | | | | | Merge tag 'android-9.0.0_r31' into lineage-16.0-android-9.0.0_r31Luca Stefani2019-02-069-29/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 31 (PQ2A.190205.001) * tag 'android-9.0.0_r31': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE RESTRICT AUTOMERGE: Trust session id only if started with ACTION_CONFIRM_INSTALL RESTRICT AUTOMERGE: Trust session id only if started with ACTION_CONFIRM_INSTALL Import translations. DO NOT MERGE Change-Id: Id8263e550c6b55e05f5d1df9147a15084e380460
| * | | | | | | | Snap for 5130385 from e566e865ac1f787c4913523eb0ce39f356574aed to ↵android-build-team Robot2018-11-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: Id37253bfa85e28065b4bd612dc7693f2883bd953
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGE skipped: 61bcac9559 ↵Bill Yi2018-11-130-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skipped: bf22c513f0 am: 92920bc001 -s ours am: 729d52e384 -s ours am: 660ea57ee2 -s ours Change-Id: I60c6ad82b3996cf7d508fc720b1d2ffdb93b9be3
| | | * | | | | | [automerger skipped] Import translations. DO NOT MERGE skipped: 61bcac9559 ↵Bill Yi2018-11-130-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skipped: bf22c513f0 am: 92920bc001 -s ours am: 729d52e384 -s ours Change-Id: Ie4bab5448b70fee0dae80db971f409c1dd4fba00
| | | | * | | | | [automerger skipped] Import translations. DO NOT MERGE skipped: 61bcac9559 ↵Bill Yi2018-11-130-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skipped: bf22c513f0 am: 92920bc001 -s ours Change-Id: Id1cd5728799afd40a4651fe7114aeb0d520cd178