Commit Graph

663890 Commits

Author SHA1 Message Date
rickywai
ca74c56e3a Merge "Check the data directory before mount tmpfs" am: 767c2ba770 am: fc0e10b210
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I75ec659199b4b892c60b44aa8ba36f68fc1b74e4
2022-02-06 23:40:48 +00:00
rickywai
fc0e10b210 Merge "Check the data directory before mount tmpfs" am: 767c2ba770
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I912c3a576a4e4e7d14307bae56b4452050786e5e
2022-02-06 23:29:22 +00:00
rickywai
767c2ba770 Merge "Check the data directory before mount tmpfs" 2022-02-06 23:14:37 +00:00
TreeHugger Robot
0510b50533 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 574c12fb0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a9de992d864abb3cf446130f14a8100d894e215
2022-02-06 07:31:38 +00:00
TreeHugger Robot
99d68fe23c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b04c4f57e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bd1eee9d26d67f2e2bae84c1ff05d7b6cb00e00
2022-02-06 07:31:24 +00:00
TreeHugger Robot
61495b90ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6830e6f622 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c71fe2b887fa44460c1d6b6fc289c1eb7173f30
2022-02-06 07:31:04 +00:00
TreeHugger Robot
5e3dd00c75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 79b7936bb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1685a0062f0a51026250cdd52bab9bd5eee8150
2022-02-06 07:30:13 +00:00
TreeHugger Robot
86cfd786db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8df23efae2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8d7941be3234c0856c0ab9eff28c8198fcf5c37a
2022-02-06 07:29:15 +00:00
TreeHugger Robot
574c12fb0e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-06 07:15:43 +00:00
TreeHugger Robot
b04c4f57e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-06 07:15:36 +00:00
TreeHugger Robot
6830e6f622 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-06 07:11:16 +00:00
TreeHugger Robot
79b7936bb6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-06 07:11:10 +00:00
TreeHugger Robot
8df23efae2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-06 07:11:04 +00:00
Bill Yi
a2027d5bba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0236433bc2c795d24d566fc5b360f6555bd50bda
2022-02-05 21:41:12 +00:00
Bill Yi
55195354d9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4f3c8878ff7b157a53ae672c13b8fa8d3442feac
2022-02-05 21:17:40 +00:00
Bill Yi
722d7a9d40 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaf09fd731dc10ebf5cf78ba3f97b34c012c5dc1f
2022-02-05 20:34:25 +00:00
Bill Yi
d194a4cfbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7ce72b91327024d36887d4d06a60341851b5da3b
2022-02-05 18:52:55 +00:00
Bill Yi
22c3adf8b2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96fccf4b7115d931934fc1954b37cc7210e55ecc
2022-02-05 17:31:52 +00:00
Ganesh Olekar
4ff5bad43e Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 am: b14e524ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I3844f812cfdbdf51da4f2f849d16794bb9679b90
2022-02-05 04:31:21 +00:00
Ganesh Olekar
b14e524ffd Merge "Validate pid can be trusted" into sc-dev am: 45312b8382
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

Change-Id: I47da71211e30902d5f489f0dec109056b9503707
2022-02-05 04:14:22 +00:00
Ganesh Olekar
45312b8382 Merge "Validate pid can be trusted" into sc-dev 2022-02-05 03:56:26 +00:00
Treehugger Robot
4f7c212c39 Merge "Add constant for SC V2." am: b4bcc85925 am: ef662c60e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972646

Change-Id: I205b1b3206be894aa271cc252652c8fddba5625e
2022-02-05 01:57:57 +00:00
Treehugger Robot
ef662c60e9 Merge "Add constant for SC V2." am: b4bcc85925
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972646

Change-Id: Id28b7282c42ee36986e2ebd3065fd2a40f276733
2022-02-05 01:42:53 +00:00
Treehugger Robot
b4bcc85925 Merge "Add constant for SC V2." 2022-02-05 01:20:06 +00:00
Treehugger Robot
bd0de6957a Merge "Add key / value data structures for IBpfMaps" am: 1962b10531 am: 06e0f144cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969201

Change-Id: I3f863cf5cfb50cb215391abe62e113aecd6b8e13
2022-02-05 00:08:55 +00:00
Treehugger Robot
06e0f144cb Merge "Add key / value data structures for IBpfMaps" am: 1962b10531
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969201

Change-Id: Id2e9069959402216b52d1d64603eeb9f27cc21ca
2022-02-04 23:57:06 +00:00
Treehugger Robot
1962b10531 Merge "Add key / value data structures for IBpfMaps" 2022-02-04 23:39:29 +00:00
James Mattis
1fc44a16b8 Merge "Adding permission for Ethernet Network Management" am: e4ad2e515e am: eaa1e819cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964543

Change-Id: Ic3064d02915c9de66f98c7b3e76641367cbd5080
2022-02-04 23:29:35 +00:00
Dave McCloskey
911482e768 Merge "Add TRUST_LISTENER to the shell for use in CTS tests" am: f4a4508e64 am: 9845deb4e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962480

Change-Id: I1e44c4359dabe2333353f55e0c42afe04efedc78
2022-02-04 23:28:44 +00:00
Treehugger Robot
ea7dbe7167 Merge "Add background blur activity to silkfx" am: 81f5901e83 am: 9da79d3727
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966459

