Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
896,109 Commits 3 Branches 0 Tags
a1103a2c3a5de44cf570bb31246d854dbf308d4e
Commit Graph

896109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a1103a2c3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fc5f8b101 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214863

Change-Id: I22338c0e46733bd80625c3c87879ef06b19b1b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:22:22 +00:00
Bill Yi
3bd75988e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e034ac71f3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214518

Change-Id: Ieeb0641149df44a8fa7d047a00f436985426af5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:22:07 +00:00
Bill Yi
bd3995bdf2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4c343e36e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214518

Change-Id: Id559145911889fc0ab37beca1d3bb6c7546c551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:21:59 +00:00
Bill Yi
6b6df5fe4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb62b7487a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214468

Change-Id: I59de3813d0ff39aa888b9a56d72a41ec8488284b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:21:45 +00:00
Bill Yi
efbaf84069 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e1e099e9c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214468

Change-Id: I1a9538ce0e50d0ceb1c08a42a166394df2ec96de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:21:38 +00:00
Bill Yi
137840aa9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f9238c40f1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214335

Change-Id: I50416faa1b73809907f714b336fd74da4ac08891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:21:23 +00:00
Bill Yi
9ca80f177d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f644931c8b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214335

Change-Id: I9bd2976339753d3aabd9e7b67636d2feb8a52da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:21:07 +00:00
Bill Yi
86d896130b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1e599a623 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24212096

Change-Id: I29346dbc28b0d7607c209d4f0afa324ef5780b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:20:52 +00:00
Bill Yi
20899a9555 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74518b5f85 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24212096

Change-Id: I3fc1ab33db612f0d1e321eaa08f6e3fbb27cba44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:20:38 +00:00
Bill Yi
9a8b676e57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3980123b09 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24210141

Change-Id: Iaea42947c1121a6bde7449b65265d588e1ffdd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:20:23 +00:00
Bill Yi
9b77682bf6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29685d41e5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24210141

Change-Id: I20b70b3e77db92985f5b6de1b7b67d4e8cfef1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:20:02 +00:00
Jack Yu
7bcc409dad [automerger skipped] Merge "Cleaned up the usage of SubscriptionManger.getSubId" into main am: e502678bd1 am: 3f46be81fd -s ours 
am skip reason: Merged-In Id372018a437e72c1b5874dec620b5158337bf43c with SHA-1 443dcaf722 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678044

Change-Id: I84b1c4806d81e61eb3079223af45fc3d1cf13042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:07:06 +00:00
Brandon Liu
a01000b40e Merge "Fix drawable-state cache expired issue" into main am: 3ba29fc4e8 am: 4c7d041b42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2437312

Change-Id: Ia2a62cfbc4c5c093020559c66ff02747812152e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:04:50 +00:00
Automerger Merge Worker
a5a00113c9 Merge "Merge "No need to include cutils/threads.h" into main am: aaddb6cb88 am: d2294c8c2e" into udc-dev-plus-aosp 2023-07-27 20:03:09 +00:00
Treehugger Robot
6816ef4553 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a9ed172c96 -s ours am: d88fd5aeec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24215724

Change-Id: Ib754f8f1c38cabb078dd3ff072b4acc5de894f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:02:01 +00:00
Bill Yi
97451d7452 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ea1557ddf -s ours am: ad888c0694 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24215724

Change-Id: If993e0ff47e190e863079b3cbf2d8897417d09ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:01:47 +00:00
Tomasz Wasilczyk
1ba579afbc Merge "No need to include cutils/threads.h" into main am: aaddb6cb88 am: d2294c8c2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644815

Change-Id: Id15bf3033bcada93806f7d0d3e72c9971c19605d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:01:25 +00:00
Treehugger Robot
b5977fd70e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bd51f7851a -s ours am: f3cc427d1f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24213256

Change-Id: I8a3b0c3f8ce198168f261aa72599e21dcf4309d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:00:18 +00:00
Bill Yi
e28698a16e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4b0d72ad9 -s ours am: fca54e74fa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24213256

Change-Id: I699381c8df55d5c5837b00f9de7fa8cab1360c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 20:00:10 +00:00
Treehugger Robot
3600051b48 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76f3443f10 -s ours am: a5fe1d30ef -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214469

Change-Id: I1b59d9d6846cd3614c05ec10fa20dd3658ea8b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:59:47 +00:00
Bill Yi
50a3fdaeac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3232dfc04b -s ours am: f4a548991a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214469

Change-Id: Id83cf8e17132cd9561c122d71121c28cf6863731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:59:39 +00:00
Bill Yi
e034ac71f3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-27 19:21:10 +00:00
Bill Yi
eb62b7487a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-27 19:21:10 +00:00
Bill Yi
f9238c40f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-27 19:21:10 +00:00
Bill Yi
a1e599a623 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-27 19:21:10 +00:00
Bill Yi
3980123b09 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-27 19:21:10 +00:00
Treehugger Robot
d88fd5aeec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a9ed172c96 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24215724

Change-Id: I754b63830cddace174c03456baf0b8de566604fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:20:09 +00:00
Bill Yi
ad888c0694 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ea1557ddf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24215724

