summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Ia46c819a94ed448d0152b12a08a08275ca99e20d Change-Id: I95d9e8fb61345c48761ac703e48c0ff9edb9716a
2024-03-04Migrate Test Targets to New Android Ownership Model am: 6ada0e952dtemp_319669529Aditya Choudhary
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2946237 Change-Id: Ia46c819a94ed448d0152b12a08a08275ca99e20d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I6a0867e6ae15426adfb43189747eed973bd4215c
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I45b6e73d80dff6ecb38f31d488b80c36fb83db53 Change-Id: I38741006c5cc25e8b9633c1d2545219cb891e9c6
2023-10-31Merge "TvProvider API standardization for DVB TvProvider" into mainDavid Zhao
2023-10-30TvProvider API standardization for DVB TvProviderJunichiro
Add columns to db tables for DVB. Bug: 222402395 Test: CTS (cherry picked from https://android-review.googlesource.com/q/commit:e1f20a750154b6b77b1e9e5bec722d282729ce5d) Merged-In: I45b6e73d80dff6ecb38f31d488b80c36fb83db53 Change-Id: I45b6e73d80dff6ecb38f31d488b80c36fb83db53
2023-10-07[automerger skipped] Merge Android 14 am: 5dc2b7a4d5 -s ours am: 0711ef0497 ↵Xin Li
-s ours am: 0342ce41b2 -s ours am: 07278f1102 -s ours am: af3bd06db9 -s ours am skip reason: Merged-In Icd5029efa04e1239704cc2a81c43a1485f256f04 with SHA-1 a371c105f6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2775034 Change-Id: I7f240050810b35b4f00d872c19535b2ba235c3b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5dc2b7a4d5 -s ours am: 0711ef0497 ↵Xin Li
-s ours am: 0342ce41b2 -s ours am: 07278f1102 -s ours am skip reason: Merged-In Icd5029efa04e1239704cc2a81c43a1485f256f04 with SHA-1 a371c105f6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2775034 Change-Id: I0722af7fc7eb8c37023d4d530ef2fa599e0ad27b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5dc2b7a4d5 -s ours am: 0711ef0497 ↵Xin Li
-s ours am: 0342ce41b2 -s ours am skip reason: Merged-In Icd5029efa04e1239704cc2a81c43a1485f256f04 with SHA-1 a371c105f6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2775034 Change-Id: Ie298ebe82fc1a3f127c00199ec044163e54f151f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5dc2b7a4d5 -s ours am: 0711ef0497 ↵Xin Li
-s ours am skip reason: Merged-In Icd5029efa04e1239704cc2a81c43a1485f256f04 with SHA-1 a371c105f6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2775034 Change-Id: I52a6f7fbab1880fa1e5945a35da1b42b8e0019f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 5dc2b7a4d5 -s oursXin Li
am skip reason: Merged-In Icd5029efa04e1239704cc2a81c43a1485f256f04 with SHA-1 a371c105f6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2775034 Change-Id: Iec3352507d68017632bebe9ee6f0aa5885dda562 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Icd5029efa04e1239704cc2a81c43a1485f256f04 Change-Id: I60d9e7966b876ea2fd62388ca241814264fd238f
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: db616a661a -s ours ↵Xin Li
am: a5e0ae1307 -s ours am: 1984c4a778 -s ours am: 595b4ee2b5 -s ours am skip reason: Merged-In I05262c2aea17de84e1265a829c5265af8e1fbbbe with SHA-1 8f6e8914eb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/24182840 Change-Id: I9b50c325284cfe64447788a227928bb3a3591497 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: db616a661a -s ours ↵Xin Li
am: a5e0ae1307 -s ours am: 1984c4a778 -s ours am skip reason: Merged-In I05262c2aea17de84e1265a829c5265af8e1fbbbe with SHA-1 8f6e8914eb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/24182840 Change-Id: Iaa99c07815cb5abd68359c40d8705603ec154e24 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: db616a661a -s ours ↵Xin Li
am: a5e0ae1307 -s ours am skip reason: Merged-In I05262c2aea17de84e1265a829c5265af8e1fbbbe with SHA-1 8f6e8914eb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/24182840 Change-Id: Ifb9bc2ceb1ed21b8afd4229b321ccdcece4052db 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: db616a661a -s oursXin Li
am skip reason: Merged-In I05262c2aea17de84e1265a829c5265af8e1fbbbe with SHA-1 8f6e8914eb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/24182840 Change-Id: I619f4295a8e96038c6f73cc1bc71bfbe323a0ca9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I05262c2aea17de84e1265a829c5265af8e1fbbbe Change-Id: I4df529094ef4fce8185f6574a3c9ed870bcff80b
2023-07-19Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: ↵Henry Fang
5ffa88ac6f am: 3afae03f80 am: b14765a250 am: 7c826a7d3a Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677 Change-Id: Iaf5fdea598418670cbd1bb3b53d73bf05f0ad0a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: ↵Henry Fang
5ffa88ac6f am: 3afae03f80 am: b14765a250 Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677 Change-Id: I13146a51488516f552f4e5fd169ed6d505267992 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: ↵Henry Fang
5ffa88ac6f am: 3afae03f80 Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677 Change-Id: Ibd32ebf483795c7d42b35f3b6146267e90716856 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: ↵Henry Fang
5ffa88ac6f Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677 Change-Id: I073d072396078f4d7b1c3577c3367c7ae4c3a0da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616Henry Fang
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677 Change-Id: I2b09c75f7b0b5f2eea0ee7992f751be0dcabc713 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "TvProvider: Reduce synchronized block" into mainHenry Fang
2023-07-18TvProvider: Reduce synchronized blockSham Rathod
Remove synchronized from ensureOldTransientRowsDeleted method and make smaller critical section synchronized to reduce chances of ANR. Test: atest com.android.providers.tv.TransientRowHelperTests Bug: 259445912 Change-Id: Icd5029efa04e1239704cc2a81c43a1485f256f04
2023-07-12Tvprovider: Change sync mode of tv.db database am: 9d59ea811c am: 3fe4d1854e ↵Sham Rathod
am: a244eb2c7c am: 786f8e93af am: 8f65ed8b01 am: 56651135da Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2653362 Change-Id: If71f264804743fc684042ba3d2202b5f79c40283 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Tvprovider: Change sync mode of tv.db database am: 9d59ea811c am: 3fe4d1854e ↵Sham Rathod
am: a244eb2c7c am: 786f8e93af am: 8f65ed8b01 Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2653362 Change-Id: I513dfefa68aa06e72c3fd7061c5d04b060677607 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Tvprovider: Change sync mode of tv.db database am: 9d59ea811c am: 3fe4d1854e ↵Sham Rathod
am: a244eb2c7c am: 786f8e93af Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2653362 Change-Id: Ie1a8eb7d3b8adbdc4e40c3f081f4b7a42ae6515d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Tvprovider: Change sync mode of tv.db database am: 9d59ea811c am: 3fe4d1854e ↵Sham Rathod
am: a244eb2c7c Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2653362 Change-Id: I3ec5510a5de0c82ee346672edbbfbbccd1ce9124 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Tvprovider: Change sync mode of tv.db database am: 9d59ea811c am: 3fe4d1854eSham Rathod
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2653362 Change-Id: Ic568897e3d7c653f750158841a49855b4bae3504 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Tvprovider: Change sync mode of tv.db database am: 9d59ea811cSham Rathod
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2653362 Change-Id: Ib1a4d9c3e72346511bc75b9a5c4b4c2ac0b2c3c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Tvprovider: Change sync mode of tv.db databaseSham Rathod
When tv.db database is configured with journal_mode=WAL and synchronous=FULL, channels remain intact in database after a channel scan is immediately followed by a power failure. Test: manual Bug: 283390240 Change-Id: Ibb042ff6bd5ecb08500081a492dccbbb4743b3ee
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c6754b0795 -s ours am: 4561920254 -s ours am: 5470a1ceef -s ours am: 8f6e8914eb -s ours am: 89102006f0 -s ours am: 81fe4a1347 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2614770 Change-Id: I6b5a2ebc57cc0bd59a753a21398255746d95342f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c6754b0795 -s ours am: 4561920254 -s ours am: 5470a1ceef -s ours am: 8f6e8914eb -s ours am: 89102006f0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2614770 Change-Id: Ie1f28c421075a0dbc6d853f956cfb920053ba4fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c6754b0795 -s ours am: 4561920254 -s ours am: 5470a1ceef -s ours am: 8f6e8914eb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2614770 Change-Id: I3ac37e603bff5cd55b61297bb20403bb0b260328 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c6754b0795 -s ours am: 4561920254 -s ours am: 5470a1ceef -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2614770 Change-Id: I05262c2aea17de84e1265a829c5265af8e1fbbbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c6754b0795 -s ours am: 4561920254 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2614770 Change-Id: If14d867e3016d193a13e4237019669d5a7bf3df4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c6754b0795 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2614770 Change-Id: Ic46442181ae254052f8b8edb53f9c9edba8892a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I743a5f05c89be4828e12cbb4fa1383496bea0bc1
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
498c8bd9d0 -s ours am: 8966a7362e -s ours am: 7471c51c12 -s ours am: b212d2a69e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22798632 Change-Id: Idd1691a190ac36d0e15f577225730a0a0c5e00f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
498c8bd9d0 -s ours am: 8966a7362e -s ours am: 7471c51c12 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22798632 Change-Id: I7f2cb28c09692380176fa39b06d87dab67bdfffe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
498c8bd9d0 -s ours am: 8966a7362e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22798632 Change-Id: I7319d4d9d4685aeb044dfc91eea0fa3810496113 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
498c8bd9d0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22798632 Change-Id: I8618f91b3852d97b158fd4a32f25968d4d2154a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3dee07098b19c35a1e0d91f021d1a8232c8aff6d
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: b608d6c4f4 -s ours am: 4822cb43cd -s ours am: 1a599ba343 -s ours am: 9dff676313 -s ours am skip reason: Merged-In I7b48e192984e9c8a101e208d83e6c84190eceb7a with SHA-1 3876ffe9e9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22725307 Change-Id: Id909b9f8971e289b5dd92ab881a4b959e520f805 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: b608d6c4f4 -s ours am: 4822cb43cd -s ours am: 1a599ba343 -s ours am skip reason: Merged-In I7b48e192984e9c8a101e208d83e6c84190eceb7a with SHA-1 3876ffe9e9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22725307 Change-Id: I3e80b3261c5ddc7afefc2914a08b2df410d53400 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: b608d6c4f4 -s ours am: 4822cb43cd -s ours am skip reason: Merged-In I7b48e192984e9c8a101e208d83e6c84190eceb7a with SHA-1 3876ffe9e9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22725307 Change-Id: Ibc83da3026b7e9f62e83390dabccb140c780754b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: b608d6c4f4 -s ours am skip reason: Merged-In I7b48e192984e9c8a101e208d83e6c84190eceb7a with SHA-1 3876ffe9e9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22725307 Change-Id: I014de12aab5340caba76025ea68e7026016d89bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994Xin Li
Bug: 275386652 Merged-In: I7b48e192984e9c8a101e208d83e6c84190eceb7a Change-Id: I39e36c0391f132fbe69d27672dbb64ed4252cb46
2023-04-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I15bda8e6ba734b189c1a04f21cbb47e1d3e03ef8
2023-04-04[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
udc-d1-dev am: 43c88ee627 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/22427752 Change-Id: Ieae517872c05adfc62211ed1b16740f2a22b19bb 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-01 20:12:48 +0000