Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,298 Commits 3 Branches 0 Tags
e0ee346120dc9ce1932edced899cc01662bba751
Commit Graph

641298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
e0ee346120 Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-dev 2021-05-14 23:00:21 +00:00
Benedict Wong
d9695aced3 Make VcnTransportInfo unparcel to null if no data contained 
When VcnTransportInfo is redacted, it contains no useful information. In
order to preserve the abstraction, the VcnTransportInfo should be
unparcelled to null


Bug: 8675309
Test: atest VcnTransportInfoTest
Change-Id: Ia9dbb9f259027acc74004eb1207e0a13cea56088
 2021-05-14 22:53:51 +00:00
Chris Li
b4aec6206f Merge "Determine whether to support activities in multi window (8/n)" into sc-dev 2021-05-14 22:28:18 +00:00
Jayachandran Chinnakkannu
6b09036ab8 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91 am: 5abb533da2 am: faf4ba40ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I04ada71bdea2c3851fd6925126f6ff2bfdecad2c
 2021-05-14 21:19:17 +00:00
TreeHugger Robot
60b32709f0 Merge "Relaxing minimum alarm window requirements" into sc-dev 2021-05-14 21:15:53 +00:00
Ahaan Ugale
9e22972568 Merge "Fix IndexOutOfBoundsException when calling dispatchProvideStructure()" into sc-dev 2021-05-14 21:15:18 +00:00
Connor O'Brien
83a5e6ed18 Merge "Don't remove UID data in readKernelCpuUid*TimesLocked" into sc-dev 2021-05-14 21:06:02 +00:00
TreeHugger Robot
7c4e5a69b0 Merge "Clear updated font files in safe mode." into sc-dev 2021-05-14 20:55:52 +00:00
Jayachandran Chinnakkannu
faf4ba40ba Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91 am: 5abb533da2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I6f1d972f822b022995cfdc99942f1167a4f8ef0d
 2021-05-14 20:53:05 +00:00
Jayachandran Chinnakkannu
5abb533da2 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: Ibd70a86d82d4810425288694f2e3904d471a2d24
 2021-05-14 20:28:38 +00:00
Jayachandran Chinnakkannu
853bb0df91 Merge "QOS filter matching support based on remote address and port number for connected sockets" 2021-05-14 20:02:30 +00:00
Jeff Sharkey
673a8c593c Merge "Add OWNERS to com.android.internal.app.procstats" am: a469054f27 am: d59dfa2fb1 am: cd6fbb1b4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691206

Change-Id: Id6b191986617d52228c7d7143a70faeadf8b9259
 2021-05-14 19:52:17 +00:00
Peter Kalauskas
a74aa47b9e Merge "Add tests for shouldAnimate and onDoneButtonClicked" into sc-dev 2021-05-14 19:48:05 +00:00
Jeff Sharkey
cd6fbb1b4d Merge "Add OWNERS to com.android.internal.app.procstats" am: a469054f27 am: d59dfa2fb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691206

Change-Id: I9f38ff847d021cb1700ca65e28080e0ebc65b8be
 2021-05-14 19:32:54 +00:00
Cassie Wang
071219037b Merge "Define new AppSearch global query permission." into sc-dev 2021-05-14 19:32:04 +00:00
Jeff Sharkey
d59dfa2fb1 Merge "Add OWNERS to com.android.internal.app.procstats" am: a469054f27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691206

Change-Id: I8cb39a291b70760211d19ec0a841721e80128315
 2021-05-14 18:59:42 +00:00
Dmitri Plotnikov
4d78cddfef Merge "Use getUahDischarge when available" into sc-dev 2021-05-14 18:43:38 +00:00
Kevin Chyn
f7b45b69e5 Merge changes I9761c313,I25dacbfa into sc-dev 
* changes:
  Prevent UdfpsView from being selectable during a11y enrollment
  Disable guided enrollment for a11y
 2021-05-14 18:37:09 +00:00
Jeff Sharkey
a469054f27 Merge "Add OWNERS to com.android.internal.app.procstats" 2021-05-14 18:26:22 +00:00
Lee Shombert
ec0e59ec1b Merge "Cleanup the PM Computer class" into sc-dev 2021-05-14 18:05:20 +00:00
Selim Cinek
bf1113f5d9 Merge "Updating owners in core and in resources" am: 07107bead9 am: bbd0180875 am: f1715dbb78 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693525

Change-Id: I5eceb516b8ad81f8bb35654b7c827ad2e99d032e
 2021-05-14 18:02:29 +00:00
Christian Wailes
524595296b Merge "Fix error formatting issues" am: cd95e9fa3b am: f9d8fff294 am: 207d64db15 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707886

Change-Id: I648f68c5ab773b74d6ec716b220858b19c914b92
 2021-05-14 18:01:55 +00:00
lucaslin
966a00caf8 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours am: 1e169e7ef8 -s ours am: e159dbb07f -s ours am: ad158b70a3 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 0684e7a64a is already in history

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

Change-Id: Iec88e25a532e0f4cf58b78cda1c66cfb2d43785e
 2021-05-14 17:52:32 +00:00
lucaslin
fd8d4cc567 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours am: f793f6516e -s ours am: dbd1da95f1 -s ours 
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history

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

Change-Id: Ie120e42dfd07964602a2e96c5eae479bbcb718d7
 2021-05-14 17:52:06 +00:00
