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

641708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Buynytskyy
b671da2409 Merge "API feedback with better documentation." into sc-dev am: 2a3eef7ab6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162035

Change-Id: I5e882bf133600306be95c1f894d9bed6ea7ade9a
 2021-04-13 16:04:24 +00:00
Cecilia Hong
43650cb4e7 Merge "Rename the Smartspace media recommendation layout to avoid potential mismatch." into sc-dev am: f5d92d840a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162407

Change-Id: Icc9ecce0d3a9c6d471805014f94105c67064d6f7
 2021-04-13 16:04:06 +00:00
Felipe Leme
194292c6e1 Integrated policy-exempt apps into isLockTaskPermitted(). am: 473d4e111c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116705

Change-Id: I2160f89c8f9750dd8c242b973e00bbb5c60e85a6
 2021-04-13 16:03:26 +00:00
Alex Buynytskyy
2a3eef7ab6 Merge "API feedback with better documentation." into sc-dev 2021-04-13 15:53:20 +00:00
Cecilia Hong
f5d92d840a Merge "Rename the Smartspace media recommendation layout to avoid potential mismatch." into sc-dev 2021-04-13 15:49:09 +00:00
Felipe Leme
473d4e111c Integrated policy-exempt apps into isLockTaskPermitted(). 
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testIsLockTaskPermitted_includesPolicyExemptApps # on phone and automotive

Bug: 181238156
Change-Id: Ic2e9195beba55b3d8e69e437e564ff092c22db61
 2021-04-13 15:45:40 +00:00
Anton Hansson
9f6d882473 [automerger skipped] Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361 am: ceebf83ddb -s ours am: 2e13934402 -s ours 
am skip reason: skip tag Change-Id I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd with SHA-1 31fb58bd22 is already in history

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

Change-Id: I62c4fa0a5f7073fb6eb76ccc9cb08277616d06b0
 2021-04-13 15:42:12 +00:00
Anton Hansson
b88ee21ba6 [automerger skipped] Move font tool build rules to subdir am: 702aa95096 am: 7e27fd99aa am: 234ee47342 -s ours am: 78f4166e02 -s ours 
am skip reason: skip tag Change-Id I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b with SHA-1 9f9f90b260 is already in history

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

Change-Id: Ife612a9e0e28fc60d8d9eac36b55ea1a3177f709
 2021-04-13 15:42:09 +00:00
Anton Hansson
1d7bddf50c [automerger skipped] Move build modules from top-level to core/java/ am: 84918d5674 am: 5ed18f82f3 am: d8e8c2a626 -s ours am: 4539982070 -s ours 
am skip reason: skip tag Change-Id I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b with SHA-1 55e59cbf48 is already in history

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

Change-Id: I5c98164990dffcbba3cb1de429bf1f4fa48dae7c
 2021-04-13 15:42:06 +00:00
Jeff Sharkey
cb67818f9c Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e am: 6bc88ceb5d am: 20d60d45d6 am: 51f9651bda 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I43df5677885ca471deb507f81aea03d788780c0e
 2021-04-13 15:41:35 +00:00
Anna Zappone
a959f515ea Merge "Set theme and support dark mode in People widgets" into sc-dev am: daddfada40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116767

Change-Id: I78cfdd642999804dacfb44d94d37b9bf7b3282a7
 2021-04-13 15:41:08 +00:00
Anton Hansson
2e13934402 [automerger skipped] Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361 am: ceebf83ddb -s ours 
am skip reason: skip tag Change-Id I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd with SHA-1 31fb58bd22 is already in history

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

Change-Id: I8b6efdc5ef92dbb8bd312433d6cacb2a01bc7706
 2021-04-13 15:25:05 +00:00
Anton Hansson
78f4166e02 [automerger skipped] Move font tool build rules to subdir am: 702aa95096 am: 7e27fd99aa am: 234ee47342 -s ours 
am skip reason: skip tag Change-Id I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b with SHA-1 9f9f90b260 is already in history

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

Change-Id: I24de37b1aa57ea91695ab16ebb58cc8343077301
 2021-04-13 15:24:56 +00:00
