Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
684,751 Commits 3 Branches 0 Tags
7dded5b45a60f13440ea9c536b6785d7f070eebc
Commit Graph

684751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7dded5b45a Merge changes from topic "presubmit-am-53cb64cfdbf14bb2ae83b56dfe0bd501" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c0bb5003a5
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-06 07:11:18 +00:00
Chris Kuiper
7d3e172352 Merge changes from topics "presubmit-am-848876f4083644ad802120cf11b761de", "presubmit-am-feedd56083be48668fea14c29cf72287" into sc-v2-dev am: e534d9269d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16749439

Change-Id: I89b1975523071461bed3f91a308f44ffdc106bc3
 2022-02-06 00:41:38 +00:00
Chris Kuiper
01ecac9813 Merge changes from topic "presubmit-am-feedd56083be48668fea14c29cf72287" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [RESTRICT AUTOMERGE]DisplayManager: Make sure RampAnimator sets property in linear space. 2p: 47461bb5ae
  [RESTRICT AUTOMERGE]DisplayManager: Make sure RampAnimator sets property in linear space.
 2022-02-06 00:27:14 +00:00
Chris Kuiper
e534d9269d Merge changes from topics "presubmit-am-848876f4083644ad802120cf11b761de", "presubmit-am-feedd56083be48668fea14c29cf72287" into sc-v2-dev 
* changes:
  [RESTRICT AUTOMERGE]DisplayManager: Make sure RampAnimator sets property in linear space.
  [RESTRICT AUTOMERGE]DisplayManager: Switch RampAnimator to ramp in HLG space.
 2022-02-06 00:27:14 +00:00
Chris Kuiper
fc672e4459 Merge changes from topic "presubmit-am-848876f4083644ad802120cf11b761de" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [RESTRICT AUTOMERGE]DisplayManager: Switch RampAnimator to ramp in HLG space. 2p: 692f088bba
  [RESTRICT AUTOMERGE]DisplayManager: Switch RampAnimator to ramp in HLG space.
 2022-02-06 00:27:14 +00:00
Bill Yi
9be383ff4a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c0bb5003a5 
Blank merge reason: commit message contains skip directive

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

Change-Id: If0ec6f398dd6892a7a9a1312dcc82deb6fb340db
 2022-02-05 20:36:14 +00:00
Bill Yi
c0bb5003a5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb654e375b0798383dcd5d8af0620471c108e2ee
 2022-02-05 20:36:01 +00:00
Ganesh Olekar
70e4ba9a01 Merge "Validate pid can be trusted" into sc-dev am: 45312b8382 am: b14e524ffd am: e38b4d59cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16461958

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

Change-Id: I1439303fe9858209c4e1c53e4a5a3220ee0ac569
 2022-02-05 04:45:46 +00:00
Ganesh Olekar
e38b4d59cf 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: I55bd837724c745078138cdbd8afc4213768dcdb1
 2022-02-05 04:31:21 +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
36ad429cb4 [automerger skipped] Merge "Add constant for SC V2." am: b4bcc85925 am: ef662c60e9 am: 4f7c212c39 -s ours 
am skip reason: Merged-In Ieecebfccf9366815c93d620b70aeabc1abcd3ebd with SHA-1 dec589fbce is already in history

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

Change-Id: Ife16c5c7e546aea180e201a8248fde26e0d3773f
 2022-02-05 02:17:13 +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
53dbc36d99 Merge "Add key / value data structures for IBpfMaps" am: 1962b10531 am: 06e0f144cb am: bd0de6957a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969201

Change-Id: I566aba16c428ad673360542cf880a2669948a6c5
 2022-02-05 00:23:13 +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
James Mattis
7693959d87 Merge "Adding permission for Ethernet Network Management" am: e4ad2e515e am: eaa1e819cf am: 1fc44a16b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964543

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

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

Change-Id: If84b6f842c22b4fa8e30382a6f269a3083b77952
 2022-02-04 23:48:22 +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
d4dbae123f Merge "Record tombstone proto file's timestamp into the dropbox" am: cbcb665dee am: 48a54513c8 am: 0017457118 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970680

Change-Id: I0941d11e59982e89aeb8f77179b2d45d08dc47ac
 2022-02-04 21:37:06 +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
df207e3a48 Merge "Binder: small failed transactions can be due to size" am: e7f547a5df am: 0968da68e0 am: 093f81913b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971821

Change-Id: Idaa2cb121cc397c8e30d9261b1a624c8016e1cbb
 2022-02-04 19:20:03 +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
Nicolò Mazzucato
1e4a85aa7b Merge "[DO NOT MERGE] Ensure SensorManager is destroyed on Launcher activity destruction" into sc-v2-dev am: 734dde1298 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16785203

Change-Id: I1e030341a1ee91677d34695fa014ff16c1845ac1
 2022-02-04 17:13:33 +00:00
Nicolò Mazzucato
734dde1298 Merge "[DO NOT MERGE] Ensure SensorManager is destroyed on Launcher activity destruction" into sc-v2-dev 2022-02-04 16:56:51 +00:00
Presubmit Automerger Backend
39c418246a [automerge] [DO NOT MERGE] Ensure SensorManager is destroyed on Launcher activity destruction 2p: 7eee970bd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16785203

Change-Id: I3a80ed29ab42627d2f83a551fc51bbf4feb41fc6
 2022-02-04 14:32:25 +00:00
Nicolo' Mazzucato
7eee970bd6 [DO NOT MERGE] Ensure SensorManager is destroyed on Launcher activity destruction 
cp of I96bf525fe3730e7bf6b4c1042c18ef96622248fd to solve leak.
Restricting automerge as the bug is already fixed on master, but the file has been converted to kotlin, so this cl can't be automatically patched there.


Fix: 217144034
Test: See other cl
Change-Id: Id81168475882e94fb81ea6c89388707e730da5f9
 2022-02-04 14:32:14 +00:00
Remi NGUYEN VAN
0462549684 Merge "Support discovering services with a NetworkRequest" am: c9a39b3066 am: fb5e2409fd am: dceaec704d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952113

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

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

Change-Id: Ie28b0fa47e0bbfa130fd1e386725ed94b2fa9895
 2022-02-04 12:52:07 +00:00