summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0 am: ↵Cole Faust
16d4214d5a am: 98a7c610d3 am: e0955f3e30 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: Id0e01d6b124e0bca04c9d39ef877b7d29039e68a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0 am: ↵Cole Faust
16d4214d5a am: 98a7c610d3 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: Idf89e676c8878c2cd3284d3b4d4fdbdf054b09fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0 am: ↵Cole Faust
16d4214d5a Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: Ic82dc45ccc904a3fe85e9a8a672bd36df7da3ed6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7 am: 42c68e04d0Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: I094548480ea4109bd6efcdac2056ccee1e37ea51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-20Fix array-related errorprone warnings am: a1dfd835f7Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2189018 Change-Id: I91863518743bbb8b37c9158195dd977f61b0a542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17Fix array-related errorprone warningsCole Faust
The ArrayEquals, ArrayHashCode, ArrayToString, and ArraysAsListPrimitiveArray errorprone findings were demoted from errors to warnings. Fix existing occurrences of them so they can be made errors again. Bug: 242630963 Test: RUN_ERROR_PRONE=true m javac-check Change-Id: I6ab1698ebe1150d8a8a226f3982556431216eab2
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s ours ↵Xin Li
am: b73b360e57 -s ours am: de8728dd6f -s ours am: 491d647d08 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: I53ce1a6a01867a2585afee00c402800f9f8a1123 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s ours ↵Xin Li
am: b73b360e57 -s ours am: de8728dd6f -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: I73780a395a02a1ff177816618684560fbe7794f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s ours ↵Xin Li
am: b73b360e57 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: Ic241a0b89c1cd93982fbf0fd2528482252b88da4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8fd53febf2 -s oursXin Li
am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/2185752 Change-Id: I1e47c2be4aabc0cbf307ff496cfce5c2ee0e18b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I646675a4b0454c6c3038f4cc70b380072e063e7c Change-Id: I1b08ccb1fd30553b440a7b1eac8dbddfebcebdee
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am: f7a52142ae -s ours am: 25b7eda5d8 -s ours am: 76bc9a5986 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: I36e6e147dfd36dfbab7faee60b95798c42a5772a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am: f7a52142ae -s ours am: 25b7eda5d8 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: Ibe2bf3bb0dac81e7913bf797cf85545684cb0c1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am: f7a52142ae -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: Ia36960bd6a091edc025145241e021c62f9933654 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fa2df57533 -s ours am skip reason: Merged-In I646675a4b0454c6c3038f4cc70b380072e063e7c with SHA-1 b46dd4a10c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/19094242 Change-Id: I8d8f1b3bf831aa0fb01fc03f48af7041a07ed2aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: I646675a4b0454c6c3038f4cc70b380072e063e7c Change-Id: Ia286a184e79b0a64dd0e23a2acf2c48cd291f44d
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: c691540b78 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I95bc11da6f4c1d7b369a48803e38c78406c49c70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: e8d9b0f7f1 am: 21c2147254 am: 9882518c60 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I7958c1316dd840f9b62ec5cf8c9b618787bc0df4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 5556257a43 am: b481cbe4d8 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I5c1b91f4a710c62fdea9af8d090dbe7a81ee29bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 25bd3b2ba7 am: 01de594b26 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I5f41f89218d05f7dcd0496c21ceda40e778291d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: e8d9b0f7f1 am: 21c2147254 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: Iecdf11f5b57039e5507bad9aaa8fdf09f37f0619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 5556257a43 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I934a9df7b650643a6a019393272faa6bd4d12c17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: e8d9b0f7f1 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I460203254d553e9fbedfe6859abd90980d7a7568 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 am: 25bd3b2ba7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: Ib41449024bc53321abb3e698caa3c7872ce56f03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I3efabd072539fae5b8177215571c8dc9275b5007 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c am: 527fe62a65 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I42fbed575d4df1153dfb757b0a023deaceefb83e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I67b07c5fb2d8dfc18d9c54c3cfd573ed262c3fc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I010bf0e923ccd83c67775f2dfb1e126f5d3949ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010joonhunshin
the EAB provisioned. am: b46dd4a10c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/17897257 Change-Id: I2df3d6542361e6a4741fbc1176ca5fbb98751902 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devjoonhunshin
the EAB provisioned. Replace the KEY_CARRIER_VOLTE_PROVISIONED_BOOL with bundle/tech to check if the EAB provisioned. Bug: 229793066 Test: atest ImsService Change-Id: I646675a4b0454c6c3038f4cc70b380072e063e7c
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am: f3167a3421 -s ours am: 670521dcdb -s ours am: 5b37f3e3c0 -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I999b9c2caa0556eb2ab0703a8376d147d3af33b7
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am: f3167a3421 -s ours am: 670521dcdb -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I1fda8534696dc860031d4fd9a19367c51cfc84d3
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: f3167a3421 -s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I0ab17e95ee081fd19ad768637fcfcef74dab88c3
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s ours am: 10e2ec4377 ↵Xin Li
-s ours am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: I68e2f069aa8794e421f2b7ed66370109132e5b45
2021-10-08[automerger skipped] Merge Android 12 am: f369d20de1 -s oursXin Li
am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255 Change-Id: Iad2a226a1ad84334a11815a171e369d6851cb795
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I623d78b62308dec895c0fa15f38fedfc47d7013a Change-Id: Iff32646cedebed894b886dc486b27b5df8e0a3ee
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am: c99ffa3510 -s ours am: c0f0a4266b -s ours am: cdcae2de6d -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Ifa6ae13051107ac22ef7a01a6a7ba016d7403edd
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am: c99ffa3510 -s ours am: c0f0a4266b -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Ie81a4fcb634a9b2f7696c6bcaa782f156414147e
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am: c99ffa3510 -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Iaa13809a620ca349b77540a6075cdd66beb4279d
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
7d30431d06 -s ours am skip reason: Merged-In Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 with SHA-1 39584c847c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ims/+/15571843 Change-Id: Ia21f3bae731f260b4a98c27d15c400fe94a41bbf
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694 Change-Id: I623d78b62308dec895c0fa15f38fedfc47d7013a
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 221e35e17a am: ↵Xin Li
1a27e801ad am: 39584c847c -s ours am: 22e4071177 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: I5c6ef359b451dac5e79082f69a9e130fa68adf79
2021-06-14[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 221e35e17a am: ↵Xin Li
1a27e801ad am: 39584c847c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: I3a21dc7bbc7b3e8ce2ee87c711d08f75912e3a1f
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 221e35e17a am: 1a27e801adXin Li
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: Ia4a67fa56ba34af9c212c8986e4d76b1ebeb9694
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 221e35e17aandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1735797 Change-Id: I42e700d337869c55e5bd79f0b7e00b6641f0f302
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Change-Id: Id5c8ec8946d7bcb311a9acd94eebf1a08b993fd4
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I1b38292186ea97f53f316f2bd0b6b590b4985d5c
2021-05-30[RCS]Add protected broadcast, DEVICE_STORAGE_FULLallenwtsu
Bug: 156113993 Test: by manual Change-Id: I47b71d35a2247dc7c75cecaf2669255875892753
2021-05-19[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am: 65b06c255a -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I04f52d62fc802112d09ec9cb162d0a6bd0969a42
2021-05-18[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() ↵Treehugger Robot
instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s ours am: cf57f5df73 -s ours am: 4ed44fc701 -s ours am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740 Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032 Change-Id: I9fdd28cafb22e104c197039999993c7ae1f57131
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 21:56:15 +0000