summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-15Snap for 6296837 from 3c71dd87b259552fdc5a19f9b9c8ce4f1b307a53 to ↵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_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid-build-team Robot
mainline-release Change-Id: Ie918abaf4507d8473db4cd2cd57a903ba5ed8837
2020-03-12Revert [Telephony mainline] Move all METHOD_* constants from SystemContract ↵Automerger Merge Worker
to BlockedNumberContract am: 4ecc0acdf5 am: b09bac846c am: 049f9d571c Change-Id: Ic6f40de734810adb93e8b400c3ee10f194d40dc4
2020-03-12Revert [Telephony mainline] Move all METHOD_* constants from SystemContract ↵android-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_r18android11-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-d2-releaseAutomerger Merge Worker
to BlockedNumberContract am: 4ecc0acdf5 am: b09bac846c Change-Id: I75fc786570392502488b0ff3ba13dfba08401ba9
2020-03-12Revert [Telephony mainline] Move all METHOD_* constants from SystemContract ↵android-11.0.0_r16android11-d1-b-releaseAutomerger Merge Worker
to BlockedNumberContract am: 4ecc0acdf5 Change-Id: I68ae30119363bae50fdc3495d0890e5b34924574
2020-03-12Revert [Telephony mainline] Move all METHOD_* constants from SystemContract ↵android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devzoey chen
to BlockedNumberContract Reason: Revisit and redesign in S Bug: 147390517 Test: make Change-Id: I31ebf6f7b1952feb85fd973fc5314b622c1f2f62 Merged-In: I31ebf6f7b1952feb85fd973fc5314b622c1f2f62 (cherry picked from commit c32b61f0ae669469fce7b4e7ae1b697084533dae)
2020-02-10Adds forceQueryable to manifestPatrick Baumann
This change makes the BlockedNumberProvider visible to all apps on device, removing the need for apps to declare the blocked number provider queryable in their manifests. Test: atest CtsProviderTestCases Bug: 142386643 Change-Id: Ied67677c7313252aafe6b62e6b9dbbe04018c577
2020-02-01[automerger skipped] Import translations. DO NOT MERGE am: f9fad0e830 -s ↵Automerger Merge Worker
ours am: 87d0d0705b -s ours am: f041c044a8 -s ours am skip reason: subject contains skip directive Change-Id: I78000633b82a3203a024cb663d1696cb4a5e5067
2020-02-01[automerger skipped] Import translations. DO NOT MERGE am: f9fad0e830 -s ↵Automerger Merge Worker
ours am: 87d0d0705b -s ours am skip reason: subject contains skip directive Change-Id: I4e43fe0779411a0b117da0e9d724007ffd8f6cda
2020-02-01[automerger skipped] Import translations. DO NOT MERGE am: f9fad0e830 -s oursandroid10-sidebranchAutomerger Merge Worker
am skip reason: subject contains skip directive Change-Id: I614da98e836e02186ca54acb6f2ca8e967676e57
2020-02-01Import translations. DO NOT MERGEandroid-r-preview-1Bill Yi
Change-Id: I574d24dee961296fe5c3ad35d047b4fda6359a09 Auto-generated-cl: translation import
2019-12-05[automerger skipped] Merge "[Telephony mainline] Move all METHOD_* constants ↵Zoey Chen
from SystemContract to BlockedNumberContract" am: ce18139789 am: de94523c11 am: 6347de57fa -s ours am skip reason: change_id I5c4380f9343fa50f469dc59a54900bbdc6ea3693 with SHA1 62747b128f is in history Change-Id: I0867ba7b4acbdb4683c937adcdde276536bf5c25
2019-12-05Merge "[Telephony mainline] Move all METHOD_* constants from SystemContract ↵Zoey Chen
to BlockedNumberContract" am: ce18139789 am: de94523c11 Change-Id: I84c4918900a2e3f9c67841724c5731babbfbd086
2019-12-05Merge "[Telephony mainline] Move all METHOD_* constants from SystemContract ↵Zoey Chen
to BlockedNumberContract" am: ce18139789 Change-Id: Ic5d13520fd9f00b5cfc5bcdcb4cca88404a3c4f3
2019-12-05Merge "[Telephony mainline] Move all METHOD_* constants from SystemContract ↵Zoey Chen
to BlockedNumberContract"
2019-12-04Merge Android10 QPR1 into AOSP master am: c6765102db am: 73ef60476aAutomerger Merge Worker
Change-Id: I03446c2475165752b6ff9048d5d7da715c72db11
2019-12-04Merge Android10 QPR1 into AOSP master am: c6765102dbXin Li
am: 51712cc0fd Change-Id: I0dbc34c1fd61a741a9b3f924cb1d7676c432306e
2019-12-03Merge Android10 QPR1 into AOSP masterXin Li
am: c6765102db Change-Id: I7a7cae47babf70eac6c5d4a82680edd09726f208
2019-12-02Merge Android10 QPR1 into AOSP masterXin Li
Bug: 145570283 Change-Id: Ic6c3e445a8a29e859af5cf898aa32e1c48cf9b7a
2019-11-26[Telephony mainline] Move all METHOD_* constants from SystemContract to ↵zoey chen
BlockedNumberContract Bug: 143860012 Test: make Change-Id: I5c4380f9343fa50f469dc59a54900bbdc6ea3693 Merged-In: I5c4380f9343fa50f469dc59a54900bbdc6ea3693
2019-11-18[Telephony mainline] Move all METHOD_* constants from SystemContract to ↵zoey chen
BlockedNumberContract Bug: 143860012 Test: make Change-Id: I5c4380f9343fa50f469dc59a54900bbdc6ea3693
2019-10-31[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0301f2eba3 am: bc8ad18f18 -s ours am skip reason: subject contains skip directive Change-Id: Ibed559afb18aacdd048d8391dd6963af7c40354d
2019-10-31DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 0301f2eba3 Change-Id: I6a629a003b818a7bdcfd0db4374676a2c07aba5c
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵temp_b_145570283Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I1e3afb53db6e3bffc5eedcf763e1491ded49d475
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 13ca467371 -s ↵Xin Li
ours am: cc13534a4e -s ours am: 970834024b -s ours am: a1efbe6749 -s ours am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history Change-Id: I394a678c56a56f33631ce4a9c18daac8b3c460f0
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 13ca467371 -s ↵Xin Li
ours am: cc13534a4e -s ours am: 970834024b -s ours am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history Change-Id: I56cc413ea4f6f0fbfffc5c0f82a581c8ebaa378e
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 13ca467371 -s oursXin Li
am: cc13534a4e -s ours am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history Change-Id: I44b59fe690627b8d80eb8fb25cb54d58eb343bff
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: 13ca467371 -s ours am skip reason: change_id I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca with SHA1 81c0c27570 is in history Change-Id: Id765cbfcfeb7e5e5edf55f185cb351db20813068
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: I2cf3da51c55dc63caeb304d7ff70b34a932897ae Merged-In: I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca
2019-10-23Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: ↵Xin Li
dab68bb62c am: 42a983b378 am: 88aaba3e15 Change-Id: I9d2c8f42ff428ff3b3cf0f973b4ad3c30a42c06c
2019-10-23Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: ↵Xin Li
dab68bb62c am: 42a983b378 Change-Id: Icdf3186c17b40ccac88c805e0b6c7db688983ac3
2019-10-23Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-masterXin Li
am: dab68bb62c Change-Id: Ic662818361a0608ce4a4c3710aeed6b4d680c272
2019-10-23Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-masterb_141248619TreeHugger Robot
2019-10-17Implemented piiHandle to avoid importing it from Telecomm package. am: ↵Grace Jia
0edf1e3bc0 am: 81c0c27570 am: 28d36664b8 am: 03ebff76fd Change-Id: I1630ab753eeae1c4c482e8b73c850544a36c104b
2019-10-17Implemented piiHandle to avoid importing it from Telecomm package. am: ↵Grace Jia
0edf1e3bc0 am: 81c0c27570 am: 28d36664b8 Change-Id: I8a80c29e6e2d25a97bc8a83f6f4d37c69a25fa57
2019-10-17Implemented piiHandle to avoid importing it from Telecomm package. am: ↵Grace Jia
0edf1e3bc0 am: 81c0c27570 Change-Id: I91d38f61342deff1c9c4a823faf77e15aae48b50
2019-10-17Implemented piiHandle to avoid importing it from Telecomm package.Grace Jia
am: 0edf1e3bc0 Change-Id: I94e8a8cdab3c666e8c741dd03db5e6ffd477a4ca
2019-10-17Implemented piiHandle to avoid importing it from Telecomm package.Grace Jia
Test: atest com.android.providers.blockednumber.BlockedNumberProviderTest Bug: 140579775 Change-Id: I934f2ddb5e5db4f979c9a14a0a8635e927ee5b8f
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: I607575735c371d6b475a1afc84afc69753486eb9
2019-10-14Added implementation of getOpPackageName in the mock context class to fix ↵Grace Jia
text failure. am: a33855584d am: aa99f958c1 am: 484603d549 am: 9f95567926 Change-Id: I44eeb77a0f3d8f729cf608cf1dd20926eed4968d
2019-10-14Added implementation of getOpPackageName in the mock context class to fix ↵Grace Jia
text failure. am: a33855584d am: aa99f958c1 am: 484603d549 Change-Id: I057a0e9b96f1c4ea3a3884ad5678d549972fb425
2019-10-14Added implementation of getOpPackageName in the mock context class to fix ↵Grace Jia
text failure. am: a33855584d am: aa99f958c1 Change-Id: I3001207b8037869326c7a2975157d1a7a75bd32c
2019-10-14Added implementation of getOpPackageName in the mock context class to fix ↵Grace Jia
text failure. am: a33855584d Change-Id: I785af341f7443cfc72eb939c0d99033973b1ab75
2019-10-04Added implementation of getOpPackageName in the mock context class toGrace Jia
fix text failure. Test: com.android.providers.blockednumber.BlockedNumberProvider Change-Id: I6148490092d0aedd966d21e5ce5b02b44db87d06
2019-09-25[automerger skipped] Import translations. DO NOT MERGE am: 820137653b -s ↵Bill Yi
ours am: 1091821c66 -s ours am: 3e4fd6ae9f -s ours am skip reason: subject contains skip directive Change-Id: Ide090eeae27a9ae513a17ab390d482b5ac3d95e5
2019-09-25[automerger skipped] Import translations. DO NOT MERGE am: 820137653b -s oursBill Yi
am: 1091821c66 -s ours am skip reason: subject contains skip directive Change-Id: I929e0a2363ff261c59a4576dd3cf9641d7d7cf50
2019-09-25[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 820137653b -s ours am skip reason: subject contains skip directive Change-Id: I67524d4e8046ef740f56978d85895f835631c810
2019-09-24Import translations. DO NOT MERGEBill Yi
Change-Id: I6a040d0692114900701dd8ee7dce69bab8bf3314 Auto-generated-cl: translation import
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 53cad795c9 -s ours am: 428b467663 -s ours am: ac0c26af76 -s ours am skip reason: change_id Idc05da05ba506ef82c18bde571bc95171f0a7e2b with SHA1 38ed224625 is in history Change-Id: I774242df0f4d6ddc01077de5166060063eb743d5
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 53cad795c9 -s ours am: 428b467663 -s ours am skip reason: change_id Idc05da05ba506ef82c18bde571bc95171f0a7e2b with SHA1 38ed224625 is in history Change-Id: I7e09671f68e872a5ca923791bee33ce7aca61cb2
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 53cad795c9 -s ours am skip reason: change_id Idc05da05ba506ef82c18bde571bc95171f0a7e2b with SHA1 38ed224625 is in history Change-Id: Ia6b945a7bbc15579ae8ee9d656692235bbdba4be
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 08:49:37 +0000