Change-Id: I42cc386c66ae508d8a05a8332248ac3165b8698f
2022-02-04 23:28:21 +00:00
James Mattis
eaa1e819cf Merge "Adding permission for Ethernet Network Management" am: e4ad2e515e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964543

Change-Id: Ibcd7b1db698c1f1e4b72dbe87c5e69bbd6d8bbc0
2022-02-04 23:12:47 +00:00
Dave McCloskey
9845deb4e9 Merge "Add TRUST_LISTENER to the shell for use in CTS tests" am: f4a4508e64
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962480

Change-Id: Ifc9c639a0366cfa9e0746752a0bb9b99f5805c78
2022-02-04 23:10:48 +00:00
Treehugger Robot
9da79d3727 Merge "Add background blur activity to silkfx" am: 81f5901e83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966459

Change-Id: I02f12ab4d7eca25509f2ec8f35bbafd9751b02ae
2022-02-04 23:10:08 +00:00
James Mattis
e4ad2e515e Merge "Adding permission for Ethernet Network Management" 2022-02-04 23:05:27 +00:00
Dave McCloskey
f4a4508e64 Merge "Add TRUST_LISTENER to the shell for use in CTS tests" 2022-02-04 22:58:26 +00:00
Treehugger Robot
81f5901e83 Merge "Add background blur activity to silkfx" 2022-02-04 22:52:59 +00:00
Jing Ji
0017457118 Merge "Record tombstone proto file's timestamp into the dropbox" am: cbcb665dee am: 48a54513c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970680

Change-Id: Ib91ceae2b4496b53e858ee8f2de298b4eddce86d
2022-02-04 21:23:26 +00:00
Jing Ji
48a54513c8 Merge "Record tombstone proto file's timestamp into the dropbox" am: cbcb665dee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970680

Change-Id: Ie5033654cae39becb73560d601b2abc88968e4e5
2022-02-04 21:06:46 +00:00
Jing Ji
cbcb665dee Merge "Record tombstone proto file's timestamp into the dropbox" 2022-02-04 20:52:28 +00:00
Galia Peycheva
fe59c4de42 Add background blur activity to silkfx
Bug: 213292227
Test: m SilkFX && adb install $OUT/testcases/SilkFX/arm/SilkFX.apk
Test: adb shell am start -n com.android.test.silkfx/.materials.BackgroundBlurActivity
Change-Id: I1692a53460b64b5a49d14736b2b680069217fa1d
2022-02-04 19:40:57 +00:00
Steven Moreland
093f81913b Merge "Binder: small failed transactions can be due to size" am: e7f547a5df am: 0968da68e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971821

Change-Id: Ide859555edae8d9225a694fdbdecbecb878912ef
2022-02-04 19:01:58 +00:00
Steven Moreland
0968da68e0 Merge "Binder: small failed transactions can be due to size" am: e7f547a5df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971821

Change-Id: Ibf7f7318b0255f188b20b478766206cdf882615b
2022-02-04 18:51:04 +00:00
Steven Moreland
e7f547a5df Merge "Binder: small failed transactions can be due to size" 2022-02-04 18:34:00 +00:00
Michael Wright
3a29070961 Add constant for SC V2.
Bug: 204295952
Test: N/A
Merged-In: Ieecebfccf9366815c93d620b70aeabc1abcd3ebd
Change-Id: I6597299374715153e8e63d43b44949df76f9ab26
2022-02-04 18:08:21 +00:00
Remi NGUYEN VAN
dceaec704d Merge "Support discovering services with a NetworkRequest" am: c9a39b3066 am: fb5e2409fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952113

Change-Id: I2d77d2fd853f3e76ce83ca82a75cbd09f2edbaf6
2022-02-04 12:42:11 +00:00
Remi NGUYEN VAN
7865fe3fc3 Merge changes from topic "nsd_serviceinfo_network" am: bf13de3b19 am: 902c1d6f8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944534

Change-Id: I4ec5220c269ebe830c4c8682aeabedbbbc276759
2022-02-04 12:41:46 +00:00
hepengtao
65f276d34c NSD: Specify on what interface to getAddrInfo am: 985da1992e am: 34fe8b70a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1862673

Change-Id: I4a4bb5e40caa1716681befb1c450bc4469c387bc
2022-02-04 12:41:37 +00:00
Remi NGUYEN VAN
fb5e2409fd Merge "Support discovering services with a NetworkRequest" am: c9a39b3066
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952113

Change-Id: I6ffad96f4e0e662be9b21607d12648f0b4d0aa81
2022-02-04 12:24:03 +00:00
Remi NGUYEN VAN
902c1d6f8e Merge changes from topic "nsd_serviceinfo_network" am: bf13de3b19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944534

Change-Id: Ia0a3c75269dd5b125292235360e2e7ba0cefd9ca
2022-02-04 12:22:21 +00:00
hepengtao
34fe8b70a1 NSD: Specify on what interface to getAddrInfo am: 985da1992e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1862673

Change-Id: I436ad4f11c9da27d79628c25eb8a0f6bb532f02f
2022-02-04 12:22:18 +00:00