Anton Hansson
4539982070 [automerger skipped] Move build modules from top-level to core/java/ am: 84918d5674 am: 5ed18f82f3 am: d8e8c2a626 -s ours 
am skip reason: skip tag Change-Id I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b with SHA-1 55e59cbf48 is already in history

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

Change-Id: Idb1f9c624676ade66e7f5dfc7d05a08faae2cad4
 2021-04-13 15:24:48 +00:00
Jeff Sharkey
51f9651bda Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e am: 6bc88ceb5d am: 20d60d45d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I7125dfadbe2e449ee92f2652590790d6d34439b9
 2021-04-13 15:23:52 +00:00
Anna Zappone
daddfada40 Merge "Set theme and support dark mode in People widgets" into sc-dev 2021-04-13 15:20:27 +00:00
Anna Zappone
198edc5b84 Merge "Use new widget functionality to reconfigure widget" into sc-dev am: a373e1ed5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140782

Change-Id: I6d57094f39fdfaee768eec3243da3bc3bc9767ef
 2021-04-13 15:18:30 +00:00
Anna Zappone
a373e1ed5a Merge "Use new widget functionality to reconfigure widget" into sc-dev 2021-04-13 15:06:18 +00:00
Chiachang Wang
abc79680ce Merge "Remove hidden connectivity method access in FrameworksVcnTests" into sc-dev am: 9420094fba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170753

Change-Id: I988d2ea65dd292226bfeb289d30065cd0a80013a
 2021-04-13 15:01:23 +00:00
Chavi Weingarten
4cb000af32 Merge "Remove filtering option for display hash." into sc-dev am: ca10b476ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103689

Change-Id: I1dd9553215e71321e107b23203b2efa65da9ba09
 2021-04-13 15:01:06 +00:00
Charles Chen
ddb4c83f18 Merge "Enable WindowContext to associate with WindowToken" into sc-dev am: 030a75463e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018005

Change-Id: I292abff399ff48f43a5d99b3033ad900c15b9d5c
 2021-04-13 15:00:48 +00:00
Pedro Loureiro
7298497319 Merge "Add lint baseline to address NewApi errors" into sc-dev am: 6e62271c43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13709187

Change-Id: I44b5d641e440a4adce9af602dfb75ed119655bc3
 2021-04-13 14:56:38 +00:00
Chiachang Wang
9420094fba Merge "Remove hidden connectivity method access in FrameworksVcnTests" into sc-dev 2021-04-13 14:50:15 +00:00
Anton Hansson
ceebf83ddb Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673390

Change-Id: I5545e8cf6acdf135cdae390329c548be82190812
 2021-04-13 14:36:13 +00:00
Anton Hansson
234ee47342 Move font tool build rules to subdir am: 702aa95096 am: 7e27fd99aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673389

Change-Id: I1de08801da39ab02fec3f5fdbc80d0656ee4b937
 2021-04-13 14:36:11 +00:00
Anton Hansson
d8e8c2a626 Move build modules from top-level to core/java/ am: 84918d5674 am: 5ed18f82f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673386

Change-Id: Id6e54b03046bff5e5df85ba5ceeaacdac57b28f5
 2021-04-13 14:36:07 +00:00
Jeff Sharkey
20d60d45d6 Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e am: 6bc88ceb5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I7efc1e28bf4317d1add5abc6b242babe86b1f0ac
 2021-04-13 14:34:54 +00:00
Chavi Weingarten
ca10b476ea Merge "Remove filtering option for display hash." into sc-dev 2021-04-13 14:31:54 +00:00
Charles Chen
030a75463e Merge "Enable WindowContext to associate with WindowToken" into sc-dev 2021-04-13 14:29:44 +00:00
Pedro Loureiro
6e62271c43 Merge "Add lint baseline to address NewApi errors" into sc-dev 2021-04-13 14:12:41 +00:00
Anton Hansson
7f06596361 Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673390

Change-Id: I7fa6f421b3ec88af5711ef9c46a0dbd08ff29652
 2021-04-13 14:04:48 +00:00
Anton Hansson
7e27fd99aa Move font tool build rules to subdir am: 702aa95096 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673389

Change-Id: Idbf084313f8abcae9caaad94db798c501b1d8f4a
 2021-04-13 14:01:35 +00:00
