summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-31Snap for 7246408 from 5380476154508c431df334143d0da62e356d2cf8 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-releaseandroid-build-team Robot
Change-Id: Ib2b32933adf10e57422c655007f5983ce688e630
2021-03-30[automerger skipped] [LSC] Add LOCAL_LICENSE_KINDS to ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devBob Badour
hardware/qcom/sm7150/gps am: f79f0a1d98 am: 1f335c32a0 am: 09333902e2 -s ours am skip reason: skip tag Change-Id I07267e93ebfc743a0d1e99a8a7853058b0de4c9c with SHA-1 a6d81cf4db is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: Ic16933528208098e47018a4d024509a528bf91e9
2021-03-30[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps am: f79f0a1d98 am: ↵Bob Badour
1f335c32a0 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: I6353c63909acf43f120f393c755d3be4bac8ea04
2021-03-30[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps am: f79f0a1d98android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1655055 Change-Id: I6b707177fdb8f5cf8a9e1f2278ff2645e373e667
2021-03-29[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gpsandroid-s-beta-2android-s-beta-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: etc/Android.mk utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: android/1.0/Android.mk android/1.1/Android.mk android/2.0/Android.mk Added SPDX-license-identifier-BSD to: android/utils/Android.mk batching/Android.mk core/Android.mk geofence/Android.mk gnss/Android.mk location/Android.mk pla/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1f3eb010350adafd89a97bf00cbf1439d46bafdf Merged-in: I1f3eb010350adafd89a97bf00cbf1439d46bafdf Merged-in: I07267e93ebfc743a0d1e99a8a7853058b0de4c9c
2021-03-03Snap for 7180829 from a6d81cf4db60566cc835a7b1e6e0080c7c47a0e4 to sc-releaseandroid-build-team Robot
Change-Id: I02eef817157c2ef238f45efae5bbe422de390764
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gpsBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: android/1.0/Android.mk android/1.1/Android.mk android/2.0/Android.mk Added SPDX-license-identifier-BSD to: android/utils/Android.mk batching/Android.mk core/Android.mk geofence/Android.mk gnss/Android.mk location/Android.mk pla/Android.mk Added legacy_notice to: etc/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I07267e93ebfc743a0d1e99a8a7853058b0de4c9c
2021-02-21Snap for 7160059 from 9f7e4db4fd6eb603d8214aa0bb84d4258de0ef76 to sc-releaseandroid-build-team Robot
Change-Id: I98e2e2770acac8842b76a796c784e65710ad56c2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2ac4d79108 -s ↵Xin Li
ours am: 036ea671c4 -s ours am skip reason: Change-Id I786ff01373458fb825ffef4f28c7f2df58ab742a with SHA-1 443c8faa40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29cbd371d185b5a116da491d549b9c1060547a1f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2ac4d79108 -s oursXin Li
am skip reason: Change-Id I786ff01373458fb825ffef4f28c7f2df58ab742a with SHA-1 443c8faa40 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d0a0ed2657f322014d460ececd7790d2aef152a
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I786ff01373458fb825ffef4f28c7f2df58ab742a Change-Id: I37e12f4e6ec1109f3bfb3c974617ac1716d74cc7
2020-11-26Snap for 6995927 from e3d0dd3e255710beec4e867f84f1e4b417e007b6 to sc-releaseandroid-build-team Robot
Change-Id: I429b6fcd6ce290b2d1f576a77a8a2672bf31168b
2020-11-25Mark ab/6881855 as merged am: 43fe26abf2 am: 443c8faa40Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/13112972 Change-Id: Ibcab157a14a410f6d5631e93352d783a22340acf
2020-11-25Mark ab/6881855 as merged am: 43fe26abf2Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/13112972 Change-Id: I786ff01373458fb825ffef4f28c7f2df58ab742a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I5f15f8c5ba01584b98b3cd629a876f0668fd61b3
2020-10-10Snap for 6896080 from 85b751d56f99fb820bebe430a42e5309289674ba to sc-releaseandroid-build-team Robot
Change-Id: Ief4497d56182c799b255b36c4ca81152bf16ccf5
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 400bf7b388 -s ours am: ↵Xin Li
8ffe2c942b -s ours am: ca38d7ea14 -s ours am skip reason: Change-Id Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 with SHA-1 d22b549537 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12796898 Change-Id: Ib1546f622df47dececd3557130385952f83ed287
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 400bf7b388 -s ours am: ↵Xin Li
8ffe2c942b -s ours am skip reason: Change-Id Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 with SHA-1 d22b549537 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12796898 Change-Id: Ic25b83e3e2d877b8da1898ea40f9bdb780e31dca
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 400bf7b388 -s oursXin Li
am skip reason: Change-Id Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 with SHA-1 d22b549537 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12796898 Change-Id: Ib8328b1d8ecfd1c8dc1f89c8ef7fa6e75f3c90dd
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5 Change-Id: I418b560293463f681f5618fa2d4961cade6e621a
2020-09-13Snap for 6832148 from 63ff62a36b306c38db92ed5bd2f1f03573e20a81 to sc-releaseandroid-build-team Robot
Change-Id: I88452dd18e1838cd8db85bf122ebddfb01e885ca
2020-09-13Merge CR2660953 am: 8d1057762d am: 4aeb4f4b24Shinru Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/11685287 Change-Id: I14f24ff26f179e91bda7a1522d936c93f59e769b
2020-09-12Snap for 6829063 from ae03e9ec99fa8f6e9f7d8103673c0d1eae4d3133 to sc-releaseandroid-build-team Robot
Change-Id: I4786b6258e68b9d2a29c4d8299d138e1f7a3c441
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am: 66020661ae -s ours am: 50cff07bd4 -s ours am: 8fdcc65334 -s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: I3d37352ddde07bcbde362c43e33c03b59a39eff5
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am: 66020661ae -s ours am: 50cff07bd4 -s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: Id38ca99d3f12bb745c2dab1fdd7407e3039a0b6b
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am: 66020661ae -s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: I001c9d0bc01c536d2e84c1f576b1e2646e385639
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s ours am: 9645db85cc ↵Xin Li
-s ours am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: Ifb2353ea2966a4a0a8ee586b30a803dbf2e4dd07
2020-09-11[automerger skipped] Merge Android R am: 4328ffdd31 -s oursXin Li
am skip reason: Change-Id Ibacc42681d1dbef7900940791b8620b7e4a5357a with SHA-1 3d466744f3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/1422440 Change-Id: Icb9fc6ece81fabd574deb9da16fbea0490fe37fe
2020-09-08Merge Android Rplatform-tools-30.0.5Xin Li
Bug: 168057903 Merged-In: Ibacc42681d1dbef7900940791b8620b7e4a5357a Change-Id: Ibe659537a3b5c270a69c5d7fce9bf28fd82798b8
2020-09-03Snap for 6809790 from 5843ce93b794a13d615f47e168430fa3e6973746 to sc-releaseandroid-build-team Robot
Change-Id: I0466f4e9de05db7459e55c6baec2189c6c6e0500
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am: 29144c235c -s ours am: fa281650cf -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I0148c76ca448a20d33c50efbddb63738834300ee
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am: 29144c235c -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I60e28a4627f6702303cd5cf3a96c300831297c7e
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am: bcd128d500 -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I213dfa702767d7908ec40ae8215d15c2e436d981
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d466744f3 -s ours am skip reason: Change-Id If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 with SHA-1 aa27bb0d7c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12470175 Change-Id: I47533421c2cb7ed2c6160a5e6f271d578c071898
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65 Change-Id: Ibacc42681d1dbef7900940791b8620b7e4a5357a
2020-08-26Snap for 6790374 from dc0e4069f4ad488de122b96285ea1e3258521fce to sc-releaseandroid-build-team Robot
Change-Id: I74667a81c868a341842fc51532de2560700bd833
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: ↵Xin Li
481877323d -s ours am: b944ee3a9a -s ours am: e926696ab4 -s ours am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I6853d006b3e606871285b5d362768d80956b2a7a
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: ↵Xin Li
481877323d -s ours am: b944ee3a9a -s ours am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I00849b442181148dddbb9c6dbe9c43f33f334e8e
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: ↵Xin Li
481877323d -s ours am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I9dfb916e1ccac1ab72b286fb05a8ac67d7a1a8e6
2020-08-25[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s oursXin Li
am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964 Change-Id: I61022f7038edc67970f6194051a9243c00e53352
2020-08-24Merge QD4A.200805.003.Xin Li
Bug: 160260413 Change-Id: I5342fa1d6072fba9d3d57d09f9e03ed62f60e50c Merged-In: I60adea4d9a0d174244b2441ce14093daf5c20efb
2020-06-30Snap for 6639731 from d88785a8a3ac91f573a1c09c5c6cdbee3b23b9c1 to sc-releaseandroid-build-team Robot
Change-Id: I2f41c1699d3d2516caff1bf95fe8d41a3aa64e83
2020-06-28Add METADATA to gps: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: Ied87481ae38c80683f9c814232e64f9032139bed
2020-06-19Snap for 6606303 from 04a4e16c8e8fa3f4d80cd41e15bddefcb16b2dc3 to sc-releaseandroid-build-team Robot
Change-Id: I7f08a7e07c59a29f144844dca4671f4b730cd1ff
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 am: aa27bb0d7c am: d22b549537 am: fe951453a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: Ie4f2f88fcf025dbe27886fe0c46e19be4108bab3
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 am: aa27bb0d7c am: d22b549537 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: I7d15cea957a6c11937ff269f8fd8742f3b047fa1
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 am: aa27bb0d7c Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: Ic26ba94c5a86f1998f5cb5f5e22cad6717b504d5
2020-06-17Only allow one extension obj of each type to be created am: cd5ef1dfc2 am: ↵Automerger Merge Worker
927ce890b3 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/10368414 Change-Id: If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65
2020-06-05Snap for 6560544 from 9346d856156ce4f0a43d956dd19f43e65c736806 to sc-releaseandroid-build-team Robot
Change-Id: I0829382f9ca9beeb7640e9b1a7d42f43c8c33b3b
2020-06-04Merge CR2660953 am: 8d1057762d am: 457ec7749e am: 5b483a0c54 am: 8c458daf2dShinru Han
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/11685287 Change-Id: I3ba5662407686e83d709724da91f5c659188a103