summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: ↵Automerger Merge Worker2020-02-212-0/+13
| |\ | | | | | | | | | | | | | | | 8c238b7dca am: 1f9ebb1971 Change-Id: Ib6bc308dbf5025bf249ec98413f5f2aeaafd45af
| | * Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: ↵android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker2020-02-212-0/+13
| |/| | | | | | | | | | | | | | | | 8c238b7dca Change-Id: I1065614fa58e7263a8e32975b79623195e6293f5
| | * Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo"Sarah Chin2020-02-212-0/+13
| | |\
| | | * Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfoSarah Chin2020-02-202-0/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Error if length > 25 Test: lunch cf_x86_phone-userdebug && mm Bug: 144046782 Change-Id: I18f9745174762a52fc20bfc7273c6b3fd2118da5 Merged-In: I18f9745174762a52fc20bfc7273c6b3fd2118da5
* | | 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
| * | Merge "Add dbright to OWNERS file" am: 02ed800d62 am: e37523d84cAutomerger Merge Worker2020-01-091-1/+2
| |\ \ | | | | | | | | | | | | Change-Id: Ide70a8f712dce177bf537f15253c0a7ab6cfe4ba
| | * | Merge "Add dbright to OWNERS file"Daniel Bright2020-01-081-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | am: 02ed800d62 Change-Id: I1ffca426da2fc50ac2dc9db12f6ff473c32b8133
| | | * Merge "Add dbright to OWNERS file"android-r-preview-1Treehugger Robot2020-01-091-1/+2
| | | |\
| | | | * Add dbright to OWNERS fileDaniel Bright2020-01-071-1/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 147314799 Test: N/A Merged-In: I81327b6b5e268942ebfbbe7b706acf188c8b5fea Change-Id: I81327b6b5e268942ebfbbe7b706acf188c8b5fea
* | | | 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 "Encode MCC with 3 digit in CellIdentity" am: 61d7c1ccd0 am: 86d6ae7ca4Automerger Merge Worker2019-12-192-8/+81
| |\| | | | | | | | | | | | | | Change-Id: I0822dbc432d3914476104626ad4ca3d89ecbe3de
| | * | Merge "Encode MCC with 3 digit in CellIdentity"Terry Huang2019-12-182-8/+81
| | |\| | | | | | | | | | | | | | | | | | | | | am: 61d7c1ccd0 Change-Id: I9c8ec09590bdf8dda9c3cb2a455cd3016fff0f39
| | | * Merge "Encode MCC with 3 digit in CellIdentity"Terry Huang2019-12-192-8/+81
| | |/|
| | | * Encode MCC with 3 digit in CellIdentityterrycrhuang2019-12-192-8/+81
| | |/ | | | | | | | | | | | | | | | | | | Bug: 145809537 Test: ril::util::mcc::test Change-Id: Ie0b9d0a56530cc7a2146e9955d392867634d2b8b
* | | Merge "Fix typo" am: 11b162a4cd am: f1aa3222d1Taesu Lee2019-12-021-1/+1
|\| | | | | | | | | | | | | | | | | am: d376d26134 Change-Id: I207cb3ee2f58c9e2383069a1e7e7fdf99ed316bf
| * | Merge "Fix typo" am: 11b162a4cdTaesu Lee2019-12-021-1/+1
| |\| | | | | | | | | | | | | | | | am: f1aa3222d1 Change-Id: I904263f59f3e220b1cb89f95fee180c9c7f173f0
| | * Merge "Fix typo"Taesu Lee2019-12-021-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | am: 11b162a4cd Change-Id: If9085dcb2679939f99acdea2af92e61c67c8e9f3
| | | * Merge "Fix typo"Treehugger Robot2019-12-021-1/+1
| | | |\
| | | | * Fix typoTaesu Lee2019-11-271-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Test: build Change-Id: I729888834881386d52f072e0444d50b480f85928 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
* | | | [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
| * | | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: d4b612036d Change-Id: I8eec36ffb363954ccf77bde3f7f6a1fc7d7d273e
| | * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li2019-10-300-0/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | stage-aosp-master Bug: 142003500 Change-Id: Ib664d11959201605590763e3e696ee889d4619c2
* | | | Merge "Add sarahchin to OWNERS" am: 2d39acdbe2 am: 273a822d97 am: 9b8fb3b36cSarah Chin2019-10-181-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 78a8e4ac32 Change-Id: Id484035b5fc70369248364e8960c17531164fdab
| * | | Merge "Add sarahchin to OWNERS" am: 2d39acdbe2 am: 273a822d97Sarah Chin2019-10-181-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 9b8fb3b36c Change-Id: I0cb33cca0408ccc221236d425fe1b72ab026c43a
| | * | | Merge "Add sarahchin to OWNERS" am: 2d39acdbe2Sarah Chin2019-10-181-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 273a822d97 Change-Id: Id76f537a0f81d40512641b8e7e51b860c8b84cf2
| | | * | Merge "Add sarahchin to OWNERS"Sarah Chin2019-10-181-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2d39acdbe2 Change-Id: I3eced923fe9b88598b074cf7de43c16b251600e6
| | | | * \ Merge "Add sarahchin to OWNERS"Treehugger Robot2019-10-191-0/+1
| | | | |\ \
| | | | | * | Add sarahchin to OWNERSSarah Chin2019-10-181-0/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Test: no test Change-Id: Ib34c9c4bf2bf9df99a54d2232f7c9ec83f43cba9
* | | | | | Skip QD1A.190821.011 in stage-aosp-master am: 7fff9c2f04 am: 8c97bd2121Xin Li2019-10-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4691416f16 Change-Id: I14221001a8030ce9c4a01db0ce1d29cae62622aa
| * | | | | Skip QD1A.190821.011 in stage-aosp-master am: 7fff9c2f04Xin Li2019-10-180-0/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | am: 8c97bd2121 Change-Id: I3f7e60eac45528637e0472da068702d2ab188f50
| | * | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-180-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7fff9c2f04 Change-Id: I003b2202af0495891321915264e73234b643d380
| | | * | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Bug: 141248619 Change-Id: Ica7f6be7e54a1b940f4fac72e6c70a6a532db4ab
| | | | * \ Snap for 5663715 from cffbeaf2db40ac50eccbdd863632f67cc8ed2b06 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot2019-06-151-0/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-c2f2-release Change-Id: If2e891a8ba3c59f9d6e198c9d2054d08f9e58ddd
* | | | | | | Merge "Remove libhwbinder/libhidltransport deps" am: bf7fd5c828 am: ↵Steven Moreland2019-10-021-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee61593d21 am: 313867d0b8 am: 537830ba50 Change-Id: Ic36b6e3a67e9e902c71df016dfc0530c8e704b61
| * | | | | | Merge "Remove libhwbinder/libhidltransport deps" am: bf7fd5c828 am: ee61593d21Steven Moreland2019-10-021-3/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 313867d0b8 Change-Id: I3a1c58b832664feda7df7ed454a116b6de9d587d
| | * | | | | Merge "Remove libhwbinder/libhidltransport deps" am: bf7fd5c828Steven Moreland2019-10-021-3/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ee61593d21 Change-Id: Ic42146e363eb5eff124d8a3456ff7f8f773ff1f2
| | | * | | | Merge "Remove libhwbinder/libhidltransport deps"Steven Moreland2019-10-021-3/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | am: bf7fd5c828 Change-Id: Ibda2e8ec290a8b2ce006edd7c7a63982c03794eb
| | | | * | | Merge "Remove libhwbinder/libhidltransport deps"ndk-sysroot-r21Treehugger Robot2019-10-021-3/+1
| | | | |\ \ \
| | | | | * | | Remove libhwbinder/libhidltransport depsSteven Moreland2019-10-021-3/+1
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these were combined into libhidlbase. Bug: 135686713 Test: build only (libhwbinder/libhidltransport are empty) Change-Id: I016a6bba8a73cfa4d099fc8dc1a1a9379ff51371
* | | | | | | [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 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 skip reason: change_id Id4609cad94db5358ac03231a0537468b81f3dd33 with SHA1 ee4efc6bee is in history Change-Id: I4326f94af1e8710243d1842a6402945ee73f2128
| | * | | | | [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 skip reason: change_id Id4609cad94db5358ac03231a0537468b81f3dd33 with SHA1 ee4efc6bee is in history Change-Id: I592d78e543f6ff90b3b0c5402578559df1305137
| | | * | | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I47f9a01ebf595c604d10409c62c23fad8b4d8e2b Merged-In: Id4609cad94db5358ac03231a0537468b81f3dd33
* | | | | | | [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
| * | | | | | [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 Change-Id: Ia751244dacff6c068c65e3f815b82152e70147a8
| | * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7acf7a616 -s ours am: ddf3ea0473 Change-Id: I6da5e12cdf52f2e459cfb995c0c92371c2888be2
| | | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7acf7a616 -s ours am skip reason: subject contains skip directive Change-Id: Ifede2fba4dafa914099a89669eeade3e4a95e658
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:50:57 +0000