summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-07[automerger skipped] Convert Android.mk file to Android.bp am: f041701d2d ↵r_aml_301500702android-mainline-12.0.0_r55android-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_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_r16android11-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-b-releaseAutomerger Merge Worker
am: f48d6708df am: aa0f191748 -s ours am skip reason: Change-Id Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb with SHA-1 469bd61ba3 is in history Change-Id: Iaf47444fc15a8309ce0ecf7c77c31430333235f6
2020-02-07Convert Android.mk file to Android.bp am: f041701d2d am: f48d6708dfAutomerger Merge Worker
Change-Id: Ibc4f83a7a9bd53b1d2173bb8adcffcbd85fd5906
2020-02-07Convert Android.mk file to Android.bp am: f041701d2dandroid-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I340c4c3349ad73b75eb1250ac8930497847aa224
2020-02-05Convert Android.mk file to Android.bpSasha Smundak
Same as ag/8070272 Fixes: 122331945 Test: treehugger Change-Id: I61ac350d3bb649a4a1a23e78d7b2495ab1a73a3e Merged-In: Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb
2019-12-26Remove unused codeWonsik Kim
Test: builds Change-Id: Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb
2019-12-20Link with actual header instead of symlink am: c533697b8d am: 411457174d am: ↵Automerger Merge Worker
5e2151f62a Change-Id: I944504ec38977161be03b648aa6e87464f7fd1e8
2019-12-20Link with actual header instead of symlink am: c533697b8d am: 411457174dAutomerger Merge Worker
Change-Id: I9080fef12198708db2caed9055f3b190723671df
2019-12-20Link with actual header instead of symlinkMarco Nelissen
am: c533697b8d Change-Id: I883e79aab99ba26fb6ee5d5ac033cd0221c1259d
2019-12-19Link with actual header instead of symlinkandroid-r-preview-1Marco Nelissen
Test: build Change-Id: I8bb11bfebbb664517a50ed68923469b411d4dccb
2019-11-27sfplugin: fix buildWonsik Kim
Bug: 136290435 Test: builds Change-Id: I96d00daa3480d31ee463075c93a43a9c5f300476
2019-11-17ICrypto: use hidl memory instead of binder memoryRobert Shih
Bug: 134787536 Test: GtsMediaTestCases Change-Id: I508cadec6aea04a6808dbdad86f3b68c04bfc2a5
2019-11-12hardware: google: av: media: fix -Wdangling-gsl am: b5f4c2ab97 am: dc98ac543cNick Desaulniers
am: d28d2efed5 Change-Id: Id0aca1a70d783807a538f7947c45f61d9f4b9a30
2019-11-12hardware: google: av: media: fix -Wdangling-gsl am: b5f4c2ab97Nick Desaulniers
am: dc98ac543c Change-Id: I662b83dc9ec7e086ec746dbdb128bc5004922fbe
2019-11-12hardware: google: av: media: fix -Wdangling-gslNick Desaulniers
am: b5f4c2ab97 Change-Id: Ib2b2540ae82e03ddb5cb502cb3b13839702c8da9
2019-11-11hardware: google: av: media: fix -Wdangling-gslNick Desaulniers
linearBlock() constructs a temporary variable. front() refers to a temporary object that's no longer valid at the end of the expression. Bug: 139945549 Test: mm Change-Id: Iabf0a1c34f2e086138339065c4bf55bba7ce7d4a Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0d317849d6 am: 68c111adfa -s ours am skip reason: subject contains skip directive Change-Id: I375d602e9af0e5e14e8bce58e5aef0f6a2f7ed3c
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 0d317849d6 Change-Id: I68c4b2e39738ce3db0bda542189c47ef209d0123
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I0fe81dd6aa41b274e4b99a17fdbc4c728182c3a8
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: b03eb11e8c -s ↵Xin Li
ours am: be38a8fdea -s ours am: f74ab95a18 -s ours am: eaa1806d52 -s ours am skip reason: change_id I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb with SHA1 8701769e72 is in history Change-Id: Ia7145a1a870bf001092bb0c81e1fdaa74a677c2d
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: b03eb11e8c -s ↵Xin Li
ours am: be38a8fdea -s ours am: f74ab95a18 -s ours am skip reason: change_id I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb with SHA1 8701769e72 is in history Change-Id: Iaec8a84911ab6fceef638eac1a0ecdcd927c8042
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: b03eb11e8c -s oursXin Li
am: be38a8fdea -s ours am skip reason: change_id I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb with SHA1 8701769e72 is in history Change-Id: I69a237681c754c83ff2fe460428d3a3d24e437dc
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: b03eb11e8c -s ours am skip reason: change_id I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb with SHA1 8701769e72 is in history Change-Id: Ib02f8e2cbb9ea7a05d030b88df78bb781310198b
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: If06784dea5892911aba0af41595676b3d1f9dc22 Merged-In: I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb
2019-10-24Adjust to IGraphicBufferSource.aidl removalWonsik Kim
Bug: 143248118 Bug: 136290435 Test: m checkbuild Change-Id: I19d7de1f2290c36d94bc601ce932b80204689ec6
2019-10-23Make DataSourceFactory singleton am: 03a78366e8 am: 8701769e72 am: fe725652aeDongwon Kang
am: 544375d6b4 Change-Id: I606a0cc4dd3cb6fc59f6f8cdcf54efc63acea86b
2019-10-23Make DataSourceFactory singleton am: 03a78366e8 am: 8701769e72Dongwon Kang
am: fe725652ae Change-Id: I792c2316e0cbcff111e05ed486dee44d2ac1be1c
2019-10-23Make DataSourceFactory singleton am: 03a78366e8Dongwon Kang
am: 8701769e72 Change-Id: Ibe44355d437df68fdabc0573b158378b0ef2329b
2019-10-23Make DataSourceFactory singletonb_141248619Dongwon Kang
am: 03a78366e8 Change-Id: I263d5e27eae2fd54359f3e15cb1d1af6f44b03bb
2019-10-23Make DataSourceFactory singletonDongwon Kang
This is preparation for having a subclass of DataSourceFactory which is only used in mediaserver process with OMA (forward-lock) use case. Test: build Bug: 142567168 Change-Id: If4b7cb513b4759f2974b644ad4141e28eb34745e
2019-10-18Skip QD1A.190821.011 in stage-aosp-master am: 0dd1d7c46f am: 74a66ed087Xin Li
am: ac74d18f1b Change-Id: Ic2559d0560bd2b4ca14c62cc648f32e8be26c527
2019-10-18Skip QD1A.190821.011 in stage-aosp-master am: 0dd1d7c46fXin Li
am: 74a66ed087 Change-Id: I2d2f430f268a158fb4ae1a6863c5c163eb51a1d7
2019-10-18Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: 0dd1d7c46f Change-Id: Id00cee9935a4e4c3456bdc441fe4abb56baa9ec3
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: I147b4aa19e7b095fb8d6622a442ea7560445095b
2019-10-15[automerger skipped] sfplugin: separate codeclist from libmedia am: ↵Dongwon Kang
0cac065de3 am: 8570875ddf am: a523f9a640 am: 8804c3c7fb -s ours am skip reason: change_id I76919d85a7641b83b9fe3e8671579b0296a892a3 with SHA1 651cf3ddb2 is in history Change-Id: If368859097196ed1d3cc837c2028b8afa7ef537f
2019-10-15sfplugin: separate codeclist from libmedia am: 0cac065de3 am: 8570875ddfDongwon Kang
am: a523f9a640 Change-Id: Idbb1aa0c2ca897f010d86c0ebe2ec2a6aa1a6ee7
2019-10-15sfplugin: separate codeclist from libmedia am: 0cac065de3Dongwon Kang
am: 8570875ddf Change-Id: I1321c816551e4a73cc2960701aeb87ad81e9b970
2019-10-15sfplugin: separate codeclist from libmediaDongwon Kang
am: 0cac065de3 Change-Id: I9732d28b884a3fd78e11ac49c35b88680ce109dd
2019-10-11sfplugin: separate codeclist from libmediaDongwon Kang
Test: build. Bug: 139201422 Change-Id: I76919d85a7641b83b9fe3e8671579b0296a892a3 Merged-In: I76919d85a7641b83b9fe3e8671579b0296a892a3
2019-10-09Update for libdatasource am: 73bf9cc8dd am: c60d42beb1 am: 9ae8e05727Marco Nelissen
am: 296e117ce1 Change-Id: I03405f424dab39383188d1aadeebe0ff93e46523
2019-10-09Update for libdatasource am: 73bf9cc8dd am: c60d42beb1Marco Nelissen
am: 9ae8e05727 Change-Id: I9fe246389507798e8f0c66d159bc4aee51a8a808
2019-10-09Update for libdatasource am: 73bf9cc8ddMarco Nelissen
am: c60d42beb1 Change-Id: Ib1311e7635b622925c063a9ba190d3a6798771f6
2019-10-09Update for libdatasourceMarco Nelissen
am: 73bf9cc8dd Change-Id: I8bcc018d441f207131bf7eff4ba05133f50491f5
2019-10-09Update for libdatasourcendk-sysroot-r21Marco Nelissen
Test: build Change-Id: I6d9461f202c10df4c0da3a518b199c4edb75c975
2019-10-07Update for libdatasourceMarco Nelissen
Test: build Change-Id: I6d9461f202c10df4c0da3a518b199c4edb75c975
2019-10-04Merge "Remove libhwbinder/libhidltransport deps"TreeHugger Robot
2019-10-03[automerger skipped] Merge "Update libmediadrm includes" am: 00d903eed6 am: ↵Marco Nelissen
2d0a8c4bf7 -s ours am: edb8469808 -s ours am: 9c16327ca7 -s ours am skip reason: change_id Ib2f5afa04d95f723153545a59cd40af45335fc45 with SHA1 3e9a1045f9 is in history Change-Id: Iaf4c5cbca6c9c0a604ad80694e989592ecd2dc58
2019-10-03[automerger skipped] Merge "Update libmediadrm includes" am: 00d903eed6 am: ↵Marco Nelissen
2d0a8c4bf7 -s ours am: edb8469808 -s ours am skip reason: change_id Ib2f5afa04d95f723153545a59cd40af45335fc45 with SHA1 5877679e91 is in history Change-Id: I123044cb7bfc5b5c1fa812c424c2d05c9af036a8
2019-10-03[automerger skipped] Merge "Update libmediadrm includes" am: 00d903eed6Marco Nelissen
am: 2d0a8c4bf7 -s ours am skip reason: change_id Ib2f5afa04d95f723153545a59cd40af45335fc45 with SHA1 5877679e91 is in history Change-Id: I45ed427685f0238f21dd87c0131e0b4846782ada
2019-10-03Merge "Update libmediadrm includes"Marco Nelissen
am: 00d903eed6 Change-Id: I9f091336516e250ff56d769fce467496bc7b633b
2019-10-03Merge "Update libmediadrm includes"Marco Nelissen