aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-14[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: b10399fe41 -s ours am skip reason: subject contains skip directive Change-Id: If6c1d41b1f87344f530e0df0f0d0f49242ece0cb
2019-02-12DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵temp-124234733-masterXin Li
stage-aosp-master Bug: 124234733 Change-Id: Ib6e64738e3b24bb40a7f4e76b0b5f48da485e7c4
2019-02-09Snap for 5180536 from 478501a47467a45ad792df3a08203d7937e82a19 to ↵android-build-team Robot
pi-platform-release Change-Id: I0ceb3534d3ea8209b8cf72f032f8b807181f1191
2019-02-02Import translations. DO NOT MERGEBill Yi
Change-Id: Ib1d5c5cfa4bdf85bf129857975d129ba1c54e60e Auto-generated-cl: translation import
2019-01-15[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: ↵Sasha Smundak
0081b3831b am: 57c754bc37 am: a9951e0a89 -s ours am skip reason: change_id Idb03dd371284aec57ed356c6091965672b7b95f5 with SHA1 3a60018717 is in history Change-Id: I1b2afaf9404fdac2707787eb01b0e60bb15ab806
2019-01-15Merge "Convert Android.mk file to Android.bp" am: 0081b3831bSasha Smundak
am: 57c754bc37 Change-Id: I849ece800ad48a33bb4bd3caf14c2685b07ce803
2019-01-15Merge "Convert Android.mk file to Android.bp"Sasha Smundak
am: 0081b3831b Change-Id: Ie2cc292573f62b32d5b6f36d4af483afc405b1e1
2019-01-15Merge "Convert Android.mk file to Android.bp"Treehugger Robot
2019-01-15[automerger skipped] Merge "Add call Id information to call log provider." ↵Tyler Gunn
am: 04134edaaf am: d64bcf2a5f am: 98466ba5c7 -s ours am skip reason: change_id I1c41c89e0fd414cb4dbe4a90f8aa3721186381e3 with SHA1 b246f40239 is in history Change-Id: Ib0b3ea3c9f5d7bb2435552ae0667597d884bddcd
2019-01-15Merge "Add call Id information to call log provider." am: 04134edaafTyler Gunn
am: d64bcf2a5f Change-Id: I447ad17c6bcc35d5bdc93af75a721e0db1be6569
2019-01-15Merge "Add call Id information to call log provider."Tyler Gunn
am: 04134edaaf Change-Id: Ibbbadc083d4a93108e9c0f494f1bebae7ccf2da9
2019-01-15Merge "Add call Id information to call log provider."Tyler Gunn
2019-01-14Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Change-Id: Idb03dd371284aec57ed356c6091965672b7b95f5 Merged-In: Idb03dd371284aec57ed356c6091965672b7b95f5 Fixes: 122333363 Test: treehugger
2019-01-13[automerger skipped] Import translations. DO NOT MERGE am: 62c1be7d0a -s oursBill Yi
am: 86cde02d82 -s ours am skip reason: subject contains skip directive Change-Id: I52854a78e8f50a4e958241e8a7429109d14748aa
2019-01-13[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 62c1be7d0a -s ours am skip reason: subject contains skip directive Change-Id: I6f6472cb1779a14f4143c7a5c582e26a941a7b97
2019-01-13Import translations. DO NOT MERGEpie-b4s4-devBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I23c6f75a100504c94870ff3f4577ec8ec1bbb9b1
2019-01-12Import translations. DO NOT MERGEBill Yi
Change-Id: If2fa8aff75df9de45f34ed2806acc6d8907e118c Auto-generated-cl: translation import
2019-01-10Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Bug: 122333363 Test: treehugger Change-Id: Idb03dd371284aec57ed356c6091965672b7b95f5
2019-01-10Add call Id information to call log provider.Tyler Gunn
Bug: 63966743 Test: Manual with test app. Merged-In: I1c41c89e0fd414cb4dbe4a90f8aa3721186381e3 Change-Id: I1c41c89e0fd414cb4dbe4a90f8aa3721186381e3
2018-12-23[automerger skipped] Import translations. DO NOT MERGE am: 971ceb6e23 -s oursBill Yi
am: 623f2340fe -s ours Change-Id: I82b50937786d5b57ebeb4f5266c84f71f10fb33f
2018-12-23[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 971ceb6e23 -s ours Change-Id: I581b52548f2dd23522633dbd748aa9aec3214e1e
2018-12-23Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I658a1edea5392f1a3dba4ec5bf88e36625248a4d
2018-12-23Import translations. DO NOT MERGEBill Yi
Change-Id: I6abc805e63cc04262a5311302822f485a127d083 Auto-generated-cl: translation import
2018-12-17Merge "Migrate packages/providers/ContactsProvider to androidx.test"TreeHugger Robot
2018-12-14Merge "Add call Id information to call log provider."Tyler Gunn
2018-12-13Migrate packages/providers/ContactsProvider to androidx.testBrett Chabot
See go/jetpack-test-android-migration Test: make checkbuild Change-Id: I416cabf849d049a789efe8f8b513bbead4533115
2018-12-13Merge "Schematize Contacts system properties" am: 559ec507e5 am: dc253383bdInseob Kim
am: 294406ed52 Change-Id: Id8c7b222ddfa158d052b921a3c7d0e62a202a4c4
2018-12-13Merge "Schematize Contacts system properties" am: 559ec507e5Inseob Kim
am: dc253383bd Change-Id: I3324d23a4e5fe5faa0149c2682bf97fae9bb2fcf
2018-12-13Merge "Schematize Contacts system properties"Inseob Kim
am: 559ec507e5 Change-Id: I890ae4ec48fb6f102d56a3e634b329c9ab042414
2018-12-13Merge "Schematize Contacts system properties"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot
2018-12-11Merge "Add PhoneAccount rows to phone_lookup projection" am: f2ebd6d343 am: ↵Hall Liu
2a980a9fd1 am: 5fbdf8ab1b Change-Id: I56376083d6f5c5f86c58c2c1360bc6bb81a908c9
2018-12-11Merge "Add PhoneAccount rows to phone_lookup projection" am: f2ebd6d343Hall Liu
am: 2a980a9fd1 Change-Id: I369da2b881ead66f1e595779fd4270138996104d
2018-12-11Merge "Add PhoneAccount rows to phone_lookup projection"Hall Liu
am: f2ebd6d343 Change-Id: Ib516f163ffe90ced292572fe29f2aa3b05485b49
2018-12-11Merge "Add PhoneAccount rows to phone_lookup projection"Hall Liu
2018-12-10Add call Id information to call log provider.Tyler Gunn
Bug: 63966743 Test: Manual with test app. Change-Id: I1c41c89e0fd414cb4dbe4a90f8aa3721186381e3
2018-12-06[automerger skipped] Merge "DO NOT MERGE" am: 788f894424 -s ours am: ↵The Android Open Source Project
fb9eb33654 -s ours am: e6180e8434 -s ours Change-Id: Ia2dff1f467492798a8407dbd650fb65138a4885d
2018-12-06[automerger skipped] Merge "DO NOT MERGE" am: 788f894424 -s oursThe Android Open Source Project
am: fb9eb33654 -s ours Change-Id: I50867566c724f48c1b8c2a59a2a39e7918137768
2018-12-06Add PhoneAccount rows to phone_lookup projectionHall Liu
Get the phone account component and id columns from the data table when doing a phone lookup. Bug: 111455117 Test: unit, manual Change-Id: I4e0c2a01aa8591f6541e86ac543506d95ca22d86
2018-12-06[automerger skipped] Merge "DO NOT MERGE"The Android Open Source Project
am: 788f894424 -s ours Change-Id: Idc46d709f0ea4a8f7f6094a2d1f32c089926286e
2018-12-07Merge "DO NOT MERGE"Treehugger 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: I5d9f000ef5d44e35eaba14a0547bc0939270ecbe
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi
Change-Id: Ib128afb5e7cfa86d65c805174e02e8a96eeac186
2018-11-21Schematize Contacts system propertiesInseob Kim
Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: mma -j Change-Id: I3c270dd0364629aacabf489c5c01277111b98ad9
2018-11-08Merge "[Call Screening]Logging of calls blocked by call blocking feature, ↵Tony Zhu
call screening app." am: 1e6ac864ef am: b00a581861 am: 0c3f1e77b4 Change-Id: I25feccd3d1b2dd9896610b6444e065022d71fcec
2018-11-08Merge "[Call Screening]Logging of calls blocked by call blocking feature, ↵Tony Zhu
call screening app." am: 1e6ac864ef am: b00a581861 Change-Id: I0b5ada36586319157f744482ddf6a67f11287734
2018-11-08Merge "[Call Screening]Logging of calls blocked by call blocking feature, ↵Tony Zhu
call screening app." am: 1e6ac864ef Change-Id: I32077b102da2a1517a5000f5809b0e72705bf946
2018-11-08Merge "[Call Screening]Logging of calls blocked by call blocking feature, ↵android-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-releaseTony Zhu
call screening app."
2018-11-08[Call Screening]Logging of calls blocked by call blocking feature, call ↵tonyzhu
screening app. Add CALL_SCREENING_COMPONENT_NAME, CALL_SCREENING_APP_NAME, BLOCK_REASON columns to the call log database that identify the reason a call was blocked and which app was responsible for. Bug: 113243596 Test: run CallLogProviderTest Change-Id: I95786b109b66cff188560570a456201083b09001
2018-11-07Snap for 5115288 from 60be7111c86e1d72377ab298a6ecaf597530ecef to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot
pi-qpr2-release Change-Id: Ib699c1844b2730513209471d880e06768e5693a1
2018-11-02[automerger skipped] Import translations. DO NOT MERGE am: 60be7111c8 -s oursBill Yi
am: 21f6cfc3fe -s ours Change-Id: I42625fa4fb2fade2021639d53df49d628215121f