Hans Boehm
57fa4cc366
Merge "Add System.runFinalization() call" am: 8df5d94b98 am: 7358684565 am: 0ad0828a9b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760810
Change-Id: I699bc013f7fcb65f630d3ff428ec1971d7b78f02
2021-07-09 21:32:08 +00:00
Hasini Gunasinghe
68d02acbad
Merge "Pull Keystore2CrashStats Atom." into sc-dev-plus-aosp am: 1356aad7e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245530
Change-Id: I52687409df224ec97aa3893d4c24bfffbc6156ea
2021-07-09 21:31:23 +00:00
Hans Boehm
0ad0828a9b
Merge "Add System.runFinalization() call" am: 8df5d94b98 am: 7358684565
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760810
Change-Id: I96f6ce06333ae3527d5b43fcdb7e31edd434fd47
2021-07-09 21:21:37 +00:00
Hasini Gunasinghe
1356aad7e7
Merge "Pull Keystore2CrashStats Atom." into sc-dev-plus-aosp
2021-07-09 21:21:06 +00:00
Hans Boehm
7358684565
Merge "Add System.runFinalization() call" am: 8df5d94b98
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760810
Change-Id: I867df303b8da1b9748e5a775dd8bf4a1b910c434
2021-07-09 21:12:28 +00:00
Hans Boehm
8df5d94b98
Merge "Add System.runFinalization() call"
2021-07-09 20:56:11 +00:00
Treehugger Robot
4bf44095e2
Merge "Remove hidden preconditions, binder usage in Vpn" am: 9ffdbe8b2a am: 156b5e7c9b am: 9a4f32f9a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1761345
Change-Id: I6680cb02de535c62a3776e343a47df7932faca9d
2021-07-09 17:30:58 +00:00
Hans Boehm
f312275581
Add System.runFinalization() call
...
Lone calls to System.gc() generally don't do anything.
Runtime.getRuntime().gc() would force a GC, but it would be ineffective
without waiting for reference processing and finalization to complete.
Adding the runFinalization() call implicitly makes the preceding GC call
effective.
Bug: 183912710
Test: Treehugger
Change-Id: I0f4806b8e3f9ca898eb7ea1b1c8de14aa94e2646
2021-07-09 17:25:19 +00:00
Hasini Gunasinghe
3c2f1d60be
Pull Keystore2CrashStats Atom.
...
Ignore-AOSP-First: Merge conflict resolution of another CL in the topic.
Bug: 188590587
Test: statsd TestDrive script.
Change-Id: I06b56eaa5a32317c22aa5abdb2adaff7593c7721
2021-07-09 17:20:49 +00:00
Treehugger Robot
9a4f32f9a5
Merge "Remove hidden preconditions, binder usage in Vpn" am: 9ffdbe8b2a am: 156b5e7c9b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1761345
Change-Id: I7f2854a11806066a4caf540380990546cd05bbe7
2021-07-09 17:17:34 +00:00
Treehugger Robot
156b5e7c9b
Merge "Remove hidden preconditions, binder usage in Vpn" am: 9ffdbe8b2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1761345
Change-Id: I24c1839e4be23eb36962edb773c6414a79231f35
2021-07-09 16:55:42 +00:00
Treehugger Robot
9ffdbe8b2a
Merge "Remove hidden preconditions, binder usage in Vpn"
2021-07-09 16:43:19 +00:00
Johanna Ye
53b9baf6a3
[automerger skipped] Merge "Fix long characteristic write concurrency bug." am: cfa6f14403 am: 4422794e1f -s ours am: f5aa7cbc6c -s ours
...
am skip reason: Merged-In I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1 with SHA-1 37343d1d6e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1752680
Change-Id: Iae982b6a248e662f6ac3ed4af59738aa24493358
2021-07-09 16:32:44 +00:00
Johanna Ye
f5aa7cbc6c
[automerger skipped] Merge "Fix long characteristic write concurrency bug." am: cfa6f14403 am: 4422794e1f -s ours
...
am skip reason: Merged-In I3e3a5ff0965c1ca4f79e70e6163bc5d6917edbd1 with SHA-1 37343d1d6e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1752680
Change-Id: I6d312fe6edfe822e614310ae854da3d6cd0de43c
2021-07-09 16:15:09 +00:00
Johanna Ye
4422794e1f
Merge "Fix long characteristic write concurrency bug." am: cfa6f14403
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1752680
Change-Id: Ibf0f60dd5fbb78836f5c6b262d7653e507c8724d
2021-07-09 15:57:33 +00:00
Nathalie Le Clair
0b09608df3
Merge "HDMICEC: Add equals test for ActiveSource" into sc-dev-plus-aosp am: 4767305621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235799
Change-Id: Ie559da81b68c44498440082561ac1233578e9554
2021-07-09 15:50:43 +00:00
Johanna Ye
cfa6f14403
Merge "Fix long characteristic write concurrency bug."
2021-07-09 15:39:32 +00:00
Nathalie Le Clair
4767305621
Merge "HDMICEC: Add equals test for ActiveSource" into sc-dev-plus-aosp
2021-07-09 15:37:14 +00:00
Bram Bonné
b4a445c22f
Merge "Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT" am: 5755c2ad32 am: d21dfb5e81 am: a3300b7943
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760270
Change-Id: I760815f56e5d12fc53413df467e76d6ace248021
2021-07-09 13:16:11 +00:00
Bram Bonné
a3300b7943
Merge "Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT" am: 5755c2ad32 am: d21dfb5e81
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760270
Change-Id: I47f1acb8beaee7177be3d0edd6c7e2c8a2ee9009
2021-07-09 13:04:11 +00:00
Bram Bonné
d21dfb5e81
Merge "Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT" am: 5755c2ad32
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760270
Change-Id: Ibb09f898195e4195e5e5235147d8ed0fccd644c9
2021-07-09 12:49:31 +00:00
Bram Bonné
5755c2ad32
Merge "Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT"
2021-07-09 12:35:48 +00:00
Johanna Ye
fb6f5ac6e7
Merge "Fix long characteristic write concurrency bug." into sc-dev-plus-aosp am: dad2385daf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15105259
Change-Id: Id96e9b0b86cbe03b4f086329096ac770aca5afd9
2021-07-09 12:18:09 +00:00
Johanna Ye
dad2385daf
Merge "Fix long characteristic write concurrency bug." into sc-dev-plus-aosp
2021-07-09 12:06:58 +00:00
Bram Bonné
7ac9a05dbe
Map SELINUX_LATEST_CHANGES to Build.CUR_DEVELOPMENT
...
The SELINUX_LATEST_CHANGES AppCompat flag should always put the app in
the SELinux domain targeting the current release. Fixing its target SDK
to CUR_DEVELOPMENT ensures that it always gets added to the latest
SELinux domain.
Bug: 193151214
Bug: 171572148
Test: atest CtsSelinuxTargetSdkCurrentTestCases
Test: atest CtsSelinuxTargetSdk30TestCases
Test: atest CtsSelinuxTargetSdk29TestCases
Test: atest CtsSelinuxTargetSdk28TestCases
Test: atest CtsSelinuxTargetSdk27TestCases
Test: atest CompatChangesSelinuxTest
Change-Id: I643a65e79e076518c27c31d05229ee509fa35ec5
2021-07-09 11:37:24 +02:00
Venkatarama NG. Avadhani
b886ab4847
HDMICEC: Add equals test for ActiveSource
...
Add an equality test for the nested class ActiveSource in
HdmiCecLocalDevice.
Bug: 168713324
Test: atest HdmiCecLocalDeviceTest#testEqualsActiveSource
Change-Id: I1312004c3a91d8638033c9bb815f3dd61eb3f8cc
2021-07-09 09:35:27 +00:00
Remi NGUYEN VAN
053df0e78c
Remove hidden preconditions, binder usage in Vpn
...
The hidden APIs cause problems when Vpn is used in connectivity tests,
as their package (com.android.internal.util for Preconditions and
ThrowingRunnable used by lambdas) gets jarjared by Connectivity, but the
utils are not actually statically linked into the tests.
Remove usage of the hidden utilities, which will also be useful if Vpn
needs to build against SDK in the near future.
Bug: 187935317
Test: atest ConnectivityCoverageTests:ConnectivityServiceTest
Change-Id: I6152f07e7e88a88c202d78f03e370173fdd9a016
2021-07-09 14:49:41 +09:00
Lucas Lin
9c81a2a24d
[automerger skipped] Merge "Remove the dependency of dnsresolver_aidl_interface-java" am: 9e3abef9b3 am: 09f0c84074 -s ours am: 92ce1cd65b -s ours
...
am skip reason: Merged-In Id229f68404ddf50a5ed8da800a3dbe8acead2d20 with SHA-1 937595cf2b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1759249
Change-Id: I061300ff0f34a6cc43281e543b78d0e3b27b2722
2021-07-09 03:57:20 +00:00
Lucas Lin
92ce1cd65b
[automerger skipped] Merge "Remove the dependency of dnsresolver_aidl_interface-java" am: 9e3abef9b3 am: 09f0c84074 -s ours
...
am skip reason: Merged-In Id229f68404ddf50a5ed8da800a3dbe8acead2d20 with SHA-1 937595cf2b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1759249
Change-Id: I407ffb3cc5915bf0737df04255b0e7aa41ff34bf
2021-07-09 03:38:05 +00:00
Lucas Lin
09f0c84074
Merge "Remove the dependency of dnsresolver_aidl_interface-java" am: 9e3abef9b3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1759249
Change-Id: Ic2661e440b7d39e5b48923c9660dd8cebf905e09
2021-07-09 03:21:07 +00:00
Lucas Lin
9e3abef9b3
Merge "Remove the dependency of dnsresolver_aidl_interface-java"
2021-07-09 03:03:23 +00:00
Automerger Merge Worker
2cabc563c2
Merge "Merge "Document the standby bucket guarantee" into sc-dev am: 52b72fab44 am: 46fb2e364f" into sc-v2-dev-plus-aosp
2021-07-08 23:37:05 +00:00
TreeHugger Robot
5bc6b55794
Merge "Document the standby bucket guarantee" into sc-dev am: 52b72fab44 am: ec769df23e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182383
Change-Id: Ic40569f4033b34730f3f5c4edec78ee4376809b2
2021-07-08 23:36:57 +00:00
TreeHugger Robot
69b055150c
Merge "Document the standby bucket guarantee" into sc-dev am: 52b72fab44 am: 46fb2e364f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182383
Change-Id: I71f71a60beeac17b35322db88ddefeabe4604f71
2021-07-08 23:36:55 +00:00
Automerger Merge Worker
ecdcd0c6c7
Merge "Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfdefd am: 0d57b0bb46" into sc-v2-dev-plus-aosp
2021-07-08 23:36:46 +00:00
Julia Reynolds
dc8e93f1de
Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfdefd am: 04f1765577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15216094
Change-Id: I69a1cf3caae39737750dd98523869f27e9f8be08
2021-07-08 23:36:28 +00:00
Julia Reynolds
f355e66aaf
Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfdefd am: 0d57b0bb46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15216094
Change-Id: Ibe02e7efe3fce88a1e95b3060c12b37c4e08a80b
2021-07-08 23:36:28 +00:00
TreeHugger Robot
ec769df23e
Merge "Document the standby bucket guarantee" into sc-dev am: 52b72fab44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182383
Change-Id: Ic8e9c06a98f19abd3831a17b708d016645f4bad9
2021-07-08 23:32:31 +00:00
TreeHugger Robot
46fb2e364f
Merge "Document the standby bucket guarantee" into sc-dev am: 52b72fab44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15182383
Change-Id: I8be2daacde7f7fa9731f68c599968790eebc470c
2021-07-08 23:31:35 +00:00
TreeHugger Robot
52b72fab44
Merge "Document the standby bucket guarantee" into sc-dev
2021-07-08 23:26:59 +00:00
Julia Reynolds
0d57b0bb46
Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfdefd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15216094
Change-Id: I613ee28c935e58a8a4f45cdcd3caa78baff33959
2021-07-08 23:25:08 +00:00
Julia Reynolds
04f1765577
Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev am: a2c2bfdefd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15216094
Change-Id: I0c984f6a9d3a304f11f66b87e4b0e5885cd0e173
2021-07-08 23:24:09 +00:00
Julia Reynolds
a2c2bfdefd
Merge "Fixed an issue where the heads up were not rounded during bypass" into sc-dev
2021-07-08 23:13:23 +00:00
Beverly Tai
ccfe6fb1ca
Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev am: ec1a26e36c am: 52bb2777fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235696
Change-Id: I0bd355f7d59a8d1da6965ee085a5057282ddb1a6
2021-07-08 23:10:28 +00:00
Beverly Tai
50634917f7
Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev am: ec1a26e36c am: d8e70b826e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235696
Change-Id: Id41d5b7be68fc12b7e88ade291e45cf3d785da0e
2021-07-08 23:10:15 +00:00
Automerger Merge Worker
b6240883b4
Merge "Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev am: 6fbb5bec73 am: 0d42d4725d" into sc-v2-dev-plus-aosp
2021-07-08 23:10:06 +00:00
Beverly Tai
7ef2303846
Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev am: 6fbb5bec73 am: bf150588ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235157
Change-Id: Ifa3692bc7021f97f1313481f9acb824c25eb180b
2021-07-08 23:09:53 +00:00
Beverly Tai
9cad701e93
Merge "Only hide udfps bouncer when transitioning TO doze" into sc-dev am: 6fbb5bec73 am: 0d42d4725d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235157
Change-Id: I9e39d829304aae51afe55a31c7abb02eed72ed09
2021-07-08 23:09:49 +00:00
Beverly Tai
52bb2777fc
Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev am: ec1a26e36c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235696
Change-Id: I685d0dcf237a9c8549d42e63d95ce4392d4bb7f1
2021-07-08 22:55:51 +00:00
Beverly Tai
d8e70b826e
Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev am: ec1a26e36c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235696
Change-Id: Iad4247665c9a0df18ca9bd2b14d546a7c87aed1b
2021-07-08 22:55:23 +00:00