Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
643,520 Commits 3 Branches 0 Tags
0404e29859896ed84fe4cc87bbf12ac02fa7477e
Commit Graph

643520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benedict Wong
0404e29859 Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-dev am: e0ee346120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554154

Change-Id: Ica746b130ce0dc3648817528e417640561e83e54
 2021-05-14 23:28:51 +00:00
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
86448b0666 Merge "Determine whether to support activities in multi window (8/n)" into sc-dev am: b4aec6206f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14412466

Change-Id: I6faec75617ec974c3a319accd50609a3267f2850
 2021-05-14 22:49:14 +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
33b6b0577b Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91 am: 5abb533da2 am: faf4ba40ba am: 6b09036ab8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I90fdec4a8b01f2c03f9f6b16873ecf6dfcecac82
 2021-05-14 21:20:15 +00:00
TreeHugger Robot
4896664bea Merge "Relaxing minimum alarm window requirements" into sc-dev am: 60b32709f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14542468

Change-Id: I7cd5588ce4e6ef195e4f952758c4f6040721c7c8
 2021-05-14 21:20:02 +00:00
Ahaan Ugale
1e95b895c7 Merge "Fix IndexOutOfBoundsException when calling dispatchProvideStructure()" into sc-dev am: 9e22972568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14442225

Change-Id: Ic995e087260e8ac618c10d2e8fddca593b4f8a74
 2021-05-14 21:19:50 +00:00
Connor O'Brien
8563988b5d Merge "Don't remove UID data in readKernelCpuUid*TimesLocked" into sc-dev am: 83a5e6ed18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489420

Change-Id: I9a9b2595d788d0e2395b79e3feda597e3e9b49f6
 2021-05-14 21:19:40 +00:00
TreeHugger Robot
d9712264a5 Merge "Clear updated font files in safe mode." into sc-dev am: 7c4e5a69b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743173

Change-Id: I5966bb9523b831cac243112f0004a757b1d3426e
 2021-05-14 21:19:20 +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
02e8e0f81c Merge "Add OWNERS to com.android.internal.app.procstats" am: a469054f27 am: d59dfa2fb1 am: cd6fbb1b4d am: 673a8c593c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691206

Change-Id: I191c4fb2bb53d55498721ffb5e43cd34895739c1
 2021-05-14 19:53:23 +00:00
Peter Kalauskas
374f04b103 Merge "Add tests for shouldAnimate and onDoneButtonClicked" into sc-dev am: a74aa47b9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14518676

Change-Id: Icfb56233909467ec8ec970471628bc907565ed1c
 2021-05-14 19:53:02 +00:00
Cassie Wang
04cca7db43 Merge "Define new AppSearch global query permission." into sc-dev am: 071219037b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14415736

Change-Id: I75cf8df22e8f7aa321da81c8576305cdb0a329c0
 2021-05-14 19:52:19 +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
527588a024 Merge "Use getUahDischarge when available" into sc-dev am: 4d78cddfef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14535945

Change-Id: I29b5db74b2612a065e15463eab7122bff035c772
 2021-05-14 18:52:58 +00:00
Kevin Chyn
e84f1c227c Merge changes I9761c313,I25dacbfa into sc-dev am: f7b45b69e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14537656

Change-Id: I95bfb176e3d9a9aad701941da71351cb776f53dd
 2021-05-14 18:52:43 +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
6cf8d80104 Merge "Cleanup the PM Computer class" into sc-dev am: ec0e59ec1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14532868

Change-Id: I7f9674328599992187ab747d22157114df98545e
 2021-05-14 18:20:46 +00:00
Selim Cinek
154bc84442 Merge "Updating owners in core and in resources" am: 07107bead9 am: bbd0180875 am: f1715dbb78 am: bf1113f5d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1693525

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

Change-Id: Ifa4468cf22f2cc978ffc74cdb12f6024be03cb28
 2021-05-14 18:20:01 +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
4133c3b8e1 [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: 966a00caf8 -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: Icafa890c1c89b4a10b409560d28b888b07ae168e
 2021-05-14 17:57:38 +00:00
lucaslin
0f5e4dd1a0 [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: fd8d4cc567 -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: I2a139f152719aa44992dd082d9ad81a38490426d
 2021-05-14 17:57:29 +00:00
Nate Myren
09b024ebcc [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: 914d11b401 -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: I93e6cc64b5185fa46b403c63a7ac0f3055b393e8
 2021-05-14 17:57:20 +00:00
Cyrus Boadway
55fe1e3247 Merge "Add Widget CUJ parameter to jank monitoring" into sc-dev am: 01cd8a9d0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467702

Change-Id: I466fc50b4caeb199ca0802ab34ff870a6e21d539
 2021-05-14 17:56:58 +00:00
lucaslin
17045b56be [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: 4d7fb5c8aa -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: I3bd76b2257962ba967c61f0c152cd198e747b309
 2021-05-14 17:56:09 +00:00
lucaslin
eff9051286 [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: eab10c2740 -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: I72a6038d3c614a0e73952e8ab7d6d490c18e905a
 2021-05-14 17:55:58 +00:00
Jay Patel
1b74b3e95d Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: a111377f7d am: 1156f68082 am: 25b9380d79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

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

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

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

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

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

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

Change-Id: I6233e3f1817f0bad24702f080c4a66cf369a4a84
 2021-05-14 17:54:37 +00:00