summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-28Snap for 6439596 from 1126d505a0858c448bc4913660123cfa7d4884a3 to ↵q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-releaseandroid-build-team Robot
qt-aml-tzdata-release Change-Id: I3c739e80ee3a10f59d0053936949665cc66c7779
2019-11-11Snap for 6001391 from bc8ad18f182d1b6b0051b0d10ca5d86b419b4eb6 to ↵android-build-team Robot
qt-aml-tzdata-release Change-Id: I8ea8bd9e622562679e88a3515068933b00da17e5
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 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 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 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 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 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-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
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I75b2c24d0dd0e9478727351f4fd0f0be898e815e Merged-In: Idc05da05ba506ef82c18bde571bc95171f0a7e2b
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
38ed224625 -s ours am: fcc92b6fc1 am: 3c26bb0f1b Change-Id: Ie16a8b6a6e8107e8d06dff787594cf73a6235411
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
38ed224625 -s ours am: fcc92b6fc1 Change-Id: Ib275ab42c94c3399739f787930ee4d03581235a0
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 38ed224625 -s ours am skip reason: subject contains skip directive Change-Id: I98daf42082dad92a6ea0956e34102db4b7ca0803
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Idc05da05ba506ef82c18bde571bc95171f0a7e2b
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 9e40dec411 Change-Id: Id956ddcf9894f0b4305b680bba9d2d18f84e0b89
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I2433fa170774524516305ebb849fff7bd04b48e3
2019-06-22Snap for 5681502 from 1126d505a0858c448bc4913660123cfa7d4884a3 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 Robot
qt-c2f2-release Change-Id: I9ea8c5859816f012f7701db1615e5ce991696a17
2019-06-20[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 1126d505a0 -s ours am skip reason: subject contains skip directive Change-Id: Ief809b01ce573a7651e7a7c272db16986f039b69
2019-06-20Import translations. DO NOT MERGEandroid-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_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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ifc1f489d484727f157b288cb3e18f873116e468b
2019-05-29Snap for 5611873 from 9925679a3deb5cf82bea414ea453950e1e9248df to ↵android-build-team Robot
qt-c2f2-release Change-Id: I9aee7c886c5ef4845c7430eeac48b5e534abda4a
2019-05-28Merge "Merge "Allow all carriers to access BlockedNumberProvider." into ↵Android Build Merger (Role)
qt-dev am: eb10b149a1 am: 9925679a3d" into qt-r1-dev-plus-aosp
2019-05-28Merge "Allow all carriers to access BlockedNumberProvider." into qt-dev am: ↵Jeff Davidson
eb10b149a1 am: 9925679a3d Change-Id: I6d4e1758dff49de85f1e9f9bb7dd1397b87cbd01
2019-05-28Merge "Allow all carriers to access BlockedNumberProvider." into qt-dev am: ↵Jeff Davidson
eb10b149a1 am: 285bb7c401 Change-Id: Ia04e3331d9190e6d18a58ffcd04629cc3ca5969b
2019-05-28Merge "Allow all carriers to access BlockedNumberProvider." into qt-devJeff Davidson
am: eb10b149a1 Change-Id: Ib8d76572251d45254d1af88b7456a71e03a98302
2019-05-28Merge "Allow all carriers to access BlockedNumberProvider." into qt-devJeff Davidson
am: eb10b149a1 Change-Id: Iba2b7aa45628d0ef3f0f1e4adc7bf1b703614f45
2019-05-28Merge "Allow all carriers to access BlockedNumberProvider." into qt-devandroid10-devTreeHugger Robot
2019-05-25Snap for 5606075 from 7c32992183d31c1f270ff5fe79943d277431d9f3 to ↵android-build-team Robot
qt-c2f2-release Change-Id: I91736faf7e6161fb44a35192ad37e526af4f9800
2019-05-24[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s oursBill Yi
am: 8a8ead03b9 -s ours am skip reason: subject contains skip directive Change-Id: Ie9210be78fd031949eaede852d451ae9089a6cae
2019-05-24[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s oursBill Yi
am: 7c32992183 -s ours am skip reason: subject contains skip directive Change-Id: Ie6fd941dcae5a742701864bee75da27ad0dcda12
2019-05-24[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 7cf55f2a69 -s ours am skip reason: subject contains skip directive Change-Id: I001e73e19617c81ffc2056846a6de3c5384ad411
2019-05-24[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 7cf55f2a69 -s ours am skip reason: subject contains skip directive Change-Id: I10e7eed74bfeaa80eb04095af771598c546fb3bc
2019-05-24Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9b91b8fbdbda8236876937f59cd1f782e1daae6b
2019-05-23Allow all carriers to access BlockedNumberProvider.Jeff Davidson
The previous permission check only allowed carrier apps for the default subscription to access the provider. However, the provider is a singleton, with numbers blocked globally rather than on a per-subscription basis. Therefore, even non-default carrier apps should be able to access the database, as such carriers can still be in active use in DSDS mode. Fixes: 133232808 Test: TreeHugger to run unit test Change-Id: I68811f4032a452e0b3478bb5f4554f71fdc66067
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: b8a1f24bd5 -s ours am: 46e7524b34 -s ours am: a37be7b988 Change-Id: I9eb318a530fcf9e1beb5f50389a81e086dcfeced
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 05:54:15 +0000