summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: c44dfdf5b2 -s ours am: c01a882b1f -s ours am: 7b8fb0615e -s ours Change-Id: I494203f629a6eb507a7b45c28166381765aa74d9
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: c44dfdf5b2 -s ours am: c01a882b1f -s ours Change-Id: Ic75f5388f3bd8b0ed93a9eb9923c2772910f87ab
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: c44dfdf5b2 -s ours Change-Id: Ide75143fb1cb611a5e61b98cb023b7faac425ced
2018-12-11[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into stage-aosp-master am: 74a971a76f -s ours am: 671bf751dd -s ours Change-Id: I9c574c7247a58be34d3ae640fab1ebcb95e388ad
2018-12-11[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into stage-aosp-master am: 74a971a76f -s ours Change-Id: Ic3caec52f7c24a21dbf7a8b2180217036234bae1
2018-12-11DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li
Bug: 120502534 Change-Id: I99d604b7725c681a658637784cca7973c059338d
2018-12-11DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into ↵Xin Li
stage-aosp-master Bug: 120502534 Change-Id: Ibf2f1888921355552c5bb0eff8a5a89e5c835658
2018-11-30ipacm: Fix compilation error for switch casemjavid
Insert fallthrough statement to fix compilation error for unannotated fall-through between switch labels. Change-Id: Ibc5f3f0cdc29e8144a47059c31ce15441a90ddac
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-platform-releaseBill Yi
Change-Id: I6bb0fb88cf4e244b6fb43bb18fe659e2edb44640
2018-11-09ipacm: fix tcp fragment rule for IPv6 on LTESkylar Chang
Fix the ipv6 frag pkts going to sw-exception issue. Update the TCP ipv6 fragment rule attribute on LTE use-case. Change-Id: I53dcdf624cbc29146a7e095e7cc043584e919795
2018-11-06ipacm: get usb_link_up from usb-driverSkylar Chang
Made the change to get usb_link_up from usb-driver instead of using netlink event to resolve the timing issue between usb-driver and android framework. Also not self-posting the usb-up from downstream event which was used to support ipcam restart phase 3. Change-Id: I3549cfbfbb5f41fa5ed99a43f00c6d8b4333b8e5
2018-10-29Allow implicit-fallthrough warnings in IPACM_Main.cpp. am: 10e9835d0c am: ↵Chih-Hung Hsieh
d8e80683be am: 6a4ba47bb6 Change-Id: I562563baed42f42fa4b1b8eab7fe052158e8d504
2018-10-29Allow implicit-fallthrough warnings in IPACM_Main.cpp. am: 10e9835d0cChih-Hung Hsieh
am: d8e80683be Change-Id: Iebcf55fc9ce28cadba69059fc27a261c098cc6b5
2018-10-29Allow implicit-fallthrough warnings in IPACM_Main.cpp.Chih-Hung Hsieh
am: 10e9835d0c Change-Id: Iafa19075364cd147c88f7c4d754f76a05ad326ae
2018-10-29Allow implicit-fallthrough warnings in IPACM_Main.cpp.android-wear-8.0.0_r2Chih-Hung Hsieh
It will be a global error by default. Test: make checkbuild Bug: 112564944 Change-Id: I1a238297f83ebbab6b9dcae0130a009ca42c756e Exempt-From-Owner-Approval: do not block on new warnings
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 89c726ecaf -s ours am: 6c3324a3b4 -s ours Change-Id: I64d3307c76273b6117141196c24fff8310825056
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 89c726ecaf -s ours Change-Id: Iab421e2dc7ebd4508f471f1bbd5567c25a660c9b
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I5e774ae614188054a26b292bfea6c35c9efc316e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 14:28:43 +0000