Commit Graph

699374 Commits

Author SHA1 Message Date
Hans Boehm
ab030aab10 Merge "Add System.runFinalization() call" am: 8df5d94b98 am: 7358684565 am: 0ad0828a9b am: 57fa4cc366
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760810

Change-Id: I8c5119f0353447471ef43fc3a6dbe1217e0449fe
2021-07-09 21:48:57 +00:00
Hasini Gunasinghe
3df3b73fa3 Merge "Pull Keystore2CrashStats Atom." into sc-dev-plus-aosp am: 1356aad7e7 am: 68d02acbad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245530

Change-Id: Iaccf9dbe4e5ac4565e75c88bd6cb765c33aecb48
2021-07-09 21:48:32 +00:00
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
TreeHugger Robot
d4571a618a Merge "Use exact brightnesses values for comparison." into sc-dev am: 8769ff6429 am: 37e12b5386
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15221614

Change-Id: I21c98bb68bbf0d79b98f26f5eef5c63d2c8f1cbc
2021-07-09 21:05:57 +00:00
Hans Boehm
8df5d94b98 Merge "Add System.runFinalization() call" 2021-07-09 20:56:11 +00:00
TreeHugger Robot
37e12b5386 Merge "Use exact brightnesses values for comparison." into sc-dev am: 8769ff6429
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15221614

Change-Id: If814b0c662288d69d0bd1c89973d7fb52c4de95d
2021-07-09 20:48:29 +00:00
TreeHugger Robot
8769ff6429 Merge "Use exact brightnesses values for comparison." into sc-dev 2021-07-09 20:33:27 +00:00
Tiger Huang
b4496c3d1d Merge "Use the real behavior to decide the animation" into sc-dev am: 26c159d640 am: 9850c01f66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15232838

Change-Id: I3c4501dc1d140da74d42d09281561d5285d97221
2021-07-09 20:07:57 +00:00
Tiger Huang
9850c01f66 Merge "Use the real behavior to decide the animation" into sc-dev am: 26c159d640
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15232838

Change-Id: I2d7aae9c0ebf48ad1b31717ea7292582ca16f4c6
2021-07-09 19:55:23 +00:00
Tiger Huang
26c159d640 Merge "Use the real behavior to decide the animation" into sc-dev 2021-07-09 19:36:27 +00:00
TreeHugger Robot
74bb4c14c4 Merge "Make AttributedOpEntry gracefully handle empty array" into sc-dev am: 07dcb9d6dc am: ac1d51ed8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245446

Change-Id: Ideb0139302148901ff2d743a2a48fa3297dbcebf
2021-07-09 19:30:28 +00:00
Pyuli Naithani
2777cade35 Merge "Add logs for sensor privacy enable dialog." into sc-dev am: 81f862389f am: 1d549d68c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15239319

Change-Id: If4a11a919f7ca846a03cabbcaa16073d7e5b5a1b
2021-07-09 19:30:16 +00:00
Matt Casey
a7c23c9d88 Merge "Don't try to load a long screenshot image more than once" into sc-dev am: 088e0f5c7b am: 169605f6c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237355

Change-Id: I802627a8f6752a7349002515982faff1a22a104b
2021-07-09 19:28:35 +00:00
Jeff DeCew
a88913c3cf Merge "Add a gray debug line to NSSL to show the keyguard padding." 2021-07-09 19:27:38 +00:00
TreeHugger Robot
6942541b99 Merge "Ensure to release wakelock" 2021-07-09 19:14:35 +00:00
TreeHugger Robot
ac1d51ed8e Merge "Make AttributedOpEntry gracefully handle empty array" into sc-dev am: 07dcb9d6dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245446

Change-Id: Ib6612a2283b77c583d713e8b209a555c7a47275d
2021-07-09 19:12:25 +00:00
Pyuli Naithani
1d549d68c5 Merge "Add logs for sensor privacy enable dialog." into sc-dev am: 81f862389f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15239319

Change-Id: I26ecab57b954f37d1a1b94eec7d7113c9b5d0e9d
2021-07-09 19:12:08 +00:00
Matt Casey
169605f6c6 Merge "Don't try to load a long screenshot image more than once" into sc-dev am: 088e0f5c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237355

Change-Id: Ife43d28ff4d932ba890536b444dbd1f05ad10b5d
2021-07-09 19:09:53 +00:00
TreeHugger Robot
07dcb9d6dc Merge "Make AttributedOpEntry gracefully handle empty array" into sc-dev 2021-07-09 19:08:25 +00:00
Pyuli Naithani
81f862389f Merge "Add logs for sensor privacy enable dialog." into sc-dev 2021-07-09 19:01:42 +00:00
Matt Casey
088e0f5c7b Merge "Don't try to load a long screenshot image more than once" into sc-dev 2021-07-09 18:55:39 +00:00
Silin Huang
d3627fa065 Merge "Fix a bug that the QuickAccessWalletTile displaying packageName as title." into sc-dev am: 851904a45c am: 9009a0a2fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237268

Change-Id: If18e2db95179fca67d9bcc924b173cd88e45295d
2021-07-09 18:42:22 +00:00
TreeHugger Robot
9de80a409d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: dc7452c45f -s ours am: 3108e54449 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18b8067113b4676d1a408957c3a12737f186d0f3
2021-07-09 18:42:10 +00:00
Rucha Katakwar
f11be4d322 Merge "Revert "Camera: Restore FastNative annotation."" into sc-dev am: ea03a04bb8 am: 9a30218f7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241850

