Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,722 Commits 3 Branches 0 Tags
caadbbe5d08f66de4834d6436fe8343bb205b910
Commit Graph

760722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Li
caadbbe5d0 Merge "[conflict] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46" 2022-03-24 00:21:21 +00:00
Salud Lemus
82e396dabd Merge "Restrict API for financed device owner" 2022-03-23 17:58:58 +00:00
Steve Elliott
9019432aed Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev am: 6a0d65a739 am: bfbcfb92ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323564

Change-Id: I4903e771888ac865c4ee1ba7611976ab165c7d7c
 2022-03-23 14:10:52 +00:00
Chris Li
2f49be6dde [conflict] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17258046

Change-Id: Iae740ca49a726ab5a022c44cfe748288aa9507b2
 2022-03-23 13:56:01 +00:00
Steve Elliott
bfbcfb92ed Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev am: 6a0d65a739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323564

Change-Id: I65bf65e73c17e0e3202e246427e703db4db32034
 2022-03-23 13:48:38 +00:00
Steve Elliott
a3acba9e5b Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev am: 6a0d65a739 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323564

Change-Id: I4365a9c97b9ada71ac68698d3079fc0bd79e04b8
 2022-03-23 13:48:31 +00:00
Chris Li
a3e1134c46 Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev 2022-03-23 13:47:59 +00:00
Nikolas Havrikov
afb97f31d7 Merge "Replace LinkedList by a more performant collection" 2022-03-23 13:33:14 +00:00
Steve Elliott
6a0d65a739 Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev 2022-03-23 13:25:29 +00:00
Virkumar Karavate
bc7936ae9f [automerger skipped] Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 am: 9723c61343 am: 1283caacb6 am: 9f62497f95 -s ours 
am skip reason: Merged-In I5050eb2cbb15bc1245c91efb72e3d4a417f435e5 with SHA-1 15e64537b6 is already in history

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

Change-Id: Ie2df755589e52e53ba5e5fd142dbefdca33f390c
 2022-03-23 13:10:52 +00:00
Automerger Merge Worker
303ed5282a Merge "[automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours" into tm-dev am: 250024ef40 -s ours am: 75ffad31bb -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: Ieb041753a2003cf475da8cb68025a6547d348ea3
 2022-03-23 13:10:22 +00:00
