Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,281 Commits 3 Branches 0 Tags
a0cf385810ad2944a2fc32ed868864aaccba5578
Commit Graph

660281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a0cf385810 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia5d6337536ce883b19ebb4f072d64f54902dd1ee
 2022-06-19 03:12:22 -07:00
Hai Zhang
c39d9728d6 [automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours 
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history

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

Change-Id: Icbdb2192ef3326a81dc712393a40c6469654eb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 21:30:19 +00:00
Hai Zhang
74a6adb8e0 Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. 
See b/208785537#comment11.

Bug: 208785537
Bug: 206556385
Bug: 183537857
Fixes: 203175819
Fixes: 229913295
Test: presubmit
Change-Id: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
Merged-In: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
(cherry picked from commit e6f07a4fb2)
(cherry picked from commit b0b2863467)
(cherry picked from commit 751b86257688210328f300bc3268b99f14ed1a73)
 2022-06-15 05:31:44 +00:00
Kenneth Ford
5effd75fff Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711 am: 1554a00af4 am: 393f58bfde am: a132abb4ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: I4f1d8c984a06f084a51f8f2ae2ae5a1ce465e970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 03:06:08 +00:00
Kenneth Ford
a132abb4ca Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711 am: 1554a00af4 am: 393f58bfde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: Ida57de216f484f4150ab3a4da8065a7c3169ca41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 02:38:06 +00:00
Kenneth Ford
393f58bfde Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711 am: 1554a00af4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: Iaac10e4fcea2638ae321beeaf1b4b2ef3351fcaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:31:51 +00:00
Kenneth Ford
1554a00af4 Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: I2c4c7f6b37499f78192c138caa830d03a3377d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:04:06 +00:00
Kenneth Ford
e813a20711 Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: I9339317759418659c34ae10dcdb9a98ef7017290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 00:38:39 +00:00
Kenneth Ford
3a2171f668 Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: Ia735cd97a591faa63c344958b41e7c4feb7f2a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 22:57:41 +00:00
Kenneth Ford
a4924eb85c Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703

Change-Id: I837accdc0d4f5bada34fe8da18075092dd295801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 22:31:58 +00:00
TreeHugger Robot
5e523f2329 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:49 +00:00
TreeHugger Robot
73a636b9dc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:04 +00:00
TreeHugger Robot
4d62af2a59 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:04 +00:00
TreeHugger Robot
32dd38a6d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:04 +00:00
TreeHugger Robot
2842810b78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-13 16:40:04 +00:00
Bill Yi
1437b2ef21 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If013768d9beb212ce2f8b83f514edc1f4c8eeb49
 2022-06-11 11:52:55 -07:00
Bill Yi
6901dfb027 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I07a8ba4b0908f5e467023e863b8b7f9190454687
 2022-06-11 11:49:24 -07:00
Bill Yi
3dbbfaba82 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6d76282a143b534c61422437c0c49d185cc8fda
 2022-06-11 11:36:12 -07:00
Bill Yi
8ccb1923c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iea4ea7022d06f82cbb4b883ebf142515d1d573b4
 2022-06-11 11:02:04 -07:00
Bill Yi
f44824f5c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4e7be63f7356b8083d3c44e6aff5447c87d0c53f
 2022-06-11 10:23:26 -07:00
Bill Yi
bfaeb93d75 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I843a63c7cd11c55237f3ea150fd16e686bf261f1
 2022-06-10 21:30:18 -07:00
Makoto Onuki
cdcc7859fd Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 am: ff8964d756 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I33024e49ddc185adc8aee70709b221e7e3d7c48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 21:48:50 +00:00
Makoto Onuki
ff8964d756 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Iaaf2fd27d215c4806d08bcdb12a03b459dcc7d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 21:23:22 +00:00
Makoto Onuki
6a68d207f0 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I1e1671c18a1573e819b76cbfb739d42cadc43aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 20:38:29 +00:00
Makoto Onuki
f15b3c2553 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I467f9641cf1376babab8328a06ec173a1c768fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 20:13:20 +00:00
Makoto Onuki
ea69ad5892 Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: I19750ed605001905eee78852893d1b18e8f274bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:55:08 +00:00
Makoto Onuki
822fbf618b Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369

Change-Id: Ie919bc05747a1009507a29de429c3e8d043fed9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 19:20:45 +00:00
Makoto Onuki
99ccb4e5b0 Merge "Only allow the system server to connect to sync adapters" into qt-dev 2022-06-08 18:56:23 +00:00
Adrian Roos
3bf325c723 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: If18c7d6840c651f8855de10e36365f891c5efb3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 09:15:44 +00:00
Adrian Roos
dbfa39a262 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I7b916c35a774e0c0ffa72658ce9891d5b032d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:57:59 +00:00
Adrian Roos
06f9b5d3b5 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I585332631560e95222fca628a05a3e88fa45e374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:32:29 +00:00
Adrian Roos
c8ba614846 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: Ib015905b7424382f6967432846fa74843215ba08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:31:21 +00:00
Adrian Roos
617aa519be [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I507eca53851fd555c2c255ce3793dd08fc788850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:16:24 +00:00
Adrian Roos
ba943db1e3 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I4fa5e5be588638b589c8b9c22a3d00513a824fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 08:14:36 +00:00
Adrian Roos
b55f60342e [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: Ifd144385a66308821717d6ed9ecd548d400266fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:57:26 +00:00
Adrian Roos
7a57d77f94 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history

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

Change-Id: I893c9a98526745498718ea447044a10e4fcf4475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:57:05 +00:00
Adrian Roos
df29fca37f [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours am: c166e048b1 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: I022a431fc6932160a84cb616df070bd165faaf79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:41:36 +00:00
Adrian Roos
9037f3e92f [automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history

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

Change-Id: I9bd7992cf03c8534b0a5cd788191e883e775693d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:41:24 +00:00
Adrian Roos
3abb4f5610 [automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history

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

Change-Id: Ie2f49c8df318117474d03e0c42b23c4db262384d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:41:22 +00:00
Adrian Roos
c166e048b1 [automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours 
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history

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

Change-Id: Ifd16c92c627c0b070a898deef255a9d010ff6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:40:24 +00:00
Adrian Roos
c2d5e2cb81 Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968

Change-Id: Ia6115784eb97b7759750acca4f271772f8a59ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:40:15 +00:00
Adrian Roos
a89cdcefab Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305

Change-Id: I24bd536937c9794cc17ec42eeeb047940adbb884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 07:39:21 +00:00
Adrian Roos
fa1fc20874 Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev 2022-06-08 07:21:26 +00:00
Adrian Roos
31e8959439 Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev 2022-06-08 07:20:12 +00:00
Adrian Roos
4bc778ea49 Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev 2022-06-08 07:19:51 +00:00
Adrian Roos
25967449d4 Merge changes from topic "b204906124-sc" into sc-qpr1-dev 
* changes:
  [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390
  Restrict getInputMethodWindowVisibleHeight
 2022-06-08 07:19:51 +00:00
Adrian Roos
1fce20e86e Merge "Restrict getInputMethodWindowVisibleHeight" into sc-v2-dev 2022-06-08 07:18:35 +00:00
Chiachang Wang
25ceaff1d5 [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours am: 73278838f4 -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: Iadad70d6326488043ce200842f1e75211ca8d64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 04:38:45 +00:00
Chiachang Wang
73278838f4 [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: I806e6e4942667cb2923eb452a1081d28eb2b5f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 04:13:49 +00:00
Chiachang Wang
13d9983159 [automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours 
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history

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

Change-Id: I1467c8313b9ec436a0c25394dd6a526fcbf1c1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 03:44:57 +00:00