Anton Hansson
5ed18f82f3 Move build modules from top-level to core/java/ am: 84918d5674 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673386

Change-Id: I401ed248f28f593e46689a66574c4e50f1ce18b2
 2021-04-13 13:59:06 +00:00
Matt Casey
e22fe8d3a5 Merge "Hide CropView until the image is ready." into sc-dev am: ece5535c18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14160857

Change-Id: I5b8a6936b28a6ea65d1a6b7eda10bfefcf6050eb
 2021-04-13 13:50:04 +00:00
Chiachang Wang
34f1c5331a Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev am: fc4bb78d27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161098

Change-Id: I66867233654b8e8d44ddec6c0fb7018ea67d49e6
 2021-04-13 13:49:27 +00:00
Paul Duffin
5ea3c34286 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e am: 26efc48ba8 am: 62f16e59e1 am: bf05d0ee6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: I359f2adba234006dee811938d19d4caacb16a43c
 2021-04-13 13:47:05 +00:00
Jeff Sharkey
6bc88ceb5d Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I79233c4e5cc6b6e78143eb264460b4e5121b95e0
 2021-04-13 13:46:57 +00:00
Matt Casey
ece5535c18 Merge "Hide CropView until the image is ready." into sc-dev 2021-04-13 13:29:01 +00:00
Chiachang Wang
fc4bb78d27 Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev 2021-04-13 13:27:45 +00:00
Chiachang Wang
6dca0114c4 Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807 am: 155b09614e am: 6a6a5e776c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: I3121bd9c49162a20b3e3a7906affbce6a67279fc
 2021-04-13 13:22:53 +00:00
Fiona Campbell
480d072987 Merge "Pass Immutable flag to vr intent" into sc-dev am: e5c8cea568 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127236

Change-Id: Ie2e1a20773ceca2792de0c658c2ac08d7d71b245
 2021-04-13 13:22:28 +00:00
Paul Duffin
bf05d0ee6d Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e am: 26efc48ba8 am: 62f16e59e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: I250937c71dfcf7868c6074eae28d3ecbf2892e79
 2021-04-13 13:08:09 +00:00
Chiachang Wang
6a6a5e776c Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807 am: 155b09614e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Ic0b7887630c00404ff354c193b82a96930940556
 2021-04-13 13:06:43 +00:00
Fiona Campbell
e5c8cea568 Merge "Pass Immutable flag to vr intent" into sc-dev 2021-04-13 13:02:44 +00:00
Anton Hansson
fd7056c7c9 Merge changes I5719ba0f,I5f3106b7,I3fd90c2d 
* changes:
  Move framework proto build rules to separate file
  Move font tool build rules to subdir
  Move build modules from top-level to core/java/
 2021-04-13 12:57:12 +00:00
Jeff Sharkey
15ee3b3c0e Merge "uwb: Add owners for uwb service" 2021-04-13 12:56:41 +00:00
Chiachang Wang
18f3a26efa Remove hidden connectivity method access in FrameworksVcnTests 
Due to connectivity modularization work, hidden connectivity
methods and members are not accessible outside the module.
Remove the corresponding usage.

The test case in VcnNetworkProviderTest are not able to create
NetworkRequests with request id assigned. The loop to create
different request is removed. After that, the test does not
provide more test coverage than other tests. Thus, Remove the
test case directly.

Bug: 182859030
Test: atest FrameworksVcnTests
Change-Id: I488f62089d1dbe93c232f892885d944bef896df6
 2021-04-13 20:21:21 +08:00
Anton Hansson
3df2e16950 Merge changes from topics "based", "jref" into sc-dev am: 5683fda342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161634

Change-Id: Idb06d5d3d33ae7e713ae2774bfe0846c8b838701
 2021-04-13 12:15:28 +00:00
Paul Duffin
62f16e59e1 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e am: 26efc48ba8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: I85a771a4c64241a93a48de8161722e2700047b96
 2021-04-13 12:15:17 +00:00
Riddle Hsu
af2cacc032 Merge "Consolidate filling of window frames and config for client" into sc-dev am: 1d55f8ecbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14099052

Change-Id: Icb8a2b9881c70d3a0132bf80400647d02845206b
 2021-04-13 12:14:55 +00:00