Patrick Rohr
928b564254 [automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours am: 1711adc50f -s ours am: bbafa93dd2 -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: I93f6ef8553089da14105cd82b90394dd20db794d
 2022-03-23 13:09:57 +00:00
TreeHugger Robot
409d051b71 Merge changes Ifcd1f115,I4988c09c into tm-dev am: 463d40b33e am: c45d8de036 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320843

Change-Id: I5217b026e4c794dd35b0f6435a6039025f915854
 2022-03-23 13:09:03 +00:00
Virkumar Karavate
431a12852d [automerger skipped] Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 am: 9723c61343 am: 1283caacb6 -s ours 
am skip reason: Merged-In I5050eb2cbb15bc1245c91efb72e3d4a417f435e5 with SHA-1 15e64537b6 is already in history

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

Change-Id: I9aa373b62016f2d88153f9608d31362b376d839d
 2022-03-23 12:54:48 +00:00
Automerger Merge Worker
6ce440fd6c Merge "[automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours" into tm-dev am: 250024ef40 -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: I4244615fb3662e381273c6c676a1105133f8c3cd
 2022-03-23 12:54:13 +00:00
Virkumar Karavate
9f62497f95 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 am: 9723c61343 am: 1283caacb6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036103

Change-Id: I400171202859f4c2d8c16b975624313b8e4b3ff2
 2022-03-23 12:54:05 +00:00
Patrick Rohr
f9e8332f44 [automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours am: 1711adc50f -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: I5fab4c7faca4245e3beaf905f0cbe3564b885578
 2022-03-23 12:54:01 +00:00
Automerger Merge Worker
75ffad31bb Merge "[automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours" into tm-dev am: 250024ef40 -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: Id0b3bbee873b9d5617226c28d755ca0aecf3183c
 2022-03-23 12:53:39 +00:00
Patrick Rohr
bbafa93dd2 [automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours am: 1711adc50f -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: I0c359b3f70716345a46d10b8c770f51d4567d9a5
 2022-03-23 12:53:34 +00:00
TreeHugger Robot
2edf073c75 Merge changes Ifcd1f115,I4988c09c into tm-dev am: 463d40b33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320843

Change-Id: I54c933b7c8db83535670e2b712ec3eac167c833f
 2022-03-23 12:53:21 +00:00
TreeHugger Robot
c45d8de036 Merge changes Ifcd1f115,I4988c09c into tm-dev am: 463d40b33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320843

Change-Id: I8f5e9f516d698c9c352d2996c1ff300409437f6b
 2022-03-23 12:53:20 +00:00
Virkumar Karavate
1283caacb6 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 am: 9723c61343 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036103

Change-Id: Ic5d77ad3026b4fc4a960e33f15d2f4872a776f61
 2022-03-23 12:47:02 +00:00
Virkumar Karavate
9723c61343 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036103

Change-Id: Iee40ad7958f8ff75395d89a0c7a713e238759598
 2022-03-23 12:41:06 +00:00
Automerger Merge Worker
250024ef40 Merge "[automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours" into tm-dev 2022-03-23 12:40:44 +00:00
Patrick Rohr
1711adc50f [automerger skipped] Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b am: 1d75b7b132 -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

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

Change-Id: I3de9b85c9b4feb850f809ed355448d8d5ed0fd4e
 2022-03-23 12:40:05 +00:00
TreeHugger Robot
463d40b33e Merge changes Ifcd1f115,I4988c09c into tm-dev 
* changes:
  Renaming SplitShadeHeader to LargeScreenShadeHeader
  Showing wider header/status bar in shade on large screen
 2022-03-23 12:39:17 +00:00
TreeHugger Robot
54618808b5 Merge "Replace LinkedList by a more performant collection" 2022-03-23 12:26:04 +00:00
Virkumar Karavate
b646fcd689 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036103

Change-Id: Ieb79bb7a3cec28918ead5335073b35b6e054d901
 2022-03-23 12:25:06 +00:00
Patrick Rohr
1d75b7b132 Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master am: 666a09bb9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321707

Change-Id: I593918705439bd36552e994fa2ec4e12d8e270ef
 2022-03-23 12:19:34 +00:00
Virkumar Karavate
14087b39d1 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" 2022-03-23 11:58:56 +00:00
Patrick Rohr
666a09bb9b Merge "Change Ethernet API to use OutcomeReceiver" into stage-aosp-master 2022-03-23 11:53:57 +00:00
Patrick Rohr
954e0d86cf Change Ethernet API to use OutcomeReceiver 
This change addresses API review feedback. In addition, it changes the
returned result from Network to the interface name. The current API
returning a Network object is racy and cannot be implemented correctly.
Users should instead use the ConnectivityManager#requestNetwork() API to
get hold of the Network for a given interface.

CP note: the Merged-In ID is not the actual Change-Id of this change in
tm-dev. This change was originally merged in aosp, but was subsequently
reverted and cherry-picked into tm-dev. The cherry-pick falsely reused
the Change-Id of the (now reverted) original change. This causes
automerger to skip this change on all branches between aosp-master and
tm-dev when the correct Merged-In ID is used. Therefore, the Merged-In
ID listed is the Change-Id of an unrelated change that is present in
tm-dev but not aosp-master.

Bug: 220017952
Test: TH
Ignore-AOSP-First: CP to make automerger happy.
Merged-In: Iefd24d955572589c5bd3ca9a8139ea6e44979e8a
Change-Id: I7c46545a47034be409071c2ec007d9e1480c6ed0
 2022-03-23 11:52:44 +00:00
Rubin Xu
9e587b5dca Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev am: a441d81b3a am: 3155a51c01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320104

Change-Id: I249fd60e2a34ed09388c1921ff6789a7334aed83
 2022-03-23 11:47:39 +00:00
Jerome Gaillard
b241934587 Merge "Read-only properties can have values of arbitrary length" am: 329f25d91a am: f589cf9955 am: b2869273bb am: 59ce0178fa am: 9b5c932ea2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036307

Change-Id: I1115a63b8f36f6411035b74bdcbbaf40208b6128
 2022-03-23 11:47:01 +00:00
Presubmit Automerger Backend
86c4a4892d [automerger skipped] [automerge] Limit HotwordDetection process number to 10 2p: d47ad7b279 am: a7db7cb712 -s ours am: f7138dcade -s ours am: a8da21a966 -s ours 
am skip reason: Merged-In I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6 with SHA-1 6db1879a19 is already in history

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

Change-Id: Ibcd477e3365ef4634df899a0e2b35a8af4e21a75
 2022-03-23 11:46:36 +00:00
Christian Göllner
9a34a7ce05 Merge "Fixing shade transition calculation logic." into tm-dev am: 79a17c3fa3 am: 1559287e13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326263

Change-Id: Ic1547e3f4f6e57c2be950fbb7e945df941689c40
 2022-03-23 11:46:02 +00:00
Rubin Xu
094f486145 Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev am: a441d81b3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320104

Change-Id: I67dc59d95e36c64b6fe07b70cfdd5b0cdd4943ba
 2022-03-23 11:32:46 +00:00
Jerome Gaillard
b5413cbc4f Merge "Read-only properties can have values of arbitrary length" am: 329f25d91a am: f589cf9955 am: b2869273bb am: 59ce0178fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036307

Change-Id: I719766ad7c780d39d9a1bbab15c3c5f9512877f4
 2022-03-23 11:32:07 +00:00
Presubmit Automerger Backend
b52a150d5e [automerger skipped] [automerge] Limit HotwordDetection process number to 10 2p: d47ad7b279 am: a7db7cb712 -s ours am: f7138dcade -s ours 
am skip reason: Merged-In I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6 with SHA-1 6db1879a19 is already in history

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

Change-Id: Ifb0049d6971fcfe229ed6626e08226d840a36ecf
 2022-03-23 11:31:35 +00:00
Rubin Xu
3155a51c01 Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev am: a441d81b3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17320104

Change-Id: I8d17ff44d58443d093c3b4a99c08cbcafaf995f1
 2022-03-23 11:31:32 +00:00
Jerome Gaillard
9b5c932ea2 Merge "Read-only properties can have values of arbitrary length" am: 329f25d91a am: f589cf9955 am: b2869273bb am: 59ce0178fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036307

Change-Id: I83c11388e9fdc6a9fbb9580b1542b2c69286cdd3
 2022-03-23 11:31:25 +00:00
Presubmit Automerger Backend
a8da21a966 [automerger skipped] [automerge] Limit HotwordDetection process number to 10 2p: d47ad7b279 am: a7db7cb712 -s ours am: f7138dcade -s ours 
am skip reason: Merged-In I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6 with SHA-1 6db1879a19 is already in history

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

Change-Id: I98bcc8e537c10b5268e2f5219a44bda84cf1bd1c
 2022-03-23 11:31:15 +00:00
Christian Göllner
1559287e13 Merge "Fixing shade transition calculation logic." into tm-dev am: 79a17c3fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326263

Change-Id: I503bfe89dd2afccc819da10bf6ee844ba473768f
 2022-03-23 11:31:04 +00:00
Christian Göllner
5083c96117 Merge "Fixing shade transition calculation logic." into tm-dev am: 79a17c3fa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326263

Change-Id: I00755501ab8159871921ccfaa7ab5d84931846cc
 2022-03-23 11:30:51 +00:00
Rubin Xu
a441d81b3a Merge "Secure REMOTE_BUGREPORT_DISPATCH" into tm-dev 2022-03-23 11:26:52 +00:00
Jerome Gaillard
59ce0178fa Merge "Read-only properties can have values of arbitrary length" am: 329f25d91a am: f589cf9955 am: b2869273bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036307

Change-Id: Ic92ddb1194fe927607bcb315ffbf86b6a1d23b6b
 2022-03-23 11:16:22 +00:00
Presubmit Automerger Backend
f7138dcade [automerger skipped] [automerge] Limit HotwordDetection process number to 10 2p: d47ad7b279 am: a7db7cb712 -s ours 
am skip reason: Merged-In I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6 with SHA-1 6db1879a19 is already in history

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

Change-Id: Icad6ac15ce509ea68c476a5e0853245134be53ed
 2022-03-23 11:15:49 +00:00
Christian Göllner
79a17c3fa3 Merge "Fixing shade transition calculation logic." into tm-dev 2022-03-23 11:13:09 +00:00
Jerome Gaillard
b2869273bb Merge "Read-only properties can have values of arbitrary length" am: 329f25d91a am: f589cf9955 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036307

Change-Id: I2f8c361b6a2b6a0b71fd937de9f36be7d62e7a79
 2022-03-23 11:01:48 +00:00
Ayush Sharma
c7221f22a9 Merge "Fix deadlock in DPMS" into tm-dev am: e0934dadbe am: 0c48a4874e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17238063

Change-Id: I2d0ed4524f399a4a09fa7d0db957caeeebbfa673
 2022-03-23 10:44:50 +00:00