Age | Commit message (Collapse) | Author |
|
Change-Id: I0ea34fc54cc0cf20a2e53d6e8e64b7584f127325
|
|
tm-dev
|
|
Change-Id: Ice162b6140661d72f22ec6bbbe93af6a7df28835
|
|
Change-Id: I45478ccfd447fab9f1f2920cc6cee5c43284d867
|
|
1c84272941 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18693452
Change-Id: Id7adbd0033a3f8ae8617f68e1f68e9f0e1f52e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Bug: 234337531
Test: CallLogProviderTest
Change-Id: I8f27f053ab10969617dd2850cb327548a0e2d467
|
|
Auto-generated-cl: translation import
Change-Id: I26e1c72a0f0efafe4f6a94ff9a6698f025d57adf
|
|
must match the one in atoms.proto.
This issue was initially introduced in T, so we need Dr.No approval to get this in T.
Bug: b/233950995
Change-Id: Ie9a12bc2539a7eac78c20f02b15302badfed77f1
|
|
Change-Id: I29a3f8b83da505902f658436b8bdefdc98a0e43c
|
|
Auto-generated-cl: translation import
Change-Id: I4de97c2678b675d3be2d0242b45e00a7e2f20c22
|
|
Change-Id: I5115e2ca094165e88e9ead5b7aba4632776df85d
|
|
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours am: 31fab7064e -s ours am: 87380915fb -s ours am: 56b8fe6829 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: I9e46a4614f051420081d405ad989ce6703954dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: a0cdcad982 -s ours am: 785309cde0 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751
Change-Id: I673462250019979bc3543dc912edcec086ef1120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
CallLogProvider query 2p: 13d7084790 am: 6612194f24 -s ours am: e560a9771b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752
Change-Id: I737683bbe9d3cbc55f57ab18b63cfecf20f36175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Change-Id: I7a4fb9dc81d5ea55b67a74202ae0107d38580105
|
|
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours am: 31fab7064e -s ours am: 87380915fb -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: Ib4c97fcb44477cec97fdc400eb912c444709811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: a0cdcad982 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751
Change-Id: I45e584fb6f94ef4e1924d9c65e374ad91cf9a6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours am: 31fab7064e -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: Iaf98b6e144ceda196a7acb7ab89a3eb67aad3224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751
Change-Id: Id632786ed02be2dc61f6848e5d0d11b0d3c9e4ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
CallLogProvider query 2p: 13d7084790 am: 6612194f24 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752
Change-Id: I11d0b4bde821bcd980baaa57cc2708cbe2a31b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: Ie802a55c92a485e848bbffdd8ad986462810c942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: 9fe9cc94dc -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751
Change-Id: Iff931c0d1e427aec81ef2c859c44bc99c4d1f858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752
Bug: 224771921
Change-Id: Ie07ece61f31d693c8fbe1f05b2f0e5fbec6915ba
|
|
am: bfaff79572 -s ours am: 01902a5ab6 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: Ia383fffa6eb455adf806882a4b57d63b2836d5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751
Change-Id: Ib3b71d302b34b73e4d9c55cb3ac15af69eb8a875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am: bfaff79572 -s ours
am skip reason: skipped by user tjstuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: I51e99f4152c1e68afca33ce44422803a5a6d63ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819
Change-Id: Ibe6541a38d25c41b5bd2360290b7bfb9d37c2bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours
am skip reason: Merged-In Ia445bb59581abb14e247aa8d9f0177e02307cf96 with SHA-1 571be94b55 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18321297
Change-Id: I1c0c13e5afaec2404da545aaaec59ba9b853a345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Change-Id: I1ea5fea436998d464a0d34150659fd73f9306fd6
|
|
changes:
- phoneNumber is now a selectionArgument
- if the user makes a query request for the CALLS_FILTER case,
throw a SE if the cursor is empty && SQL is detected
Bug: 224771921
Test: 2 manual,
manual 1: test app 1 can still make valid call filter query
manual 2: test app 2 with invalid query crashes b/c of SE
2 CTS tests,
test 1: ensures the existing functionality still works
test 2: ensures a SE is thrown on an invalid query for call filter
Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
Merged-In: Ia445bb59581abb14e247aa8d9f0177e02307cf96
|
|
changes:
- phoneNumber is now a selectionArgument
- if the user makes a query request for the CALLS_FILTER case,
throw a SE if the cursor is empty && SQL is detected
Bug: 224771921
Test: 2 manual,
manual 1: test app 1 can still make valid call filter query
manual 2: test app 2 with invalid query crashes b/c of SE
2 CTS tests,
test 1: ensures the existing functionality still works
test 2: ensures a SE is thrown on an invalid query for call filter
Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
Merged-In: Ia445bb59581abb14e247aa8d9f0177e02307cf96
|
|
changes:
- phoneNumber is now a selectionArgument
- if the user makes a query request for the CALLS_FILTER case,
throw a SE if the cursor is empty && SQL is detected
Bug: 224771921
Test: 2 manual,
manual 1: test app 1 can still make valid call filter query
manual 2: test app 2 with invalid query crashes b/c of SE
2 CTS tests,
test 1: ensures the existing functionality still works
test 2: ensures a SE is thrown on an invalid query for call filter
Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
Merged-In: Ia445bb59581abb14e247aa8d9f0177e02307cf96
|
|
changes:
- phoneNumber is now a selectionArgument
- if the user makes a query request for the CALLS_FILTER case,
throw a SE if the cursor is empty && SQL is detected
Bug: 224771921
Test: 2 manual,
manual 1: test app 1 can still make valid call filter query
manual 2: test app 2 with invalid query crashes b/c of SE
2 CTS tests,
test 1: ensures the existing functionality still works
test 2: ensures a SE is thrown on an invalid query for call filter
Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
|
|
changes:
- phoneNumber is now a selectionArgument
- if the user makes a query request for the CALLS_FILTER case,
throw a SE if the cursor is empty && SQL is detected
Bug: 224771921
Test: 2 manual,
manual 1: test app 1 can still make valid call filter query
manual 2: test app 2 with invalid query crashes b/c of SE
2 CTS tests,
test 1: ensures the existing functionality still works
test 2: ensures a SE is thrown on an invalid query for call filter
Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
|
|
Change-Id: I4720d7f892f83a1273baef00d47974c1a7ac1e28
|
|
operations outside of Call Composer Dir" into sc-v2-dev am: 888ef6f2b6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17949644
Change-Id: Ia3e9ad80f3e97c386793a8d9d9f7480d4c6f03dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
outside of Call Composer Dir am: 5fd7ebb59d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17949644
Change-Id: I128834157b99f03e93997a9cb6856405bc64a713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Composer Dir" into sc-v2-dev
|
|
operations outside of Call Composer Dir 2p: 74cf86e9b4 am: 56f84e89fc -s ours am: 1311f628df -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17921289
Change-Id: I7dc59c9144c369303cc82d73dbcd9d2742e35287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
operations outside of Call Composer Dir 2p: 74cf86e9b4 am: 56f84e89fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17921289
Change-Id: I5f04c7bded44693b4ef747dbd534ea67d3b20356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
tm-dev
* changes:
[automerged blank] DO NOT MERGE Add check that prevents file operations outside of Call Composer Dir 2p: 74cf86e9b4 2p: 5c7616e329
[automerge] DO NOT MERGE Add check that prevents file operations outside of Call Composer Dir 2p: 74cf86e9b4
DO NOT MERGE Add check that prevents file operations outside of Call Composer Dir
|
|
Change-Id: Ibb45b9e3bd80b84267e799dba8dd183f75b3b8bf
|
|
Change-Id: Iaa1febf36297d8ab6f72c6a80b5811d0d7b35044
Fixes: 229124902
Test: atest CallLogProviderTest
(cherry picked from commit 4214594346608061f4f5cb02ed2752b90a78d330)
|
|
Composer Dir
Cannot open, delete, sync, or insert files outside of the Call Composer
directory. New check prevents this.
bug: 219015884
Test: 3 UT,
1. CallLogProviderTest#testOpenFileOutsideOfScopeThrowsException
2. CallLogProviderTest#testDeleteFileOutsideOfScopeThrowsException
3. CallLogProviderTest#testInsertFileOutsideOfScopeThrowsException
Change-Id: I5a9dc98db446707373479fe1c2cb5fba44bdedf7
|
|
outside of Call Composer Dir 2p: 74cf86e9b4 2p: 5c7616e329
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17921289
Bug: 219015884
Change-Id: Idea67b86ed7c495daae802e05ff29afbd590d4cc
|
|
Call Composer Dir 2p: 74cf86e9b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17921289
Bug: 219015884
Change-Id: Ib764f3b511c19ddee64e46b98b82d5755fee63aa
|
|
Call Composer Dir 2p: 74cf86e9b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17921289
Bug: 219015884
Change-Id: Idbdacd984e021b7161480abbe679b10f12c73957
|
|
Composer Dir
Cannot open, delete, sync, or insert files outside of the Call Composer
directory. New check prevents this.
bug: 219015884
Test: 3 UT,
1. CallLogProviderTest#testOpenFileOutsideOfScopeThrowsException
2. CallLogProviderTest#testDeleteFileOutsideOfScopeThrowsException
3. CallLogProviderTest#testInsertFileOutsideOfScopeThrowsException
Change-Id: I5a9dc98db446707373479fe1c2cb5fba44bdedf7
|
|
Change-Id: Id32265eba89b83f3cf52747f5d5dbb30fd62c41d
|
|
into tm-dev
|