summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-9.0.0_r61' into staging/lineage-16.0_merge-android-9.0.0_r61lineage-16.0Kevin F. Haggerty2020-10-112-33/+15
|\ | | | | | | | | | | | | | | Android 9.0.0 Release 61 (6780336) * tag 'android-9.0.0_r61': Correct vulnerability when setting pending intents on import/export notifications by setting FLAG_IMMUTABLE Patch URI vulnerability in contact photo editing
| * Correct vulnerability when setting pending intents on import/export ↵John Shao2020-08-062-33/+15
| | | | | | | | | | | | | | | | | | | | | | notifications by setting FLAG_IMMUTABLE For cases where we were setting an empty content intent, setContentIntent has not been required since Gingerbread Bug: 161718556 Test: build Change-Id: I1f62fdc077401fea2c48a31527464464f08a6b64 (cherry picked from commit 1d595f80e9c5157f8ca0285b572c9f1463e05c58)
| * Patch URI vulnerability in contact photo editingGary Mai2018-11-052-3/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow reading of "file://" URIs that don't point to "/storage" during the photo saving flow. This is to prevent malicious apps from asking us to read our own private files which we copy into a temporary "content://" URI that we give to a cropping app (with permission to read). Fixing here patches both PhotoSelectionHandler.java and AttachPhotoActivity.java. Tested: Manual with the fake gallery app. Confirmed that selecting an "image" with a URI of our own shared_pref file fails without reading it. ContactPhotoUtilsTest Bug: 113597344 Change-Id: Iabb4f8139cedb7d7b865d69a4b95a4997f64c71d (cherry picked from commit ccfd94b965c1e9c2e0b239c12137c239c602070d)
* | Automatic translation importLineageOS Builder2020-09-1232-32/+1
| | | | | | | | Change-Id: I9cc01fcd7c232d62fc1c6020f731b1864f62fa12
* | Automatic translation importMichael W2020-03-2821-21/+86
| | | | | | | | Change-Id: Ic77d71b0c7004efd1030f1704b565a1eafdc58ce
* | Automatic translation importMichael W2020-01-141-0/+21
| | | | | | | | Change-Id: I710c2057db6773fc3a236e57b4d00a9df69a583a
* | Automatic translation importMichael Bestas2019-08-041-0/+20
| | | | | | | | Change-Id: I5d61b9583b252d12e74df7d30bce5e0064ff7038
* | Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsiLuca Stefani2019-07-133-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | * aosp/pie-gsi: Import translations. DO NOT MERGE Import translations. DO NOT MERGE Change-Id: I8cedbaec6d519db23f22aa905f10d61cc00bd2ed
| * \ Merge "Snap for 5622519 from 4f49c1c228daab1861c2e0d13dda03b2df2a9582 to ↵Android Merger2019-07-093-5/+5
| |\ \ | | | | | | | | | | | | pi-platform-release am: 5889de7669" into pie-gsi
| | * | Snap for 5622519 from 4f49c1c228daab1861c2e0d13dda03b2df2a9582 to ↵android-build-team Robot2019-07-093-5/+5
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 5889de7669 Change-Id: I0d19126bccc5898ddd0e04faf8e62b234e22890b
| | * | Snap for 5622519 from 4f49c1c228daab1861c2e0d13dda03b2df2a9582 to ↵android-build-team Robot2019-07-083-5/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I27215b3763b65680807b57688d4b6a56defa3960
| | | * \ Snap for 5443865 from cf1f1d5dc1d5123f979eaa2dff7c7b7f03e9e346 to ↵android-build-team Robot2019-04-071-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I8b2ec6eab8cbca172500edcc4731c9367ba9b38c
| | | | * | Import translations. DO NOT MERGEBill Yi2019-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: If034f18d96af3a2b15d5b5b349ab6bdcf78c2c1d
| | | * | | Snap for 5422807 from 9ac964f68f7bf681dfc0073fafffa60bb8fd6e35 to ↵android-build-team Robot2019-03-312-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I97ea390cd7933fc773927c444fab754de0f4a26e
| | | | * | Import translations. DO NOT MERGEBill Yi2019-03-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1df558d5510e57de8104fce46e29344477c6811e
| | | * | | Snap for 5335558 from 32d567d53fc4beeaf62a89992aa883137bf192f8 to ↵android-build-team Robot2019-02-267-511/+511
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I67ea99852dad99a69570985ed73ed8c34f242aa0
| * | | | | Merge "Snap for 5450365 from ed1ec620984c2334c3ff84264ca80a1d5bf48c7f to ↵Android Merger2019-05-1310-648/+648
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 75f9693ae8" into pie-gsi
| | * | | | | Snap for 5450365 from ed1ec620984c2334c3ff84264ca80a1d5bf48c7f to ↵android-build-team Robot2019-05-1310-648/+648
| |/| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 75f9693ae8 Change-Id: I9ccf26253feada2a1884bd036acb3363b4ea6320
| | * | | | Snap for 5450365 from ed1ec620984c2334c3ff84264ca80a1d5bf48c7f to ↵android-build-team Robot2019-05-0710-648/+648
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I5b3add29eac837184e358a2d0f0e956e25bf01dc
| * | \ \ \ \ Merge "Snap for 5180536 from 166e3c8d175852bb21cf1b36cca361ff20c5ce35 to ↵Android Merger2019-02-1122-74/+74
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 57240e7dfa" into pie-gsi
| | * | | | | | Snap for 5180536 from 166e3c8d175852bb21cf1b36cca361ff20c5ce35 to ↵android-build-team Robot2019-02-1122-74/+74
| |/| | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 57240e7dfa Change-Id: Ia7db93c33fa1c838974be8f6dc96605a8b989393
| | * | | | | Snap for 5180536 from 166e3c8d175852bb21cf1b36cca361ff20c5ce35 to ↵android-build-team Robot2019-02-0922-74/+74
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I40ba49e343aa432e5d495e57087e68443ece5493
| * | \ \ \ \ \ Merge "Snap for 5230900 from 4be56a13f5ab9c9ac064f940a2e6f105e552c1a3 to ↵Android Merger2019-01-152-3/+67
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 6be4a615d8" into pie-gsi
| | * | | | | | | Snap for 5230900 from 4be56a13f5ab9c9ac064f940a2e6f105e552c1a3 to ↵android-build-team Robot2019-01-142-3/+67
| |/| | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release am: 6be4a615d8 Change-Id: I374ecbcfca09d1227087d0d35cc0148e9e67c803
| | * | | | | | Snap for 5230900 from 4be56a13f5ab9c9ac064f940a2e6f105e552c1a3 to ↵android-build-team Robot2019-01-142-3/+67
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I374f02f76c30354525fc12ca832508f4f2a5d9d7
| | | * | | | | | January Pi-platform-release mergesAdam Seaton2019-01-112-3/+67
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21c97ff55557636349839e3cddb59f8afaca8107
| * | | | | | | | Merge "Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release am: ↵Android Merger2018-11-307-59/+59
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | 451ba76aa2" into pie-gsi
| | * | | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-307-59/+59
| |/| | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 451ba76aa2 Change-Id: Ia5d508ca6c7fbc50d804383aa2e85fb9fbb75603
| | * | | | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-287-59/+59
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc27ada729da1c1f79d6f08f7371b77d805b17c5
* | | | | | | | Automatic translation importMichael Bestas2019-06-191-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcde8891a3bbb9cd96b413dfbf93c94f3a8081ca
* | | | | | | | Automatic translation importMichael Bestas2019-06-087-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad88c7bbe2cd42a27a81d7066f7f8036cb6aef72
* | | | | | | | Merge tag 'android-9.0.0_r37' into staging/lineage-16.0_merge-android-9.0.0_r37Kevin F. Haggerty2019-05-0610-648/+648
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 9.0.0 Release 37 (PQ3A.190505.002) * tag 'android-9.0.0_r37': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Change-Id: Iaa45428234eda2991354e573b69c647e47f105d4
| * | | | | | | Snap for 5339334 from 32d567d53fc4beeaf62a89992aa883137bf192f8 to ↵android-build-team Robot2019-02-277-511/+511
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-release Change-Id: I0abc1f23a86558a110396865350be480f9f5fdec
| | * | | | | | Import translations. DO NOT MERGEBill Yi2019-02-217-511/+511
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ibc23f4edd6edfaf40a20ba8537039ee06a181b34
| * | | | | | Snap for 5249487 from cf0abd74545327f412d2b42c7b6d7e4a5af6741d to ↵android-build-team Robot2019-01-221-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-release Change-Id: I6ac198b2072faa190bbace03c691af05e763aff5
| | * | | | | Import translations. DO NOT MERGEBill Yi2019-01-191-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I2562deca7eaf37161f2c6c67955bf228ecafb363
| * | | | | Import translations. DO NOT MERGEBill Yi2019-01-132-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie935ee8b2ed56f912c10e28eb8e82d5d973bb438
| * | | | | Import translations. DO NOT MERGEBill Yi2018-12-234-83/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9ec712a3673344805a93073fd0edec9b65baf36b
* | | | | | Automatic translation importMichael Bestas2019-04-0713-0/+548
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If236079f12f5d754524703a399e8ed6af498e695
* | | | | | Automatic translation importMichael W2019-03-11125-15172/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94ace530bde42343f95f0dfe191ec77093c9739a
* | | | | | Contacts: Remove unused boolean resourceMichael Bestas2019-03-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: warn: removing resource com.android.contacts:bool/config_editor_include_phonetic_name without required default value. Change-Id: I924a4815d07854ad5ae04ca7ddf87f738a4bd277
* | | | | | Automatic translation importMichael Bestas2019-02-2615-1306/+267
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ca5a62e79c16c7ffd53ae31dc40d2d3b8b6c843
* | | | | | Fix casting warnings in ContactSaveServiceAurimas Liutikas2019-02-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | packages/apps/Contacts/src/com/android/contacts/ContactSaveService.java:1227: warning: non-varargs call of varargs method with inexact argument type for last parameter; R.string.contacts_deleted_many_named_toast, names); ^ cast to Object for a varargs call cast to Object[] for a non-varargs call and to suppress this warning 1 warning Test: make -j Contacts (no more warnings) Change-Id: I244f376b2a8728598e66757742234fbf1a3557df
* | | | | | Merge tag 'android-9.0.0_r31' into lineage-16.0-android-9.0.0_r31Luca Stefani2019-02-0622-74/+74
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Patch URI vulnerability in contact photo editing Import translations. DO NOT MERGE Import translations. DO NOT MERGE Change-Id: Ie93d14482459c024014a92d96b57e0aa71acb1bc
| * | | | | Snap for 5130385 from 01a0bdc06af8833bd0fdd40e04fb81f0d92c4beb to ↵android-build-team Robot2018-11-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I99505fa98c9bc69e0985cb18ff59e418bd9bdaf5
| | * | | | Import translations. DO NOT MERGEBill Yi2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id52697e2ce9ecee3370d8df2048b2d08e97a1f0c
| * | | | | Snap for 5115288 from 8853bf6ef9136e13015e439f93cf93ced7da6a8e to ↵android-build-team Robot2018-11-076-23/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I095843e09ff3358ec0cfa7e48c9319427a1a42c3
| | * | | | Import translations. DO NOT MERGEBill Yi2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Iaeb00315ebe5092b95240e19ca3eb6a143bce0b2
| | * | | | Import translations. DO NOT MERGEBill Yi2018-11-025-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ibb20e1820ba31a1d1bdd98c459e692d78f0e742a
| * | | | | Snap for 5101444 from acdfb82c89a58e0493f786e074862dbfda93399a to ↵android-build-team Robot2018-10-312-3/+67
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I5764e014e7cff18bf4eb8cf367593abf9b578c5b
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 08:27:37 +0000