summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-12Snap for 11566117 from 7b47743dbace92ff42a24286e0d122978f2f4c46 to sdk-releaseplatform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
Change-Id: I47c1c8bc1b33716e26e0f0811d5ca0c470be6b82
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Iaaf63736f57b86d71544a2af3ac1770a9902685a Change-Id: Ibf39148629a61dd64fda44ccee4afab9784e477e
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: Ifa5fd5061ee48de2153d22eec43f3df71d589b6f Change-Id: Iaaf63736f57b86d71544a2af3ac1770a9902685a
2023-12-13Snap for 11211409 from cf1f78921febe3dfe5224ea643b497bb8edc07a4 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ic43d6124d8f2c689f158b93a60aaab737ed2dc16
2023-12-06Wrap subManager creation with createForAllProfilesLing Ma
Since U, a sub can be associated to a particular profile, and thus in V we enforce filtering on caller and only show the subs that are associated with the caller. However, in some cases the caller indeed needs to see all subs regardless its association, e.g. sysUI. Therefore, a param isForAllProfile is added to indicate whether the caller intends to see all subs. Bug: 296076674 Test: voice call + data browsing Flag: ACONFIG com.android.internal.telephony.flags.work_profile_api_split DEVELOPMENT Change-Id: Ifa5fd5061ee48de2153d22eec43f3df71d589b6f
2023-10-10Snap for 10929834 from 559388747f6d0e29ba86df3361ee7ef57732b794 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I87b6903c1bde4f15a0ea4fdb3e94083140814367
2023-10-07[automerger skipped] Merge Android 14 am: 559388747f -s ours am: 385a5eb98b ↵Xin Li
-s ours am: 0f65197c2c -s ours am: c6cad55637 -s ours am: cf1f78921f -s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2775055 Change-Id: Id9deaf71ebb790e9c99e147ff076a300328b677a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 559388747f -s ours am: 385a5eb98b ↵android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplXin Li
-s ours am: 0f65197c2c -s ours am: c6cad55637 -s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2775055 Change-Id: I233140192f3bdd403be9e80c0fab7930fd1a716e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 559388747f -s ours am: 385a5eb98b ↵Xin Li
-s ours am: 0f65197c2c -s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2775055 Change-Id: I5c81922df7327cc376a2f8518f0125e0ea9d6734 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 559388747f -s ours am: 385a5eb98b ↵Xin Li
-s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2775055 Change-Id: Iceba0b4ac70144cdba19210676bebef39f6f54b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 559388747f -s oursXin Li
am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2775055 Change-Id: If5eddfdb17ad1dfacf8645d81a6713ddfcab39f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14android-u-rb-dp-10-gplandroid-u-rb-dp-10-gplXin Li
Bug: 298295554 Merged-In: I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef Change-Id: I9ae3caa5c08aaaae0373cbb6af0e99aad2ecf3d6
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 68f5b66f7c -s ours ↵Xin Li
am: f451128ff6 -s ours am: 99d7f562bb -s ours am: d906839547 -s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/24182210 Change-Id: I3f523f474a4561b0066c87017f01b4281bc8b630 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 68f5b66f7c -s ours ↵Xin Li
am: f451128ff6 -s ours am: 99d7f562bb -s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/24182210 Change-Id: Id8249873370a738640b58e8d8389ebee9220ec87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 68f5b66f7c -s ours ↵Xin Li
am: f451128ff6 -s ours am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/24182210 Change-Id: Idb7d755f6686e68418190660d523c458261221a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 68f5b66f7c -s oursXin Li
am skip reason: Merged-In I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef with SHA-1 f15d9cb621 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/24182210 Change-Id: I31014c90b55f18e243e3a5b1565bc90ae7c9b46e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef Change-Id: I1957a124962876fb3c2ca5e1ebd32cbb0be7d44c
2023-06-28Snap for 10399941 from 59aee4c39083ef97c7e1890d6e3d503d7021872b to sdk-releaseplatform-tools-34.0.5platform-tools-34.0.4Android Build Coastguard Worker
Change-Id: Ib011e889ed4190355b91e0dfd9df00029a9869f1
2023-04-21Merge "[RCS] log: set DBG to false" into udc-dev am: 7c52ba6ed2 am: 7a535e61b1Sean.JS Tsai
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/22754876 Change-Id: I270bde1818983fcf3a653ca769f4365bde24b6bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Merge "[RCS] log: set DBG to false" into udc-dev am: 7c52ba6ed2 am: be77e8427eSean.JS Tsai
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/22754876 Change-Id: I3e5b1ad90b4811733605fccec5649439e7c2c96b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Merge "[RCS] log: set DBG to false" into udc-dev am: 7c52ba6ed2android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseSean.JS Tsai
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/22754876 Change-Id: I3b61fe87ee25ea6ff5c460f51132fd49a69ce112 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Merge "[RCS] log: set DBG to false" into udc-dev am: 7c52ba6ed2Sean.JS Tsai
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/22754876 Change-Id: I7a54ddd23d32d3b625efb5d6fb775a99dc4e5738 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Merge "[RCS] log: set DBG to false" into udc-devandroid14-devSean.JS Tsai
2023-04-20Snap for 9979206 from 257d7ed569ae0d445d9501f0f84ea5eaecc4740d to sdk-releaseplatform-tools-34.0.3Android Build Coastguard Worker
Change-Id: Iac2d04322cb577e83a1cf11f3658c7d0d2ed0486
2023-04-20[RCS] log: set DBG to falseMyung-jong Kim
[Problem] PII such as contact number is logged in plaintext [Cause] n/a [Solution] Set DBG to false to avoid logging bug: 276969788 Change-Id: I1ea07935fd06a71a972a9e8a7ab22faaf39c66ef Signed-off-by: Myung-jong Kim <mj610.kim@samsung.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569 am: ↵Jahin Imtiaz
0e150d0fab am: 59aee4c390 am: 25e0c1cca0 am: a92fea5567 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: I205579982a620c95117218135eac0e0a4ad02667 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569 am: ↵Jahin Imtiaz
0e150d0fab am: 59aee4c390 am: 25e0c1cca0 am: ca5f8e84ad Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: I51ce3d2e2010dda7afaab95f95dcd6ff4cf475dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569 am: ↵Jahin Imtiaz
0e150d0fab am: 59aee4c390 am: 25e0c1cca0 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: I92a53ca418c88f8aa46cf6c3959e5c61d5440ffe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569 am: ↵Jahin Imtiaz
0e150d0fab am: 59aee4c390 am: 25e0c1cca0 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: Iabc1df807297dea6b37c9ea52cc0574dd24681ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569 am: ↵Jahin Imtiaz
0e150d0fab am: 59aee4c390 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: I8b45117637993d1e11c2a141e8e08938d2f6b8b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569 am: 0e150d0fabandroid-u-beta-4-gplJahin Imtiaz
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: I931fa9256a1ab936a2df12789d171a482089d706 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`" am: 257d7ed569Jahin Imtiaz
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2486197 Change-Id: Ifd5119861b4f7f71d75a85f69c970d68a71eb00e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Include module dependencies under `data`"android-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplJahin Imtiaz
2023-03-13Include module dependencies under `data`jahinimtiaz
Bug: 269138674 Test: Presubmit Change-Id: I935f988285ff6e0c4dbdef755d73cd769d7d454f
2023-02-01Snap for 9550355 from 4f494cce652f479dd87d224d10f27ff47188ff34 to sdk-releaseplatform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4Android Build Coastguard Worker
Change-Id: I6bd755d196fc96615f7a76e229a3ee1fa10d11e9
2022-12-12Merge "[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 918fa40aad -s ours am: dd65cc5b09 -s ours am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I8891423886830d3c8c878655f595835d680d3fa9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours am: ↵Xin Li
97952b7315 -s ours am: 6a033f69e2 -s ours am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I354426810d777d07a5442c116f2eed0c53fdfc19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours am: ↵Xin Li
2a8e83a78f -s ours am: 77dbeecc22 -s ours am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I8611399ceb1019ef83711a11a7193facaaf236aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 918fa40aad -s ours am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I0fdc31683537211bccd72ac47fdb80525709d7bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours am: ↵Xin Li
97952b7315 -s ours am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: Icc9f615f28585608bdc672a200bf135c803dfd2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours am: ↵Xin Li
2a8e83a78f -s ours am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I4a7b2d3a3a4abc4db99f5cd434ac8af2b0b99d30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s ours" ↵Automerger Merge Worker
into stage-aosp-master
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s oursXin Li
am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: I0b800a17aa8c138de2d8833b0b40c9fbb7760bf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 4f494cce65 -s oursXin Li
am skip reason: Merged-In Ia3faefdefc558f005de72bc59260eccbc121674e with SHA-1 dcc6d81c40 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2338302 Change-Id: If7f9eb6b3e53836cebd567b8f095b6701e3692c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge Android 13 QPR1main-16k-with-phonesXin Li
Bug: 261731544 Merged-In: Ia3faefdefc558f005de72bc59260eccbc121674e Change-Id: Ib0153d5153898def51cd5d2cbae1929de907780d
2022-10-25Fix errorprone warnings that should be errors am: dcc6d81c40 am: 94d4e62f29 ↵Cole Faust
am: 1d0c88da32 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374 Change-Id: I5c4933379c179c17b4cb67912ba9b5cf0617a05b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25Fix errorprone warnings that should be errors am: dcc6d81c40 am: 94d4e62f29Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374 Change-Id: I6aa0e9266d64304c672f3183d7a49069bdb50d9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25Fix errorprone warnings that should be errors am: dcc6d81c40Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2255374 Change-Id: I240e573b3a36fe7c0b026bb24f63bf4f3d6bb15a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-15Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: Ia3faefdefc558f005de72bc59260eccbc121674e
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
4694b3ee91 -s ours am: 292bac4a1f -s ours am skip reason: Merged-In I6ab1698ebe1150d8a8a226f3982556431216eab2 with SHA-1 a1dfd835f7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/20136833 Change-Id: I0bff7394c9a95d0b08d53e4b4a45c3c4392aef58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 14:58:57 +0000