summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-18Snap for 7216111 from d993e3db70bd450045b4936ff701aa97657a2952 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_r61android-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_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r33android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-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: I6507fac93feddb2e1fc11603e0b22fedbe06bafb
2021-03-17Merge "Fix the HAL uninitialized error message for setLocalPrefixes" am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Nucca Chen
805caa7e07 am: 99f4195834 am: 78e3dd0f16 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/data/ipacfg-mgr/+/1505172 Change-Id: Ia306c089887cba06da25d3cdf6609dec545e0e06
2021-03-17Merge "Fix the HAL uninitialized error message for setLocalPrefixes" am: ↵Nucca Chen
805caa7e07 am: 99f4195834 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/data/ipacfg-mgr/+/1505172 Change-Id: I78c64c43624fcd15a8d796531e345cf81fd3f056
2021-03-17Merge "Fix the HAL uninitialized error message for setLocalPrefixes" am: ↵android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Nucca Chen
805caa7e07 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/data/ipacfg-mgr/+/1505172 Change-Id: I95245fd05d6711b6b1f87931263ce3654c17a015
2021-03-17Merge "Fix the HAL uninitialized error message for setLocalPrefixes"android-s-beta-2android-s-beta-1Nucca Chen
2021-02-06Snap for 7128142 from 49717987a5e5d59f586cb53cc5b618d46722d247 to sc-releaseandroid-build-team Robot
Change-Id: I621a7501c9e1d42f150565a5b5e8c1a6136616c7
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/data/ipacfg-mgr am: ↵Bob Badour
3ec0472e08 am: 921d7bd102 am: 9651880e87 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/data/ipacfg-mgr/+/1576128 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1df062cf4baf4f137076ec6d89cfbef2a66027f9
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/data/ipacfg-mgr am: ↵Bob Badour
3ec0472e08 am: 921d7bd102 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/data/ipacfg-mgr/+/1576128 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I51b244287a877ff276b94b4ad6b574f2305f3f97
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/data/ipacfg-mgr am: ↵Bob Badour
3ec0472e08 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/data/ipacfg-mgr/+/1576128 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib442c4811a2e7838100a7187775c542ba0c1c99a
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/data/ipacfg-mgrandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD to: hal/Android.mk ipacm/src/Android.mk ipanat/src/Android.mk ipanat/test/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I148590229c381b1fcfe4b73938bcb31f055f9599
2020-11-19Fix the HAL uninitialized error message for setLocalPrefixesHungming Chen
Test: build only Change-Id: Ieb583b224faf4dc6b91454b85ffc1c9415fbbe31
2020-05-06Snap for 6465700 from 624b068bc3207c64d11f6b497625d28fab9f2ace to sc-releaseandroid-build-team Robot
Change-Id: Ib466e2e5da0f3e790a1c941bf21099237f247d86
2020-05-05Add METADATA to ipacfg-mgr: BSD=NOTICE am: 76db8def5c am: 071154a693 am: ↵Bob Badour
ad3de6e715 am: 456ad87cd8 am: d63b4b8932 Change-Id: I3fce1fe0761450fec9cd1c655a61f7096a93975d
2020-05-05Add METADATA to ipacfg-mgr: BSD=NOTICE am: 76db8def5c am: 071154a693 am: ↵Bob Badour
ad3de6e715 am: 456ad87cd8 Change-Id: Ie1ec0b1cf98e036877736076690aaf52b2e4d9f4
2020-05-05Add METADATA to ipacfg-mgr: BSD=NOTICE am: 76db8def5c am: 071154a693 am: ↵Bob Badour
ad3de6e715 Change-Id: I0d4fad962ee009b9197d2bc42cc29fb260754b81
2020-05-05Add METADATA to ipacfg-mgr: BSD=NOTICE am: 76db8def5c am: 071154a693Bob Badour
Change-Id: I9d62257cc66fb20aa2bd2e590c325f3a519cc89d
2020-05-05Add METADATA to ipacfg-mgr: BSD=NOTICE am: 76db8def5candroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ie0648101f58a1d99f4756d0391c258d5a2b8c918
2020-05-01Add METADATA to ipacfg-mgr: BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I8f67a06f107e176a007a3431b818f0f946320c69
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: ea3b50b135 am: a82a6f86c4 -s ours am skip reason: subject contains skip directive Change-Id: I149fa7e974db37b641ef616a115de55dd7edace7
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: ea3b50b135 Change-Id: I1b415a2f8d5a9371a20e8205f292b221b2c51990
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I55b5cc1612f4321c444669e52c3d6c78ec446bbb
2019-10-02Remove libhwbinder/libhidltransport deps am: fa104a891b am: b0189f2548 am: ↵Steven Moreland
9ffcc21ac3 am: 140b6ba4b4 Change-Id: I990ae6cb07fb715faca4878ae4c53da165d53298
2019-10-02Remove libhwbinder/libhidltransport deps am: fa104a891b am: b0189f2548Steven Moreland
am: 9ffcc21ac3 Change-Id: Ia5c5c99b0e22637010aee49e770888b963be3ee8
2019-10-02Remove libhwbinder/libhidltransport deps am: fa104a891bSteven Moreland
am: b0189f2548 Change-Id: I2daf564d7d20c728ae2c8ab52ba33549541c03d9
2019-10-02Remove libhwbinder/libhidltransport depsSteven Moreland
am: fa104a891b Change-Id: Ie0e153222baa4ae04e0a581145455c6a32d2f192
2019-10-01Remove libhwbinder/libhidltransport depsndk-sysroot-r21Steven Moreland
Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: Iebe2c7695cd2bde3367684af8c1319c1f7a47ce6
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4e6417a203 -s ours am: 7283d03472 -s ours am: a08509ac06 -s ours am skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history Change-Id: Ic963cef390644d88613a27386267526d47653bb2
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4e6417a203 -s ours am: 7283d03472 -s ours am skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history Change-Id: I1cd0f5ec109f6863e435ff2bddf6489cdecedf57
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 4e6417a203 -s ours am skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history Change-Id: I6180a566c9a34ee6dc68bfc299ea036e75165867
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Iaee2d60e464f1dd18be32db7e09b370bf4a7320f Merged-In: I17ba1e731bd403ec39551ccbae7b7a614415844e
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
e0f4c66701 -s ours am: 325d68e8cc am: ef8f99fbad am: 1ca1fc0193 -s ours am skip reason: subject contains skip directive Change-Id: Icdd6db864459e2f96d183460f88abf1c77af0f9f
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
e0f4c66701 -s ours am: 325d68e8cc am: ef8f99fbad Change-Id: I3dc774461b372d426acff48b1cbf573cc9941454
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
e0f4c66701 -s ours am: 325d68e8cc Change-Id: I3c2573203d38698301aec25e6a72f4b8f3d3541a
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: e0f4c66701 -s ours am skip reason: subject contains skip directive Change-Id: I58d28fe530a5dee9a3be3757b7b243959ebdf83b
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I17ba1e731bd403ec39551ccbae7b7a614415844e
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: caecaafc59 am: ce7ac24a6a -s ours am skip reason: subject contains skip directive Change-Id: Iea5059ec534c1c00e8beb2667316e5b438a959b7
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: caecaafc59 Change-Id: I1a9106d1de7582f46cc788d8f66c5d6493ec2bd1
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I188685a01067fab669141b87295b30be0415116a
2019-02-26Include Android.mk when building B4S4android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseRoger Liao
[b1c1/b4s4 share codebase] Include all Android.mk under hardware/qcom/sdm845 when building B4S4 Bug: 123477980 Change-Id: Id78ba3fee5e7a51036fac197401b7c51c9762d65
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 1522ec5c3b Change-Id: I4b70b4db9dabdeac09cd58befa856f8d9a9f0d3e
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ia35cd146203060870fd75c484eda33b5f214f548
2019-02-21Merge "Merge remote-tracking branch ↵Robin Peng
'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.083'"
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Id644e7981ee187c426c4ff3b2788a5ad8514db0c
2019-02-14Do not add '-v' to CFLAGS am: ac9c2678b6 am: 2f155b3f15Pirama Arumuga Nainar
am: f1f858409c Change-Id: I70656f95cdc04f379d4c1439f73f10cff4e29a96
2019-02-14Do not add '-v' to CFLAGS am: ac9c2678b6Pirama Arumuga Nainar
am: 2f155b3f15 Change-Id: I1ea8248b2a1f04cc2f9ebd9864306048276c5f53
2019-02-14Do not add '-v' to CFLAGSPirama Arumuga Nainar
am: ac9c2678b6 Change-Id: I9b3cdbb19b0ab17e2898de3089eb51409267920a
2019-02-14Do not add '-v' to CFLAGSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Pirama Arumuga Nainar
This just makes the build noisy. Test: build Change-Id: I250387ed501d247ecd7f794d8791e51d4dfc30a2
2019-02-14Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.083'Robin Peng
Bug: 124397977 Change-Id: Ib9e35c848a06699cde4d6c704cb7cb284c8dc838
2018-12-24Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.007'Robin Peng
Conflicts: ipacm/src/IPACM_Iface.cpp ipacm/src/IPACM_OffloadManager.cpp Bug: 121228685 Change-Id: I8c74e755102e2d238379e6d1bc490ea15870616d
2018-12-20ipacm: KW fixMohammed Javid
Initialize pointer before use to fix KW issue. Change-Id: I023d67c13528c33e625d60e030952b0377b5fd27