Nate Myren
914d11b401 [automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours am: d113b382d1 -s ours 
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 8a1085bdcb is already in history

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

Change-Id: Ibccea60d9ef0260036efde2102c5daafd40598a2
 2021-05-14 17:51:39 +00:00
Selim Cinek
f1715dbb78 Merge "Updating owners in core and in resources" am: 07107bead9 am: bbd0180875 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693525

Change-Id: Id44beedc753450f4966969e21d8332ddd69da567
 2021-05-14 17:51:16 +00:00
Christian Wailes
207d64db15 Merge "Fix error formatting issues" am: cd95e9fa3b am: f9d8fff294 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707886

Change-Id: I5d9191b062ce2d6ee86fbf2bd90b3be64f7d81e0
 2021-05-14 17:50:48 +00:00
Cyrus Boadway
01cd8a9d0a Merge "Add Widget CUJ parameter to jank monitoring" into sc-dev 2021-05-14 17:40:15 +00:00
lucaslin
4d7fb5c8aa [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours am: 1e169e7ef8 -s ours am: e159dbb07f -s ours am: 785bd0c116 -s ours am: f7c748f6ab -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: I425ba927438527d20c561801a03e81099fcae009
 2021-05-14 17:37:35 +00:00
lucaslin
eab10c2740 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours am: f793f6516e -s ours am: 0447af099d -s ours am: c0d4f24465 -s ours 
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history

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

Change-Id: I42efdbb89b77bf84e9349d3f47395403651476cc
 2021-05-14 17:37:18 +00:00
Jay Patel
25b9380d79 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: a111377f7d am: 1156f68082 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I4e109a18453b6848fb2aa256b2c73ca665aea328
 2021-05-14 17:37:01 +00:00
Jay Patel
0e65a9dafc Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: d28e890b48 am: a5b03559e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: If15c54277193abed787d72ab4f44211ab698c86c
 2021-05-14 17:36:35 +00:00
Jay Patel
7e0e8cbf60 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 8db1be84ce am: c5186a312a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I805b3c2f64d8430191a23e7ae622c37d8628f042
 2021-05-14 17:36:03 +00:00
Selim Cinek
bbd0180875 Merge "Updating owners in core and in resources" am: 07107bead9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693525

Change-Id: I261d086cd6d82fd49c4f6fafd9f6bd9b5ea6f799
 2021-05-14 17:35:52 +00:00
Jay Patel
d6082e524f Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 8f43581b46 am: 7542dc70b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I2b816053f325a2d294b5ce8f9f41f92b2447f331
 2021-05-14 17:35:39 +00:00
Jay Patel
9088aa41cd Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 1feaa9f621 am: ecf29aa930 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Ia86e85d158b375f56eeb55581abc4a6438cbe033
 2021-05-14 17:35:09 +00:00
Jay Patel
3e037b91ce Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 307b7d3ac1 am: 964497aa28 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I09d0f1b48e22786e033c695cbd73873ba78e5f65
 2021-05-14 17:34:38 +00:00
Jay Patel
c6dab41b5f Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: f58b846016 am: af91071bfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I4165a83318710a05a01cbd96e86e24a53c579722
 2021-05-14 17:34:10 +00:00
Jay Patel
76d355e5a2 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e4409e6b7e am: 87b9f9f432 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Ia305b97f5364a07de6ca020a10d0965eb4dca14a
 2021-05-14 17:33:37 +00:00
Jay Patel
afc5cd5ff5 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e71830dafc am: 645e8be668 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I32183b70efa560ca200f53492f159670d3c1f2e5
 2021-05-14 17:32:52 +00:00
Cassie Wang
5bb7eba12b Define new AppSearch global query permission. 
The role that holds this permission will have access to platform
surfaceable documents in AppSearch.

Bug: 187113133
Test: presubmit
Change-Id: Iec848e8df69c4590777eb1397ce33a445e155655
 2021-05-14 10:32:01 -07:00
Jay Patel
8a113a0ab4 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 3036d7bf83 am: b56a9f0a05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Ia710384e28ecf8d3bd01cdaf3953e77497c974cc
 2021-05-14 17:31:49 +00:00
Automerger Merge Worker
f2054d6897 Merge "[automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours am: f498567ea3 -s ours am: 4bca56e7af -s ours" into sc-dev 2021-05-14 17:30:38 +00:00
Nate Myren
8ef2c26bac [automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours am: f498567ea3 -s ours am: 4bca56e7af -s ours 
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 8a1085bdcb is already in history

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

Change-Id: Ifcfb288bdb9f793333db30691b80bce87250730e
 2021-05-14 17:30:30 +00:00
Winson Chiu
b12c5458de Merge "Print minExtensionVersions to Settings package dump" into sc-dev 2021-05-14 17:30:29 +00:00
Louis Chang
846ef0e291 [automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-qpr-dev am: 8e9e41c0f1 -s ours am: 57db689823 -s ours 
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

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

Change-Id: I23839e09269557cea2672494b267d6537911a5df
 2021-05-14 17:29:56 +00:00
lucaslin
f7c748f6ab [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours am: 1e169e7ef8 -s ours am: e159dbb07f -s ours am: 785bd0c116 -s ours 
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

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

Change-Id: I8101606ef844de1f675842c10b0e52a01e19d968
 2021-05-14 17:28:00 +00:00
Christian Wailes
f9d8fff294 Merge "Fix error formatting issues" am: cd95e9fa3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1707886

Change-Id: I4fdf71f667af2ab6f2276d53b210a892e1fca912
 2021-05-14 17:27:46 +00:00
lucaslin
c0d4f24465 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours am: f793f6516e -s ours am: 0447af099d -s ours 
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history

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

Change-Id: I4f8c1d19d371584a2ea71bf5577c82c0076361f1
 2021-05-14 17:27:33 +00:00
Jay Patel
1156f68082 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: a111377f7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I66b64d7101365185add4dbffefa4df95a787eaae
 2021-05-14 17:22:22 +00:00