Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
753,833 Commits 3 Branches 0 Tags
cb2985a2ae88e29ac310552fd435056f31b37a80
Commit Graph

753833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elis Elliott
cb2985a2ae Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev 2022-03-23 17:08:01 +00:00
Ytai Ben-tsvi
1ffa981ea5 Merge "Check for null callback" into tm-dev 2022-03-23 16:36:16 +00:00
Bryce Lee
8a4163d495 Merge "Store initial bouncer showing state." into tm-dev 2022-03-23 16:16:03 +00:00
Robert Wu
2bea42c4bd Merge "BluetoothMidi: Remove unsafe code" into tm-dev 2022-03-23 16:06:50 +00:00
Caitlin Cassidy
fd5d2c2826 Merge "[Media TTT] Update the test adb commands to be able to see the default icon on the sender chip (used for a11y testing)." into tm-dev 2022-03-23 15:36:09 +00:00
Remi NGUYEN VAN
c95d61b437 Merge "Add OWNERS block for code move" am: 9860ef9b01 am: 8014f95d96 am: 9a06a0290e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: Id3983d9666b94ede480d20643e7e3e8127b4ff62
 2022-03-23 15:12:14 +00:00
Jon Eckenrode
11bc9c9d16 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b am: d3fd072f68 am: bfad78abc6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I38e40ff8310cf9a4e1a1ee9b527c62ce62f8fed4
 2022-03-23 15:11:39 +00:00
Matt Casey
64511afd04 Merge "Give LongScreenshotActivity a "Capture more" label" into tm-dev 2022-03-23 15:10:00 +00:00
Lucas Silva
7dc1b2d651 Merge "Implement dream to bouncer animation." into tm-dev 2022-03-23 15:03:23 +00:00
Remi NGUYEN VAN
9a06a0290e Merge "Add OWNERS block for code move" am: 9860ef9b01 am: 8014f95d96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: I666226411621abb82d6a1f5a0b2796063971992e
 2022-03-23 14:56:14 +00:00
Jon Eckenrode
bfad78abc6 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b am: d3fd072f68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I534e88ec19327a174068807996f133740966741e
 2022-03-23 14:55:41 +00:00
Rambo Wang
a7a5cb7214 [automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d am: 72f706f60a -s ours 
am skip reason: Merged-In I38d03e3921112c313f3c1d204ed04f6e1756ff39 with SHA-1 5f0502d313 is already in history

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

Change-Id: I086b8fd0ad2e476e21563927386ee61fc8c819c4
 2022-03-23 14:45:57 +00:00
Yan Han
f928348826 Merge "AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes" into tm-dev 2022-03-23 14:44:24 +00:00
Remi NGUYEN VAN
8014f95d96 Merge "Add OWNERS block for code move" am: 9860ef9b01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: I9756ef452ce097a634dbb84797dfe9b8d6cabb13
 2022-03-23 14:33:13 +00:00
Jon Eckenrode
d3fd072f68 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I124703352d349e1c46ac13c6fdf50284af4b6be0
 2022-03-23 14:32:25 +00:00
Rambo Wang
72f706f60a Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268

Change-Id: I33770b31f15362225e0190557afbbdda144f742f
 2022-03-23 14:26:27 +00:00
Chavi Weingarten
325cbe552f Merge "Add DISPLAY_HASH_SERVICE to ServiceName list" into tm-dev 2022-03-23 14:22:47 +00:00
Remi NGUYEN VAN
9860ef9b01 Merge "Add OWNERS block for code move" 2022-03-23 14:19:10 +00:00
Jon Eckenrode
7ac639b11b Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." 2022-03-23 14:16:19 +00:00
Rambo Wang
592bab637d Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268

Change-Id: I4035975b182b7ab0e93426126cbab487f4f286b3
 2022-03-23 14:04:51 +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
Rambo Wang
cabb6b9362 Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" 2022-03-23 13:44:09 +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
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
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
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
Jerome Gaillard
f589cf9955 Merge "Read-only properties can have values of arbitrary length" am: 329f25d91a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036307

Change-Id: I6aa4406c65fd185a9af8af032e3b149ba45e286c
 2022-03-23 10:44:22 +00:00
Jerome Gaillard
329f25d91a Merge "Read-only properties can have values of arbitrary length" 2022-03-23 10:21:15 +00:00
Ayush Sharma
e0934dadbe Merge "Fix deadlock in DPMS" into tm-dev 2022-03-23 10:10:43 +00:00
Presubmit Automerger Backend
a7db7cb712 [automerge] Limit HotwordDetection process number to 10 2p: d47ad7b279 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17344425

Bug: 216095923
Change-Id: Ie875d8f70a3b3918dd11092db101b0767b92fb19
Merged-In: I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6
 2022-03-23 09:08:07 +00:00
Sergey Volnov
d47ad7b279 Limit HotwordDetection process number to 10 
Bug: 216095923
Test: existing CTS tests
Change-Id: I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6
(cherry picked from commit bef5d91b67)
(cherry picked from commit 6db1879a19)
Merged-in: I73d12ad84e2dce108dcc923c6ad400a2a1bdddd6
 2022-03-23 09:07:42 +00:00
Shaowei Shen
0a6a138074 Merge "[Output Switcher] Modify ranking rule" into tm-dev 2022-03-23 07:58:54 +00:00
Jernej Virag
59912bdcb7 Merge "Revert resize of the right notification icon" into tm-dev 2022-03-23 07:41:29 +00:00
Jernej Virag
1c4c8139a1 Revert resize of the right notification icon 
CTS tests are for some reason checking for the size of that icon and it breaks NotificationTemplateTest. Will resubmit with fixed tests.

Reverts this change from ag/17217925

Bug: 226293312
Test: atest NotificationTemplateTest
Change-Id: I82afff2cdf339e1fe68c8bc68b479dfdd0ef5ac6
 2022-03-23 07:31:11 +00:00
TreeHugger Robot
49d28c5a9c Merge "[DO NOT MERGE] Remove the Client Suggestions APIs" into tm-dev 2022-03-23 07:25:35 +00:00
shaoweishen
2cafe393b7 [Output Switcher] Modify ranking rule 
1. make Phone with higher ranking
2. add new state with "selected" for cast device

Test: Verified on device
Bug: 224870434
Bug: 224780609
Change-Id: Ief19cf0946f6df1193c0ed3e09e76ea60bfea07c
 2022-03-23 06:51:53 +00:00
Tony Huang
56c6199477 Merge "Implement fade animation on SplitDecorManager" into tm-dev 2022-03-23 06:45:09 +00:00
Pinyao Ting
ed78fdd8d7 Merge "Permission to access shortcuts in AppSearch to Launcher and Assistant" into tm-dev 2022-03-23 06:37:10 +00:00