Change-Id: If780f59469937d5dc3ab97b47f48b8dea28a0d84
2021-07-09 18:41:27 +00:00
Silin Huang
9009a0a2fc Merge "Fix a bug that the QuickAccessWalletTile displaying packageName as title." into sc-dev am: 851904a45c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237268

Change-Id: If4ef61f74b093f7784b6f9c823a364a8d00fae08
2021-07-09 18:32:30 +00:00
TreeHugger Robot
3108e54449 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: dc7452c45f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib59534f3ef54c1e63a1835dcbbf3cb00e337ffe7
2021-07-09 18:31:29 +00:00
Rucha Katakwar
9a30218f7d Merge "Revert "Camera: Restore FastNative annotation."" into sc-dev am: ea03a04bb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241850

Change-Id: I9337fbc9e093f6e70b18372d795efe5c71107af1
2021-07-09 18:30:52 +00:00
Silin Huang
851904a45c Merge "Fix a bug that the QuickAccessWalletTile displaying packageName as title." into sc-dev 2021-07-09 18:21:57 +00:00
TreeHugger Robot
dc7452c45f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-09 18:20:53 +00:00
Rucha Katakwar
ea03a04bb8 Merge "Revert "Camera: Restore FastNative annotation."" into sc-dev 2021-07-09 18:13:07 +00:00
Manish Varma
1136e4a1c8 Merge "Revert "Enable orientation listener at all times."" into sc-dev am: f36c575bee am: 1e25b4ffc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241710

Change-Id: Iad60f0188474f827992e0f3f5e9e95b024cbde57
2021-07-09 18:01:57 +00:00
Xi Han
f0f089b2d1 Merge "Correct the flag in NetworkController." into sc-dev am: fe5022a3c8 am: 13370ae0ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225373

Change-Id: If5ce5692634707fd05ce0b96d13cb3485826fea8
2021-07-09 18:01:01 +00:00
Nate Myren
87ab9d9f5e Make AttributedOpEntry gracefully handle empty array
The inProgress/paused inProgress arraymaps should be null when empty.
However, if they are not, the code should handle this gracefully.

Test: presubmit
Fixes: 191392370
Change-Id: I7cddd5ff5452611cb067b1c77ea85dd534b360da
2021-07-09 10:55:46 -07:00
Manish Varma
1e25b4ffc0 Merge "Revert "Enable orientation listener at all times."" into sc-dev am: f36c575bee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241710

Change-Id: I1fb178ed9d85aae72a04c26954f714a640bfb25c
2021-07-09 17:48:51 +00:00
Treehugger Robot
55d44b1eda Merge "Remove hidden preconditions, binder usage in Vpn" am: 9ffdbe8b2a am: 156b5e7c9b am: 9a4f32f9a5 am: 4bf44095e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1761345

Change-Id: Icc7c760651106540bc3785666daf631376983c3d
2021-07-09 17:48:46 +00:00
Xi Han
13370ae0ec Merge "Correct the flag in NetworkController." into sc-dev am: fe5022a3c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225373

Change-Id: Ice8fc37ba8c98d2cb509d5ab43b929f0d24d1dfb
2021-07-09 17:48:25 +00:00
Yu-Han Yang
71fb1f2d52 Ensure to release wakelock
Bug: 124451539
Test: trivial refactor, presubmits passing
Change-Id: Ic731d0593fc65e9973cd6219421f4e9646da5d3a
2021-07-09 10:43:37 -07:00
Manish Varma
f36c575bee Merge "Revert "Enable orientation listener at all times."" into sc-dev 2021-07-09 17:39:47 +00:00
Xi Han
fe5022a3c8 Merge "Correct the flag in NetworkController." into sc-dev 2021-07-09 17:36:16 +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
Manish Varma
ff3268f426 Revert "Enable orientation listener at all times."
This reverts commit 7efc7a9171.

Reason for revert: seems to causing PTS PowerTest (pts/device-presubmit-power) failure  - b/193195601

Bug: 193195601

Change-Id: Ie5d25787bfff3e1f0bb7afc73ed580012eea66ae
2021-07-09 17:30:38 +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
Rucha Katakwar
4f83d813d6 Revert "Camera: Restore FastNative annotation."
Bug: 193176503

This reverts commit 99ebd95ef1.
Reason for revert: Recent flakiness as mentioned in b/193176503.This cl was merged in build:7532561. Any test failures post this build shows exception linked to CameraMetadataNative.Reverting this cl to find and fix the issue.

Change-Id: If9fe3ce69f013b842a47745d976942aa71dfb8f6
2021-07-09 17:20:57 +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
Beverly Tai
1ca2fc1d2b Merge "Don't set udfps icon visibility on illumination change" into sc-dev am: fa6a428347 am: 7aefa739f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237118

Change-Id: I212cf3c216c70d5017227075660747359052f45e
2021-07-09 17:19:05 +00:00
Songchun Fan
17d1692bef Merge "Remove @TestApi and @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into sc-dev am: 3172fe263a am: 606c9f6ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235116

Change-Id: Ibbe1cd4c41a1e264b992c4e3a3414f0296bd1a8c
2021-07-09 17:18:18 +00:00