Change-Id: I587eb314a8e893fdf970f0807ca430208e23b672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:19:51 +00:00
Treehugger Robot
f3cc427d1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bd51f7851a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24213256

Change-Id: I4e0812c2f1ec25ef610a24a667519e1f381378cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:15:04 +00:00
Bill Yi
fca54e74fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4b0d72ad9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24213256

Change-Id: I9268cb36f4cd0d192349b0741481a4149e8501ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:14:52 +00:00
Treehugger Robot
a5fe1d30ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76f3443f10 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214469

Change-Id: I3daf9806c0289e47aeceb4d430260396aae615d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:11:31 +00:00
Bill Yi
f4a548991a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3232dfc04b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24214469

Change-Id: I713c22f2fe288c167514bb6ef2df1530695fcf86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:11:06 +00:00
Jack Yu
3f46be81fd Merge "Cleaned up the usage of SubscriptionManger.getSubId" into main am: e502678bd1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678044

Change-Id: I3d0e9bbe7f759c83d7be7e726b16172fd46f44ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 18:31:55 +00:00
Brandon Liu
4c7d041b42 Merge "Fix drawable-state cache expired issue" into main am: 3ba29fc4e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2437312

Change-Id: Ia11517a53200e6010c014b890955976b66bcd001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 18:25:50 +00:00
Tomasz Wasilczyk
d2294c8c2e Merge "No need to include cutils/threads.h" into main am: aaddb6cb88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644815

Change-Id: Ibbb4ee007d01fd3f03708cb46448f090e6fe995c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 18:23:51 +00:00
Treehugger Robot
a9ed172c96 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 18:23:30 +00:00
Treehugger Robot
bd51f7851a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 18:14:35 +00:00
Treehugger Robot
76f3443f10 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 18:14:33 +00:00
Jack Yu
e502678bd1 Merge "Cleaned up the usage of SubscriptionManger.getSubId" into main 2023-07-27 17:47:54 +00:00
Jack Yu
faa35df7a9 Cleaned up the usage of SubscriptionManger.getSubId 
Cleaned up the old APIs and replaced with the new APIs.

Bug: 270094276
Test: Boot up + Basic phone funcationality tests
Change-Id: Id372018a437e72c1b5874dec620b5158337bf43c
Merged-In: Id372018a437e72c1b5874dec620b5158337bf43c
 2023-07-27 17:26:37 +00:00
Brandon Liu
3ba29fc4e8 Merge "Fix drawable-state cache expired issue" into main 2023-07-27 17:01:56 +00:00
Tomasz Wasilczyk
aaddb6cb88 Merge "No need to include cutils/threads.h" into main 2023-07-27 16:59:03 +00:00
Colin Cross
7477f38ebd Fix type inference errors with kotlinc 1.9.0 
Fixes:
frameworks/base/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt:68:35: error: type mismatch: inferred type is TKey but TKey & Any was expected
val result = this.putIfAbsent(key, value)
^
frameworks/base/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt:68:40: error: type mismatch: inferred type is TVal but TVal & Any was expected
val result = this.putIfAbsent(key, value)
^

Bug: 291335478
Test: builds
Change-Id: I73573f097832f6f4d5983f364b0dca3a59ad88a8
 2023-07-27 09:54:06 -07:00
Kunal Malhotra
36cb67fbc9 Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into udc-dev am: 24cc154421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23545766

Change-Id: Ib6489ac1833cc6b2a1d6f4b425d7b9bb2cc16386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 16:30:21 +00:00
Pavel Grafov
88f7b059aa Merge "Clarify reasons for notification removal." into udc-dev am: ebf1af8511 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24211145

Change-Id: I734e5a0539c9a65827d85315421a6e42f6284afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 16:29:10 +00:00
Kunal Malhotra
24cc154421 Merge "Fixing DatabaseUtils to detect malformed UTF-16 strings" into udc-dev 2023-07-27 16:18:06 +00:00
Pavel Grafov
ebf1af8511 Merge "Clarify reasons for notification removal." into udc-dev 2023-07-27 15:51:30 +00:00
Treehugger Robot
323d2409cc [automerger skipped] Merge "Correctly support restoring SIM specific settings" into main am: 98811d90e6 am: d0c6c89968 -s ours 
am skip reason: Merged-In I2f8cb6418ee661a3cd8c02e3db6733cb12817d01 with SHA-1 66b2b6c479 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678041

Change-Id: Ia4bf1da1548d323936ce24a19a0781a1ad9b88a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 01:20:57 +00:00
Treehugger Robot
d0c6c89968 Merge "Correctly support restoring SIM specific settings" into main am: 98811d90e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2678041

Change-Id: Icf7bc245bf040604ac83d4a6a8427106b1b1a63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 00:39:14 +00:00
Hongwei Wang
d887493143 [automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f1b am: 0fbf93b9f6 am: 31262f43e4 -s ours am: 9c653875b2 -s ours am: aa0362b18f -s ours am: a83ed7318c -s ours am: d10ccc376d -s ours 
am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee65603e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23423703

Change-Id: If700e3d9db864053ada30997329f60ea0a545f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 00:35:47 +00:00