Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
498,261 Commits 3 Branches 0 Tags
5132cc704c53cb09c9212b28211d298fe8f409e4
Commit Graph

498261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
5132cc704c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2cfb86cc84b54275967c1406360281214da76ba8
 2021-06-11 10:44:11 +00:00
Daniel Sandler
6d4c20323b [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: Ib2cf7693bde66b42a960f442649aa0b13bf99ae0
 2021-06-10 15:10:38 +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
d74f2129d3 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: Ib92a9130bb53ab410758cd14d468af33bbdd7026
 2021-06-09 19:36:31 +00:00
Tej Singh
d4b7b0e3da [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: If7b65e095d15a9d260438bcb017f10ad3cae59d1
 2021-06-09 19:36:07 +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
92f9646d63 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: I10cecf779b554721aa09a60d664b115283ca922e
 2021-06-09 10:40:45 +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
2b7237db72 [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: Ia786709f1154122678208814631ea25fce4bcc8b
 2021-06-09 03:23:46 +00:00
Tej Singh
738641a1bd [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: Ic68a56756af7d907e92440a3a24e226dff57a3c2
 2021-06-09 03:23:39 +00:00
TreeHugger Robot
484ef75713 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: Ic833a6246a7df2f3ab427ed0a47dc1cee5ebd28c
 2021-06-09 03:23:24 +00:00
Tej Singh
eeeceb42ce [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: cc0bba36c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14669474

Change-Id: I2b09ed8723becf3dbd0ff73ac22ce7d45ffcb1e5
 2021-06-09 03:23:19 +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
f7f27429dd [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: I2d07c5583bacaecc93eb96d8b3d2477770a35a0e
 2021-06-08 06:57:52 +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
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
270a96b0f2 [automerger skipped] Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-dev am: 20abbc5875 -s ours 
am skip reason: Merged-In Ic2b62523330dc6e2169ad851715c4ab3da3b29cf with SHA-1 219d284a68 is already in history

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

Change-Id: I8c270ab2fc6986b0019d37e1c2e2cdb7afce0fbe
 2021-06-08 06:21:27 +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
1f1b574755 Merge "[security] SubscriptionGroup is exposed to unprivileged callers" into rvc-qpr-dev 2021-06-08 05:59:48 +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
7d96e14a17 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-08 02:06:48 +00:00
TreeHugger Robot
a82f17706c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-08 02:04:47 +00:00
TreeHugger Robot
c6a688a8fe Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-08 02:00:39 +00:00
TreeHugger Robot
d899a3cc85 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-08 01:49:14 +00:00
Bill Yi
c72af89b87 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2098398d7a2ddaca04fa83c42c096fca66d6d03b
 2021-06-07 15:10:08 +00:00
Bill Yi
c0ac98ee9e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I34e6a14dec156ebe3893363d34c3b39cd170fee0
 2021-06-07 15:06:22 +00:00
TreeHugger Robot
c126f37b32 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-07 14:52:27 +00:00
Bill Yi
efab2dede5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f70a3fea497024081a957e49640aae3f4ce7588
 2021-06-07 14:42:54 +00:00
Bill Yi
8465925707 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id61f10c216e060cfe9357d8b46ca07ff452bdf11
 2021-06-07 14:12:39 +00:00
Bill Yi
c0519abe50 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21c89b6e6b493ef861ab512116fd30a585a78ff9
 2021-06-07 10:56:15 +00:00
TreeHugger Robot
8709fbb945 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-07 05:04:38 +00:00
Bill Yi
db2f5d8c29 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4d0efa06d7f23207ce1b69a0705fabc668688e93
 2021-06-07 02:37:53 +00:00
Bill Yi
c76927a570 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib291e0784555dda3b0f672964d1570156ac87a7b
 2021-06-07 02:18:02 +00:00
JW Wang
339805fbf3 Merge "[DO NOT MERGE] Revert "Backport of ag/14170751 and ag/14170752."" into rvc-qpr-dev 2021-06-04 08:20:26 +00:00
JW Wang
17381965a6 [DO NOT MERGE] Revert "Backport of ag/14170751 and ag/14170752." 
This reverts commit 29d5f72db2.

Reason for revert: b/188459357: fix a flaky test

Bug: 188459357
Test: m
Change-Id: If56ba00ed499322d7192163eb62fd01587baed92
 2021-06-04 01:50:16 +00:00
TreeHugger Robot
7c5279c8b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:45:02 +00:00
TreeHugger Robot
9bd46b4d77 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:37:21 +00:00
TreeHugger Robot
bf68e84223 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:30:58 +00:00
TreeHugger Robot
7b694719e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:25:28 +00:00
TreeHugger Robot
ce42fa25fb Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-03 19:25:13 +00:00