summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Snap for 6877830 from 850741d2cbbf8c2b921fd3d57079a145dd0607f1 to ↵platform-tools-30.0.5sdk-releaseandroid-build-prod (mdb)2020-10-013-7/+5
|\ | | | | | | sdk-release" into sdk-release
| * Snap for 6877830 from 850741d2cbbf8c2b921fd3d57079a145dd0607f1 to sdk-releaseandroid-build-prod (mdb)2020-10-013-7/+5
|/| | | | | | | Change-Id: I3da2a7bfa13e10dc7981d72fc4d2f78fb1767057
| * Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li2020-08-270-0/+0
| |\ | | | | | | | | | | | | | | | Bug: 166295507 Merged-In: I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 Change-Id: I079786b9cfd72218c0a394bf1bd68a07191b7a98
| | * Merge "change parameter type for 32bit platform" am: f1575d44a9 am: ca26310e0cTreehugger Robot2020-07-062-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1353378 Change-Id: I890e1b9395ebe8f17d5739fb3169f9a9b80282b0
| | * \ Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6 am: 662ce93413Treehugger Robot2020-05-011-0/+3
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I560e80cf4ac74bb7714d5a9da033249841dbd83d
| | * \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 569b5cec61 -s ours am skip reason: subject contains skip directive Change-Id: I105aee4861d3311dd02982d27808b0a379e0d527
| | * \ \ \ [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 4c514e82b1 -s ours am skip reason: subject contains skip directive Change-Id: I038f88a1b43dfd805198a5cefc1739558c483372
| | * \ \ \ \ [automerger skipped] Merge "Fix OOB vulnerability in ↵android-mainline-11.0.0_r4android-mainline-11.0.0_r3android-mainline-11.0.0_r2android-mainline-11.0.0_r1android-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_r16android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-devandroid11-d1-b-releaseAutomerger Merge Worker2020-02-210-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setGsm/CdmaSmsBroadcastConfigInfo" am: 8c238b7dca am: 1f9ebb1971 am: ea23bd89c9 -s ours am skip reason: Change-Id I18f9745174762a52fc20bfc7273c6b3fd2118da5 with SHA-1 77dc5c543f is in history Change-Id: I22c2aa2968f66664ed65e31506b55d238a39ea7b
| | * | | | | | Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfoSarah Chin2020-02-042-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error if length > 25 Test: lunch cf_x86_phone-userdebug && mm Bug: 144046782 Change-Id: I18f9745174762a52fc20bfc7273c6b3fd2118da5
| | * | | | | | [automerger skipped] Merge "Add dbright to OWNERS file" am: 02ed800d62 am: ↵Automerger Merge Worker2020-01-090-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e37523d84c am: a47ec3d419 -s ours am skip reason: Change-Id I81327b6b5e268942ebfbbe7b706acf188c8b5fea with SHA-1 7c67b2f97d is in history Change-Id: I5ab68889f3a1e8a2ab86fa544fe5a356c6c4ade6
| | * | | | | | | Add dbright to OWNERS fileDaniel Bright2020-01-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 147314799 Test: N/A Change-Id: I81327b6b5e268942ebfbbe7b706acf188c8b5fea
| | * | | | | | | Merge "Encode MCC with 3 digit in CellIdentity" am: 61d7c1ccd0 am: ↵Automerger Merge Worker2019-12-192-8/+81
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86d6ae7ca4 am: 28a40f3c50 Change-Id: I16c05087b5a369e41bd4af352cea1cf249bf4b1d
| | * \ \ \ \ \ \ \ Merge "Fix typo" am: 11b162a4cd am: f1aa3222d1Taesu Lee2019-12-021-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d376d26134 Change-Id: I207cb3ee2f58c9e2383069a1e7e7fdf99ed316bf
| | * \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - ↵Xin Li2019-10-300-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: d4b612036d am: c0a98c0c03 -s ours am skip reason: subject contains skip directive Change-Id: I3669543c2e5fb73b425076ed0b939cc9769d2bfe
| | * \ \ \ \ \ \ \ \ \ Merge "Add sarahchin to OWNERS" am: 2d39acdbe2 am: 273a822d97 am: 9b8fb3b36cSarah Chin2019-10-181-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 78a8e4ac32 Change-Id: Id484035b5fc70369248364e8960c17531164fdab
| | * \ \ \ \ \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: 7fff9c2f04 am: 8c97bd2121Xin Li2019-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4691416f16 Change-Id: I14221001a8030ce9c4a01db0ce1d29cae62622aa
| | * \ \ \ \ \ \ \ \ \ \ \ Merge "Remove libhwbinder/libhidltransport deps" am: bf7fd5c828 am: ↵Steven Moreland2019-10-021-3/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee61593d21 am: 313867d0b8 am: 537830ba50 Change-Id: Ic36b6e3a67e9e902c71df016dfc0530c8e704b61
| | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 58ee3e3057 -s ours am: 1cab689a21 -s ours am: c5161a10eb -s ours am skip reason: change_id Id4609cad94db5358ac03231a0537468b81f3dd33 with SHA1 ee4efc6bee is in history Change-Id: Ib1a1eeae394b0017fd26f30a9513c31569b02791
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7acf7a616 -s ours am: ddf3ea0473 am: 6e905bcdb5 am: d77523cf3c -s ours am skip reason: subject contains skip directive Change-Id: I4eaa4cccfeb903235933a0d89146d46d77107b4b
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove unused includes." am: a09c048365 am: 6b4a906988 am: 74152cc172 ↵Elliott Hughes2019-08-081-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5c02cdf68e am: 769f5d81c8 Change-Id: I674b96149d7079fe52fe24a550cc56c51fb690e4
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li2019-07-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5699924) into stage-aosp-master am: 76ab1202dd am: 9ab3d00117 -s ours am skip reason: subject contains skip directive Change-Id: I310b0b9edf3843cd66028ff6c2501195941a6f5d
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add RIL_UNSOL_KEEPALIVE_STATUS in ril_unsol_commands.h am: 2093efa562 am: ↵Gary Jian2019-06-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 375d13cfc1 am: e8361ba089 Change-Id: Ib3fdeee2ad4786da7f776c629fa23d56c163cad8
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add RIL_UNSOL_KEEPALIVE_STATUS in ril_unsol_commands.h am: 2093efa562 am: ↵Gary Jian2019-06-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cffbeaf2db am: 5f7f30bf37 Change-Id: I2423c1c1e68187fac436c265e6e33b2684516d15
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5406228 into qt-dev. am: 43a35059b9Bill Rassieur2019-04-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9f109b0a0b Change-Id: I500575a42163e75b6bf9d0a25691733443406f79
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5406228 into qt-dev.Bill Rassieur2019-04-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 43a35059b9 Change-Id: I0d0ad5dedde62cc8a9cc68e7ec1a208502294bfe
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5406228 into qt-dev.Bill Rassieur2019-03-281-2/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b7696d69917c0d5d1d20060b41785d0d6c2afc6 BUG: 129345239
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04Treehugger Robot2020-08-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1407077 Change-Id: I1c71a682b63a26ea20c4a4f5930933f99e4712cf
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix -Wformat error with explicit void* -> char* cast."Treehugger Robot2020-08-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Fix -Wformat error with explicit void* -> char* cast.Stephen Hines2020-08-211-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hardware/ril/reference-ril/reference-ril.c:1841:46: error: format specifies type 'char *' but the argument has type 'void *' [-Werror,-Wformat] snprintf(cmd, sizeof(cmd), "AT+CCHO=%s", data); ~~ ^~~~ Bug: http://b/155835175 Test: m Change-Id: I7fd819c6c452b56aae15429344320c4cdaed702c (cherry picked from commit 363b39bbc81a3269fe75bd5f505289f85d05792e)
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: ↵Amit Mahajan2020-07-301-4/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0412127b7 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1378659 Change-Id: I1ff9abbb2e670ecb8840f3565c36f71a462239e0
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Map the RAT included in ImsSmsMessage to RIL value correctly."Amit Mahajan2020-07-301-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Map the RAT included in ImsSmsMessage to RIL value correctly.Amit Mahajan2020-07-301-4/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: TH Bug: 160646256 Bug: 161405820 Bug: 161750669 Merged-in: I34f377b7d41365a327de220cd4bd0f456514495e Change-Id: I34f377b7d41365a327de220cd4bd0f456514495e (cherry picked from commit 03bccca2954b6d5130495f7331f2496f4f676ec0)
| * | | | | | | | | | | | | | | | | | | | | | | / Merge "Update language to comply with Android's inclusive language guidance" ↵Treehugger Robot2020-07-291-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a0d65e2267 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1375725 Change-Id: Ibfc149582f85734d02c739bd91a4cd90d20ba00d
| | * | | | | | | | | | | | | | | | | | | | | | Merge "Update language to comply with Android's inclusive language guidance"Treehugger Robot2020-07-291-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Update language to comply with Android's inclusive language guidanceSooraj Sasindran2020-07-291-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Change-Id: I42cdf3946bf19e72e65b209a6d1475f247271ed3
| * | | | | | | | | | | | | | | | | | | | | | / Merge "change parameter type for 32bit platform" am: f1575d44a9Treehugger Robot2020-07-062-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1353378 Change-Id: Ia5e9483220df1b61996961f79352f6f78eeadb1c
* | | | | | | | | | | | | | | | | | | | | | | Merge "Snap for 6660490 from f1575d44a910e31bd2a174acd029f55b11c71845 to ↵platform-tools-30.0.4android-build-prod (mdb)2020-07-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdk-release" into sdk-release
| * | | | | | | | | | | | | | | | | | | | | | | Snap for 6660490 from f1575d44a910e31bd2a174acd029f55b11c71845 to sdk-releaseandroid-build-prod (mdb)2020-07-082-2/+2
|/| | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee9e54a3af124e83640268339eb821c64eac0df9
| * | | | | | | | | | | | | | | | | | | | | | Merge "change parameter type for 32bit platform"android-r-beta-3android-r-beta-2Treehugger Robot2020-07-062-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | change parameter type for 32bit platformjinhong.seol2020-07-022-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: jinhong.seol <jinhong.seol@samsung.com> Change-Id: I8df3b31c8dd0bff92489507b52db7a30643b4eea
| * | | | | | | | | | | | | | | | | | | | | Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6Treehugger Robot2020-05-011-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4cdc9dfbb0f311f90f8599c477ac71578f96b94d
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I4f103abd89a6b31c4ad98047c2e3cb949ee52cf8
| | * | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li2020-03-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 4c514e82b1 Change-Id: I6c52d548843df01dc1418c8c4c447e57b15018ea
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I73856a94961ee0da188f379b5e2c84cb6959d0ff
| | * | | | | | | | | | | | | | | | | | | Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: ↵Automerger Merge Worker2020-02-212-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c238b7dca am: 1f9ebb1971 Change-Id: Ib6bc308dbf5025bf249ec98413f5f2aeaafd45af
* | | | | | | | | | | | | | | | | | | | Merge "Snap for 6533464 from 8e413723a6bfe2628bed5114e472adc34b0b9138 to ↵platform-tools-30.0.3platform-tools-30.0.2android-build-prod (mdb)2020-05-271-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdk-release" into sdk-release
| * | | | | | | | | | | | | | | | | | | | Snap for 6533464 from 8e413723a6bfe2628bed5114e472adc34b0b9138 to sdk-releaseandroid-build-prod (mdb)2020-05-271-0/+3
|/| | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0595faf79494d5216d660c00f07797ba753d420
| * | | | | | | | | | | | | | | | | | | Merge "Add METADATA to ril: Apache2=NOTICE"Treehugger Robot2020-05-011-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add METADATA to ril: Apache2=NOTICEBob Badour2020-05-011-0/+3
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I853f7428d3ad2f69139027d01d84e0f2307fd785
* | | | | | | | | | | | | | | | | | | Merge "Snap for 6290619 from 1f9ebb19717e5a1d2dee987ed0edf62b00967cc9 to ↵platform-tools-30.0.1platform-tools-30.0.0android-build-prod (mdb)2020-03-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdk-release" into sdk-release
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 17:39:24 +0000