summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-12Camera: Centralize OWNERSandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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-releaseEino-Ville Talvala
Test: Builds Change-Id: I9038877ed1d5df21d43b8101f53b4097023ae908
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 2e175894e7 Change-Id: I47bbf8d2d3143563dafa2732291ff6288a31a5a0
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ibd25b2379a50d884353dc1a5052fca3a845c5d6d
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I0f5ef223e53fc768496d5047d6962801d329dc51
2019-01-22Merge "Convert Android.mk files to Android.bp" am: 3fa00b9343 am: 1b6d2a8e0cSasha Smundak
am: c4915d6e1c Change-Id: Ib9e11c6be88bca2b6928f1130e877eb3a49a36f6
2019-01-22Merge "Convert Android.mk files to Android.bp" am: 3fa00b9343Sasha Smundak
am: 1b6d2a8e0c Change-Id: I04f780e6c5bec53327dfb2e11ba7a2604b3e1af7
2019-01-22Merge "Convert Android.mk files to Android.bp"Sasha Smundak
am: 3fa00b9343 Change-Id: I9428a3648d8598fbc5ecdbafee48800f4105ebe0
2019-01-22Merge "Convert Android.mk files to Android.bp"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot
2019-01-10Convert Android.mk files to Android.bpSasha Smundak
See build/soong/README.md for more information. Fixes: 122333027 Test: treehugger Change-Id: Ia805750a9f8d89258998d92de824d162527b436f
2019-01-09Merge "Migrate frameworks/ex/camera2 to androidx.test"TreeHugger Robot
2018-12-18Migrate frameworks/ex/camera2 to androidx.testKOUSHIK PANUGANTI
See go/jetpack-test-android-migration Test: make checkbuild Change-Id: I3c583c7872cb633c5328699bd9ecaacaac7440f8
2018-12-13Migrate frameworks/ex to androidx.testBrett Chabot
See go/jetpack-test-android-migration Test: make checkbuild Change-Id: I3b4cc22d6b2a35c2ac848d7154b5f0a1b75af1b5
2018-12-06[automerger skipped] Merge "DO NOT MERGE" am: d264fd171a -s ours am: ↵The Android Open Source Project
29be9069bb -s ours am: 72673d84e0 -s ours Change-Id: I871007dce2d60a2497b923ca1295e1e7a040d351
2018-12-06[automerger skipped] Merge "DO NOT MERGE" am: d264fd171a -s oursThe Android Open Source Project
am: 29be9069bb -s ours Change-Id: I9614ea353ddffc9e0b2ac86d99055f8b01d11ea5
2018-12-06[automerger skipped] Merge "DO NOT MERGE"The Android Open Source Project
am: d264fd171a -s ours Change-Id: I970bb4fb03d0770130289692b0b655de037ebcbf
2018-12-07Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-06DO NOT MERGEThe Android Open Source Project
Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I8ae908d6e5f8c9a24c0c8bad7e03d48fb72acc6a
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-platform-releasepie-cuttlefish-testingBill Yi
Change-Id: Ia211f36b5f279e12d5a4aaad592c3f1c1d3f2599
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: fe5d428391 -s ours am: 0b30607a63 -s ours am: ed10fd5b3a -s ours Change-Id: I844f6b442c0bdaef3d3d951625ea27848bbd8d64
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: fe5d428391 -s ours am: 0b30607a63 -s ours Change-Id: I766a792453ba8e02e12cfb532d0da5f0532720fa
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: fe5d428391 -s ours Change-Id: I6383d20be290683905bcf5d3d3633cd4d408ff22
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Id34728b788c2460979bedcc0bc396f4dc38fff8e
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 12b03afe19 -s ours am: 746f72edf4 -s ours Change-Id: I2374e5402dbfe69470393db72f0e8a87e45b7abf
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 12b03afe19 -s ours Change-Id: Icd71a570af08fea085b97ae50093f4d171372d01
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I0d151f989d4f2fb88201d8647c710e881d6506cc
2018-08-24Merge "Convert frameworks/ex/camera2 to Android.bp" am: c31392c62a am: ↵Colin Cross
d7bfd5323f am: 583dbf9fba Change-Id: I4c834c5dbf9816ce6f45968f79aa645438cffc1d
2018-08-24Merge "Convert frameworks/ex/camera2 to Android.bp" am: c31392c62aColin Cross
am: d7bfd5323f Change-Id: I0a24d059ed8f7ff6a82ec101da9e58681422364b
2018-08-24Merge "Convert frameworks/ex/camera2 to Android.bp"Colin Cross
am: c31392c62a Change-Id: I49d3df7bf8c0c90983690ea125ce6fd40c1d0809
2018-08-24Merge "Convert frameworks/ex/camera2 to Android.bp"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-08-16Merge "Merge "Camera2: Handle eviction case in BlockingCameraManager" into ↵Shuzhen Wang
pie-cts-dev am: db8eb3013e" am: ac7fbf2412 am: 23e863d8c4 am: 98f6b40d02 Change-Id: Ifdb4ae8e13ed10f3449be2eec2560bd50b24fa5f
2018-08-16Merge "Merge "Camera2: Handle eviction case in BlockingCameraManager" into ↵Shuzhen Wang
pie-cts-dev am: db8eb3013e" am: ac7fbf2412 am: 23e863d8c4 Change-Id: Ia12f33ffa3bbd3e291034d00143b6c522276504f
2018-08-17Snap for 4959688 from 348034b180804822b5a7d01de28834e09a7d5238 to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releaseandroid-build-team Robot
pi-qpr1-release Change-Id: I14ea124d9298f08b79bece70f8ccc334b69cf172
2018-08-16Merge "Camera2: Handle eviction case in BlockingCameraManager" into ↵Shuzhen Wang
pie-cts-dev am: db8eb3013e am: 348034b180 am: 9cea582d57 Change-Id: Id0b79bc637e430a2d461301aa032e8027513e708
2018-08-16Merge "Merge "Camera2: Handle eviction case in BlockingCameraManager" into ↵Shuzhen Wang
pie-cts-dev am: db8eb3013e" am: ac7fbf2412 Change-Id: I7fe859210f5265927cf7448ff5254cd22f2cdcca
2018-08-16Merge "Camera2: Handle eviction case in BlockingCameraManager" into ↵Shuzhen Wang
pie-cts-dev am: db8eb3013e am: 348034b180 Change-Id: Iccd712edf16f2f96ee5d442516a2890734c98c18
2018-08-16Merge "Merge "Camera2: Handle eviction case in BlockingCameraManager" into ↵Android Merger
pie-cts-dev am: db8eb3013e"
2018-08-16Merge "Camera2: Handle eviction case in BlockingCameraManager" into pie-cts-devandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devShuzhen Wang
am: db8eb3013e Change-Id: I3b2ab7562623bb9441aa3343c6d1fd664df2aa7f
2018-08-16Merge "Camera2: Handle eviction case in BlockingCameraManager" into pie-cts-devShuzhen Wang
am: db8eb3013e Change-Id: Ic4a652666fda63e1207690192273810afe592aec
2018-08-15Merge "Camera2: Handle eviction case in BlockingCameraManager" into pie-cts-devandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10pie-vts-releasepie-cts-releasepie-cts-devTreehugger Robot
2018-08-14Convert frameworks/ex/camera2 to Android.bpColin Cross
See build/soong/README.md for more information. Test: mmma frameworks/ex/camera2 Test: atest android-ex-camera2-utils-tests android-ex-camera2-portability-tests Change-Id: I48b2640b6cc409b4a8f2ec6b47d444bd70878518
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-master am: be972ec7eaXin Li
am: c4933e429d Change-Id: I1ce2b71e48f9f27ca3b3dcba87a519cf96380144
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
am: be972ec7ea Change-Id: If3208bca0ff5fabe80ddc94f06ff24d3114c8938
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
Bug: 112535855 Change-Id: I8c2a5bcb7432bc81d440a621e4c565d5856e5d24
2018-08-08Merge "Merge Android Pie into master" am: 59d3d75061 am: 922da8ac31 am: ↵Xin Li
114628334d am: 1ccc44b139 Change-Id: I9bbccd57cbcefc41621c719a3db0d30b48d7b053
2018-08-07Merge "Merge Android Pie into master" am: 59d3d75061 am: 922da8ac31Xin Li
am: 114628334d Change-Id: If902bd6410a74bb0fc94dcbd9d8f8cd44cc77cba
2018-08-07Merge "Merge Android Pie into master" am: 59d3d75061Xin Li
am: 922da8ac31 Change-Id: If98303537612053aad415f2538d2aaf43778e339
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: 59d3d75061 Change-Id: Ide20b50297e5aaf19d72e3910bf7d4e06ea98a02
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: I75f181ebce284a5000e8cd794234aaf34aa08d2a
2018-08-02No longer keep track of contacts affinity (3/4)Makoto Onuki
Test: atest android.provider.cts.contacts Test: atest ContactsProviderTests ContactsProviderTests2 Change-Id: I10e66441a9766947c7c14ae25022deadac5a9c7c Bug: 111210683
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 03:26:18 +0000