Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,892 Commits 3 Branches 0 Tags
cd823d7188418644da455e94c54cea1de034e12e
Commit Graph

485892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cd823d7188 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:14:32 +00:00
TreeHugger Robot
e4f1adacdc Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-12 10:11:14 +00:00
Bill Yi
827116030b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7df8f914cc468fadafba8776134f6b6cff9bcf28
 2021-06-11 11:48:14 +00:00
Jorim Jaggi
9196f5c84a [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -s ours am: dd894ae859 -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: If401b293daa18bf577d7476901ddc9e07f8aa310
 2021-06-11 11:00:01 +00:00
TreeHugger Robot
333f5c979b [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -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: Ibb0187f711beb849cf41682cd3bed3ac5050696c
 2021-06-11 10:59:52 +00:00
Jorim Jaggi
dd894ae859 [automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours am: 208512ae75 -s ours am: e8f110352b -s ours am: ffdad637f3 -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: I47c940c34f0f0859b37cfb26848b758d7e09a3fd
 2021-06-11 10:48:39 +00:00
TreeHugger Robot
aff0172222 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -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: I4094450dc15f3ad37cdecd329f3d5b234224e9c3
 2021-06-11 10:48:25 +00:00
Bill Yi
0392e48311 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic85dcb72513ec2f43a85955c928dfbefb5838b33
 2021-06-11 10:41:23 +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
51855b1f12 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Ie9162189e545ee928fb5e0845e0755191dd009b0
 2021-06-10 15:11:12 +00:00
Daniel Sandler
0f735a7bb3 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Ib85e3b41e02f79527416a455d3e57eecd0b7b5a9
 2021-06-10 14:53:21 +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
TreeHugger Robot
548ddc79d3 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293

Change-Id: I868b0e88346f0674998770895a603e292cef4f9f
 2021-06-09 19:37:36 +00:00
Tej Singh
bc9a8147a3 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: Ic8f0c3d09b90e740f7118cac1843f1ac5e2b1b37
 2021-06-09 19:37:21 +00:00
TreeHugger Robot
665a84d29d Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev 2021-06-09 19:31:09 +00:00
Tej Singh
4ad8ef142c [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47c024483e5996e9268f6926b76f4282169907ec
 2021-06-09 19:24:13 +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
TreeHugger Robot
9aefabdafd Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14800511

Change-Id: Ied6b2e6c4efb41895a0280c770a0e49b5e0bd40f
 2021-06-09 10:41:16 +00:00
TreeHugger Robot
246b270b40 Merge "Block SAF directory access to /sdcard/Android" into rvc-dev 2021-06-09 10:21:57 +00:00
TreeHugger Robot
7e4f62f44b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev am: d5416772c5 am: 421bb6ab1d -s ours am: b86fafbd58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670131

Change-Id: I985463feb8e01e32e3d24391fa34a5eb4a3ff39f
 2021-06-09 03:54:17 +00:00
Tej Singh
b5ba21e8fc [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a94 am: 22d3aa3546 -s ours am: b4974f9ca1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670131

Change-Id: I25d9332210a251826ccb6f32384a6a47980e5c0e
 2021-06-09 03:54:15 +00:00
TreeHugger Robot
a4d9f5cd56 Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev am: 8ccca289bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669474

Change-Id: Id318733ca9c703465134397171205b14aea48490
 2021-06-09 03:54:03 +00:00
Tej Singh
0a34f76d37 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: cc0bba36c7 -s ours 
am skip reason: skipped by user singhtejinder

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

Change-Id: Ic3aa7372ea31a59c9571c6acccb1464d35dda91a
 2021-06-09 03:54:02 +00:00
TreeHugger Robot
b86fafbd58 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev am: d5416772c5 am: 421bb6ab1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied08bc8fef57a8d6840e2f8e915a649407a731dc
 2021-06-09 03:02:05 +00:00
Tej Singh
b4974f9ca1 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a94 am: 22d3aa3546 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib58ee3f73039b66e9e689b5642d17c7a4a99635b
 2021-06-09 03:01:52 +00: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
TreeHugger Robot
8ccca289bf Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev 2021-06-08 22:55:30 +00:00
SongFerng Wang
e52fd7f78f [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours am: aa72b51c17 -s ours 
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

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

Change-Id: I5559689ede0f10e01a943df4c2bbbf48bb9768f1
 2021-06-08 06:59:12 +00:00
SongFerng Wang
aa72b51c17 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev am: d66da66133 am: 9ebf723235 -s ours 
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 121c969e22 is already in history

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

Change-Id: I0d0d1f7092a2ade6ab89bf72514445a24a7666c5
 2021-06-08 06:43:35 +00:00
SongFerng Wang
255373ba35 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev am: 20abbc5875 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14440225

Change-Id: Ia74d0f420b472f1e86b28e42a0e056cb6de32e4b
 2021-06-08 06:23:28 +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
20abbc5875 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev 2021-06-08 05:59:52 +00:00
SongFerng Wang
d66da66133 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into qt-dev 2021-06-08 05:59:44 +00:00
TreeHugger Robot
9f29f14815 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-08 02:07:45 +00:00
TreeHugger Robot
bbc36701b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-08 01:57:04 +00:00
TreeHugger Robot
716b44e38f Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-08 01:55:03 +00:00
TreeHugger Robot
3cd14cc21b Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-08 01:49:34 +00:00
Bill Yi
03d101ca29 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I26236dd546f2d2197576b460a49cd6aa60d3eb88
 2021-06-07 14:57:13 +00:00
Bill Yi
1c17afb46a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d4c6f4095a2f77fce0b6ae24d0e6c032b69a13a
 2021-06-07 14:48:47 +00:00
TreeHugger Robot
e3a1c871b8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-07 14:44:46 +00:00
Bill Yi
8c431f109b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I696ecba592a2b2192106a7b87ef6b5465d80f75f
 2021-06-07 14:40:13 +00:00