Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
425,277 Commits 3 Branches 0 Tags
5cf0bcff6769865aeb412aae0e4e83a8b2fc021a
Commit Graph

425277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
5cf0bcff67 [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours am: afd2af6f87 -s ours 
am skip reason: skipped by user nona

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

Change-Id: I4c0e19d061aaa0ce9a6a6edc6ec81f88c6bbf41d
 2021-06-26 19:43:25 +00:00
TreeHugger Robot
afd2af6f87 [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours 
am skip reason: skipped by user nona

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

Change-Id: I4718eb293f114399a708b4fb4a71274567a7f4f5
 2021-06-26 19:27:07 +00:00
TreeHugger Robot
41378ed286 [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours 
am skip reason: skipped by user nona

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

Change-Id: Ie41a7f83f27194050fca526b5ac62e94c559c5ac
 2021-06-26 19:11:21 +00:00
TreeHugger Robot
c022be14a0 Merge "Improve ellipsize performance" into pi-dev am: bb487c3233 am: 2a43ff54e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14905054

Change-Id: I8ad0cee75449198f784585c5af0d2db83187231b
 2021-06-26 02:45:44 +00:00
TreeHugger Robot
c5b814ec0a Merge "Improve ellipsize performance" into qt-dev am: 819dc46ad3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904663

Change-Id: Ia1486957866ef76461718a679e956e7ee627cc7f
 2021-06-26 02:45:31 +00:00
TreeHugger Robot
2a43ff54e6 Merge "Improve ellipsize performance" into pi-dev am: bb487c3233 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14905054

Change-Id: Iff5983577266bd350db57121fdcf5b3ab8f1f51b
 2021-06-26 02:38:04 +00:00
TreeHugger Robot
819dc46ad3 Merge "Improve ellipsize performance" into qt-dev 2021-06-26 02:36:19 +00:00
TreeHugger Robot
bb487c3233 Merge "Improve ellipsize performance" into pi-dev 2021-06-26 02:22:57 +00:00
TreeHugger Robot
0012f0daae Merge "Improve ellipsize performance" into oc-mr1-dev 2021-06-26 02:06:39 +00:00
TreeHugger Robot
538b54a115 Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into qt-dev am: 71ee31239e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346

Change-Id: I2714840c9532ec2327080106c5e2e6f64b1f0284
 2021-06-26 00:45:26 +00:00
Hai Zhang
bd70751b40 DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). am: 0abccabffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14987346

Change-Id: I1a74f3b531bc1fadec79e05042094772d7d770eb
 2021-06-26 00:45:22 +00:00
TreeHugger Robot
71ee31239e Merge "DO NOT MERGE Add cross-user check for getDefaultSmsPackage()." into qt-dev 2021-06-26 00:32:23 +00:00
Christopher Tate
490b2477b8 [automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9f4 -s ours am: 67fcd26956 -s ours am: d5745e3249 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: Id59dfe62d01bd3eb9c3c577ceec98085d8b3bf8b
 2021-06-25 18:50:47 +00:00
TreeHugger Robot
acfbbafa98 [automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I7dcce2f282e7178699b3fcee88a064774e371b0a
 2021-06-25 18:50:24 +00:00
Christopher Tate
d5745e3249 [automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9f4 -s ours am: 67fcd26956 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I91d376dd33699c2977564a0fd5fcac665f1d9c39
 2021-06-25 18:36:46 +00:00
TreeHugger Robot
956fe588a7 Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev 2021-06-25 18:33:18 +00:00
Christopher Tate
67fcd26956 [automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9f4 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: Iab060c6083c8a349be940c6c079e873774a849f5
 2021-06-25 18:21:40 +00:00
Christopher Tate
cb8e4e8db6 Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982641

Change-Id: I2cd91b0de1757c122625b2535a10b5092d57d42a
 2021-06-25 18:12:21 +00:00
Christopher Tate
5518a714f3 Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982641

Change-Id: I10aa11a0945092a01a1d27c8b4cbba0b91ac37ca
 2021-06-25 17:47:35 +00:00
Hai Zhang
0abccabffe DO NOT MERGE Add cross-user check for getDefaultSmsPackage(). 
Bug: 177927831
Test: atest RoleSecurityTest
Change-Id: I1254804fb72a299e782d45f938acdf979a82f904
 2021-06-20 03:19:27 +00:00
Christopher Tate
6984eaa9f4 Fix side effects of trace-ipc and dumpheap commands 
These shell commands were implicitly deleting any client-named file for
which the system uid had deletion capability.  They no longer do this,
instead using only the client's own capabilities and file manipulation
modes.

Bug: 185398942
Test: manual "adb shell cmd activity dumpheap system_server /data/system/last-fstrim"
Test: atest CtsPermissionTestCases:ShellCommandPermissionTest
Merged-In: Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f
Change-Id: Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f
 2021-06-18 22:19:47 +00:00
Christopher Tate
4c0b9a5fbd Fix side effects of trace-ipc and dumpheap commands 
These shell commands were implicitly deleting any client-named file for
which the system uid had deletion capability.  They no longer do this,
instead using only the client's own capabilities and file manipulation
modes.

Bug: 185398942
Test: manual "adb shell cmd activity dumpheap system_server /data/system/last-fstrim"
Test: atest CtsPermissionTestCases:ShellCommandPermissionTest
Merged-In: Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f
Change-Id: Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f
 2021-06-18 22:14:11 +00:00
Christopher Tate
3555fa2f09 Fix side effects of trace-ipc and dumpheap commands 
These shell commands were implicitly deleting any client-named file for
which the system uid had deletion capability.  They no longer do this,
instead using only the client's own capabilities and file manipulation
modes.

Bug: 185398942
Test: manual "adb shell cmd activity dumpheap system_server /data/system/last-fstrim"
Test: atest CtsPermissionTestCases:ShellCommandPermissionTest
Merged-In: Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f
Change-Id: Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f
 2021-06-16 23:24:25 +00:00
Jorim Jaggi
ffdad637f3 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: Icbb28d30efd5a6f9fe3a02cb895030d860beaf70
 2021-06-11 10:34:48 +00:00
TreeHugger Robot
c9c9886577 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I3cd073fac31b45437ebcd1a43084f0675e2151eb
 2021-06-11 10:34:30 +00:00
Jorim Jaggi
e8f110352b [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I6c9236eb0273d1e7d07b05f39d768c51d07c0904
 2021-06-11 10:25:20 +00:00
TreeHugger Robot
c3d061d3c6 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours 
am skip reason: skipped by user jjaggi

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

Change-Id: Id3394c9a610df9c2551ccfddad1126862ab9d393
 2021-06-11 10:25:08 +00:00
Jorim Jaggi
208512ae75 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1d31270fd2 is already in history

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

Change-Id: I434f0068024f61af13d68bd42bdcdcf93be27afb
 2021-06-10 17:50:27 +00:00
Daniel Sandler
1f0a6621ad Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294

Change-Id: I52ec38b96a54250bf25ef0da255e20b7a2f65f71
 2021-06-10 14:25:04 +00:00
Daniel Sandler
7e742dca13 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev 2021-06-10 14:04:24 +00:00
TreeHugger Robot
f02c375c6f Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev 2021-06-09 20:27:07 +00:00
Tej Singh
e72a13d44c [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: I0677d318752ff2be05afb28f8db04480413722d7
 2021-06-09 18:42:55 +00:00
Tej Singh
af533b33b1 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25f81cbc3411addb6d5a329db983ad8324e44c7a
 2021-06-09 17:57:23 +00:00
Seigo Nonaka
ae1912b62f Improve ellipsize performance 
Instead of iterate all ellipsized characters, only iterate the necessary
ranges for copying.

Bug: 188913943
Test: atest CtsTextTestCases CtsGraphicsTestCases CtsWidgetTestCases
Change-Id: I3d03b1e3897e427c23fbe51315f412c57a4ce9e9
Merged-In: I3d03b1e3897e427c23fbe51315f412c57a4ce9e9
 2021-06-08 20:38:08 -07:00
TreeHugger Robot
421bb6ab1d Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev am: d5416772c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670131

Change-Id: Ib389356ea8c77bbe2e5230f266c7ffaa0fe44b0d
 2021-06-09 02:38:58 +00:00
Tej Singh
22d3aa3546 [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670131

Change-Id: I705d5c2e025d4e510cd10091e381d8d57f99b78d
 2021-06-09 02:38:51 +00:00
TreeHugger Robot
d5416772c5 Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev 2021-06-09 02:24:10 +00:00
Seigo Nonaka
5238a7a79b Improve ellipsize performance 
Instead of iterate all ellipsized characters, only iterate the necessary
ranges for copying.

Bug: 188913943
Test: atest CtsTextTestCases CtsGraphicsTestCases CtsWidgetTestCases
Change-Id: I3d03b1e3897e427c23fbe51315f412c57a4ce9e9
(cherry picked from commit 2c6121f3e3)
 2021-06-08 19:37:07 +00:00
Seigo Nonaka
0c17ccc4af Improve ellipsize performance 
Instead of iterate all ellipsized characters, only iterate the necessary
ranges for copying.

Bug: 188913943
Test: atest CtsTextTestCases CtsGraphicsTestCases CtsWidgetTestCases
Change-Id: I3d03b1e3897e427c23fbe51315f412c57a4ce9e9
(cherry picked from commit 2c6121f3e3)
 2021-06-08 19:36:07 +00:00
SongFerng Wang
9ebf723235 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440224

Change-Id: Ie22ef595d11fafb5e7751bb1bb3b8be8133239ac
 2021-06-08 06:23:01 +00:00
SongFerng Wang
d66da66133 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev 2021-06-08 05:59:44 +00:00
Jorim Jaggi
1692babe5e Fix race condition between lockNow() and updateLockscreenTimeout 
If updateLockscreenTimeout gets called before the Runnable queued
from lockNow gets executed, lockNow request will be ignored. Fix
this by not clearing out the runnable if it's pending lock request.

Test: Switch user, ensure lockscreen comes up
Bug: 161149543
Change-Id: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
(cherry picked from commit 875fa991aa)
Merged-In: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
 2021-05-21 11:40:18 +00:00
Jorim Jaggi
1d31270fd2 Fix race condition between lockNow() and updateLockscreenTimeout 
If updateLockscreenTimeout gets called before the Runnable queued
from lockNow gets executed, lockNow request will be ignored. Fix
this by not clearing out the runnable if it's pending lock request.

Test: Switch user, ensure lockscreen comes up
Bug: 161149543
Change-Id: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
(cherry picked from commit 875fa991aa)
Merged-In: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
 2021-05-21 11:38:37 +00:00
Jorim Jaggi
1fc88c383e Fix race condition between lockNow() and updateLockscreenTimeout 
If updateLockscreenTimeout gets called before the Runnable queued
from lockNow gets executed, lockNow request will be ignored. Fix
this by not clearing out the runnable if it's pending lock request.

Test: Switch user, ensure lockscreen comes up
Bug: 161149543
Change-Id: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
(cherry picked from commit 875fa991aa)
Merged-In: Ie486396fd7328edf8ca0912df92524bb82a1fb7f
 2021-05-21 11:34:10 +00:00
Tej Singh
7f9b0a9fb0 [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged 
It's possible for bad atoms to have negative atom ids. This results in
an OOB write when we note that the atom was logged. This adds a
validation check on the logging.

Also added safetynet logging for negative atoms

Bug: 187957589
Test: POC in bug no longer led to the OOB write & crash
Test: checked event log for safetynet logging
Change-Id: I8a6b094c94309d7b02430fb860891ef814efb426
 2021-05-21 00:14:21 -07:00
Tej Singh
b13b741a94 [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged 
It's possible for bad atoms to have negative atom ids. This results in
an OOB write when we note that the atom was logged. This adds a
validation check on the logging.

Also added safetynet logging for negative atoms

Bug: 187957589
Test: POC in bug no longer led to the OOB write & crash
Test: checked event log for safetynet logging
Change-Id: I8a6b094c94309d7b02430fb860891ef814efb426
 2021-05-20 15:55:27 -07:00
lucaslin
1e169e7ef8 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: I10032a99e96a46e9d685c4b1ac6835ef342fca16
 2021-05-12 18:30:54 +00:00
lucaslin
0c2eb39dfb [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours 
am skip reason: Merged-In I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec with SHA-1 e67b0c3aee is already in history

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

Change-Id: I1c25c89f9863d673c6b78be63556ffb63b6d720f
 2021-05-12 18:30:15 +00:00
lucaslin
12f7871029 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: Ic203ba11819ad24e6eb435132ff468a8a6c4b564
 2021-05-12 18:08:45 +00:00
lucaslin
e100b24420 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours 
am skip reason: Merged-In I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec with SHA-1 e67b0c3aee is already in history

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

Change-Id: Ia0244cd9791223e711c84a76215a3e242f04276b
 2021-05-12 18:08:28 +00:00