Commit Graph

19121 Commits

Author SHA1 Message Date
Miranda Kephart
2584f20d58 Merge changes Iffb62170,I9b795928 into tm-qpr-dev am: 4658046b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20007505

Change-Id: I1c6415729dd96888303831a4fa182d8baf1e057a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 19:32:09 +00:00
Miranda Kephart
4658046b52 Merge changes Iffb62170,I9b795928 into tm-qpr-dev
* changes:
  Clean up leaked screenshot connections
  Always reset screenshot preview to alpha=1
2022-09-22 19:13:56 +00:00
Lucas Silva
b6fa124dc9 Merge "Add additional logging to dream enforcement logic to debug failures." into tm-qpr-dev am: 591f54ba80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970255

Change-Id: Iba9816ef1e6db30c5228589e6a77a5f5b9ef0f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:36:50 +00:00
Lucas Silva
591f54ba80 Merge "Add additional logging to dream enforcement logic to debug failures." into tm-qpr-dev 2022-09-22 14:46:45 +00:00
Miranda Kephart
9f8f1fd9a7 Clean up leaked screenshot connections
If a subsequent screenshot is taken after we bind to the screenshot
service, but before we get the onServiceConnected callback, we
leak the connection to the service, preventing it from ever getting
shut down. Fix this by unbinding the old connection before connecting
with the new one.

Bug: 242862442
Fix: 242862442
Test: forced DisplayPolicy to take two consecutive screenshots

Change-Id: Iffb62170266a2c1bb332bfb416f0f5e19c5236fb
2022-09-22 14:20:38 +00:00
Nick Chameyev
b35a6c0829 Merge "Do not use pool of SimpleIconFactory objects in Chooser/ResolverActivity" into tm-qpr-dev am: cbb45c6814
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952284

Change-Id: Ied1239518758bd583218ccbb6f59dc22ac7ae789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:21:52 +00:00
Derek Jedral
d6eff4971c Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev am: a20c6a4cf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970372

Change-Id: I1007d99c24b9d804a8f196ae7ca855e4ff91cd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:18:42 +00:00
Mythri Alle
f973b28aa0 Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca37 am: a1b0512a78 am: 59afb30fdb am: e14b396e68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217921

Change-Id: I3ad547777dcfaf69718f68ac0c9a1824f06f371f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:12:01 +00:00
Mythri Alle
59afb30fdb Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca37 am: a1b0512a78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217921

Change-Id: I27a3ba70e4da3a93d39abeb539366e5b959750fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:58:15 +00:00
Jason Sun
84435238c4 Merge "Auto enable new system trust agents" into tm-qpr-dev am: 73ce3e64f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19824313

Change-Id: I79539f4e42c07d9eb694389febb0b32c15a2b265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:37:29 +00:00
Nick Chameyev
cbb45c6814 Merge "Do not use pool of SimpleIconFactory objects in Chooser/ResolverActivity" into tm-qpr-dev 2022-09-21 17:40:52 +00:00
Mythri Alle
f3683fca37 Merge "Reland "Don't enable jdwp by default on userdebug builds""" 2022-09-21 07:49:34 +00:00
Derek Jedral
140516bf65 Fix TrustAgent showing unclear string.
TrustAgents currently show the string "Device was locked manually" if
the trustagent times out, or if lockUser() was called. Changed to show a
more generic string, informing the user that they need to authenticate
with whatever credentials they have set up (instead of using the
trustagent).

Test: Test trustagent timeout, lockUser, verify string appears
Bug: 243710694
Change-Id: I96b113ab3ae63123782517339b0bdb3c6cdec2e2
2022-09-20 21:07:15 +00:00
Jason Sun
73ce3e64f0 Merge "Auto enable new system trust agents" into tm-qpr-dev 2022-09-20 19:48:17 +00:00
Nick Chameyev
bcec37aef9 Do not use pool of SimpleIconFactory objects in Chooser/ResolverActivity
Disables pooling of SimpleIconFactory objects as it caches
density which could be changed in runtime in tests.

Test: presubmit
Bug: 245354130
Change-Id: I124e02e078ba7e6ed3a42b543698c2758e5d0c0e
2022-09-20 17:02:08 +00:00
Orion Hodson
0d6ff93e5e Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4 am: f43a706e53 am: 53e69c7eb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216444

Change-Id: I91f8849596f8dc62be4dcf49d46cac41fdee4e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 15:32:15 +00:00
Wu Ahan
9a54da6d23 Merge "DO NOT MERGE: Enable presubmit for com.android.internal.jank" into tm-qpr-dev 2022-09-20 13:11:48 +00:00
Orion Hodson
f43a706e53 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216444

Change-Id: I353181417b100675b65f0f2eaedf93748f747e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 12:01:07 +00:00
Orion Hodson
773627cfd3 Merge "Prefer valueOf() to boxed primitive constructors" 2022-09-20 07:40:59 +00:00
Lucas Silva
5ec702b7b0 Add additional logging to dream enforcement logic to debug failures.
Bug: 246091760
Test: n/a
Change-Id: I171225b28e0661bf0a0b1b0ef6bdb3a4e85f64ea
2022-09-20 00:49:57 -04:00
Ahan Wu
87c0106ea7 DO NOT MERGE: Enable presubmit for com.android.internal.jank
This CL consists of following parts:
 - TEST_MAPPING files for presubmit.
 - Correct CUJ constant definitions in LatencyTracker.
 - Use auto-generated enum constants instead of hardcoded
   numbers in LatencyTracker.
 - Create LatencyTrackerTest to test:
   - The constant names of CUJ definitions should be the same with
     corresponding enum names.
   - The amount of CUJ definitions should be the same with
     the amount of enums, means both must be added at the same time.
   - The static getNameOfXX() methods return just the name of the
     CUJ constant definitions.
   - The CUJ constant definitions has 1:1 mapping onto the enums.

Bug: 245250904
Test: check TH if FrameworksCoreTests is triggered
Test: atest FrameTrackerTest InteractionJankMonitorTest
Test: atest LatencyTrackerTest
Change-Id: I0a6f403694039aec6b9ce44254f6c5cab531f765
Merged-In: Ibddd36410a0d4a909522de011f23a337b53d6889
2022-09-19 13:48:08 +00:00
Ryan Zuklie
e92778a65e Merge "Export BatteryStats info to Atrace." into tm-qpr-dev am: 745d055d20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19901887

Change-Id: Id86f2b027d7579dca6249d0ce841ffc3e66c6740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 23:20:31 +00:00
Ryan Zuklie
745d055d20 Merge "Export BatteryStats info to Atrace." into tm-qpr-dev 2022-09-16 23:09:20 +00:00
Mythri Alle
0fc653c307 Reland "Don't enable jdwp by default on userdebug builds""
This reverts commit 50c258ca37.

Reason for revert: Relanding after fixes for the failures Fixes:
1. Mark the com.android.perftests.core as profileable from shell so
that we would be able to read /proc/self/io
2. Fix a JDWP test to expect the new behaviour on userdebug builds.
We can no longer attach debugger on profileable apps on userdebug builds

Bug: 240410400, 246616689
Test: System boots
Change-Id: I6fff6f1a683893244bc2d40f930044747befb2ce
2022-09-15 14:33:36 +00:00
Mythri Alle
9b60a6d16d Merge "Revert "Don't enable jdwp by default on userdebug builds"" am: e6a7509dbc am: a9cc544dbf am: 7d4c0fec93 am: 38333df066
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216445

Change-Id: Ifff7c4493145d6e4c283b5e5df1a14d2b2b516b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 17:15:49 +00:00
Mythri Alle
7d4c0fec93 Merge "Revert "Don't enable jdwp by default on userdebug builds"" am: e6a7509dbc am: a9cc544dbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216445

Change-Id: I47e373c97837014c838c6b13d4027965baeffb06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 16:20:27 +00:00
Mythri Alle
50c258ca37 Revert "Don't enable jdwp by default on userdebug builds"
This reverts commit 1b989de3d7.

Reason for revert: Test failures:
https://b.corp.google.com/issues/246707198
https://buganizer.corp.google.com/issues/246616689

Change-Id: Ibeb5a92bcfe129df01f94bec2a41fea57303e53e
2022-09-14 09:57:03 +00:00
Orion Hodson
ebe28b0254 Prefer valueOf() to boxed primitive constructors
Constructors for boxed primitives (Byte, Short, Integer, etc) have
long been deprecated. The preferred pattern is to use valueOf(). d8
fails to convert these instances in TypedProperties, most likely due
to the method complexity.

Bug: N/A
Test: Treehugger
Change-Id: Ib58ecc853e2bd1e5d53e9ec256ef0467aa051d9f
2022-09-14 09:53:07 +01:00
Jason Sun
fb3f361d54 Auto enable new system trust agents
Previously we only auto enable factory system trust agents when the
devices is booted for the first time. This change added logic to detect
newly installed/enabled trust agents, and enable them if appropriate.

Fixes: b/243705470
Test: atest FrameworksMockingServicesTests:TrustManagerServiceTest
Change-Id: I3c345a44cfcfccc6f7e2507ba37e378b6b16bd98
2022-09-13 20:44:25 +00:00
Andrey Epin
abd9f84919 Merge "Add null-safety checks" into tm-qpr-dev am: 4c31889176
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19931025

Change-Id: I9418d28956ffa3776949e108ec78f6c3fa831a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 16:43:29 +00:00
Andrey Epin
4c31889176 Merge "Add null-safety checks" into tm-qpr-dev 2022-09-13 15:48:37 +00:00
Mythri Alle
209f25aff5 Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d233 am: 391e8ca76a am: 251978e0da am: 97e39b881d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215481

Change-Id: I6744c85c6311ea61c88b3d1158db55465f8b3100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 14:03:40 +00:00
Mythri Alle
251978e0da Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d233 am: 391e8ca76a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215481

Change-Id: Ic1481a6d93e546eb0db1d7c8827e2529a055fdce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 13:08:26 +00:00
Mythri Alle
1b989de3d7 Don't enable jdwp by default on userdebug builds
We would like to have userdebug builds as close to user builds as
possible so don't enable jdwp by default on userdebug builds. This
means that we won't be able to attach a debugger to non-debuggable
builds in userdebug builds by default. However, this support can
be enabled by setting persist.debuggable.dalvik.vm.jdwp.enabled
property. Eng builds still enable jdwp by default.

Bug: 240410400
Test: System boots
Change-Id: Iad52254be9b9bc8c9deac8b3ad46e9db1b610160
2022-09-13 09:11:21 +00:00
Andrey Epin
08c01ae19c Merge "Fix direct share target cells's visibility" into tm-qpr-dev am: 957aa20906
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19806051

Change-Id: I3bfafe04086b0727d1e0098a1eb4d661b0c05959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 20:39:46 +00:00
Andrey Epin
957aa20906 Merge "Fix direct share target cells's visibility" into tm-qpr-dev 2022-09-12 20:18:38 +00:00
Andrey Epin
2912adc6dd Add null-safety checks
Add nullability annotations and checks to avoid NPE crashes.

Test: manual Chooser-to-Markup transition test
Fix: 246345027
Change-Id: If9582047de7d943e39c5f318050ab3558f062932
2022-09-12 11:08:38 -07:00
Ryan Zuklie
b48df1b4d1 Export BatteryStats info to Atrace.
This is a tm-qpr re-write of http://ag/19779936 and http://ag/19806033. There was large refactor of BatteryStatsHistory that prevent the changes from being cherry-picked directly. Instead, this change copies the relevant sections and stitches together the rest.

Things that are identical
* The whole TraceDelegate
* recordTraceCounters
* recordTraceEvents

Things that are different
* Record calls are moved to BatteryStatsImpl
* Class setup (mTracer isn't changeable)
* No tests (can be added, but hard prior to the refactor)

Bug: 245749764
Test: presubmit and local perfetto tracing
Merged-In: Iaae4e9796a44be3ffdaee31b956bbb3e87735ead
Change-Id: I62fc2e93b662b89176cc26bdff8b3e88d216028a
2022-09-09 14:40:15 -07:00
TreeHugger Robot
2211c16334 Merge "Fix the order of talkback focus for ConversationLayout when expanded" into tm-qpr-dev am: f4643c773b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19904008

Change-Id: I72539dbca5334cfb1f3f04226a71eabdfdedabe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 18:39:37 +00:00
TreeHugger Robot
f4643c773b Merge "Fix the order of talkback focus for ConversationLayout when expanded" into tm-qpr-dev 2022-09-09 18:05:51 +00:00
Andrey Epin
22d7790c41 Merge "Revert "Load direct-share icons asynchronously"" into tm-qpr-dev am: abe2a224f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19902145

Change-Id: Ie3b7c961302f78fff18cb745d55794205ade9280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 23:18:12 +00:00
Andrey Epin
abe2a224f9 Merge "Revert "Load direct-share icons asynchronously"" into tm-qpr-dev 2022-09-08 23:01:48 +00:00
Yining Liu
ffc4bc77b8 Fix the order of talkback focus for ConversationLayout when expanded
Talkback can now correctly focus the collapse button before going to the action list when expanded. To know why mExpandButton is dynamically placed, check commit: 54fe9ad2dc

Bug: 237505828
Test: Visual, see the STEPS TO REPRODUCE section of bug 237505828, the focus order of talkback should be collapse button then actions.
Change-Id: Id0cf8730b00e0e7636a163fb5d51e37e8e0a3e84
2022-09-08 21:35:04 +00:00
Andrey Epin
70a4601f62 Revert "Load direct-share icons asynchronously"
This reverts commit 5650e0c3c8.

Reason for revert: broken functionality b/245681929

Fix: 245681929

Change-Id: I50fce5cca55ee40e66c0915759bfa930848588b9
2022-09-08 17:33:47 +00:00
Tony Huang
3770554346 Merge "Fix divider dismiss position wrong on potrait" into tm-qpr-dev am: d36b472cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19882684

Change-Id: Ia94f94530d7ae69aad8a1ab7824ef206f47f1292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 03:14:50 +00:00
Tony Huang
5112e20135 Fix divider dismiss position wrong on potrait
When we calculate dismiss target, it will deduce nav bar size from
total height. Remove this rule to make divider always move to end
of screen.

Fix: 232858513
Test: manual
Test: pass existing tests
Change-Id: I34cf12f242daa31bd4dd7d4b202fc43ac0d752b4
2022-09-07 15:21:39 +08:00
Andrey Epin
bb1a6ee1c8 Merge "Load direct-share icons asynchronously" into tm-qpr-dev am: 1809ffcf0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18973259

Change-Id: If4991c79dae30982c27ad0f3f75654b21ea3d5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 03:10:28 +00:00
Andrey Epin
1809ffcf0e Merge "Load direct-share icons asynchronously" into tm-qpr-dev 2022-09-07 02:44:24 +00:00
Nick Chameyev
ea0153c0fc Merge changes from topic "pss-app-selector-screenshot" into tm-qpr-dev am: 47c21d1216
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19536771

Change-Id: I3abe0699529a84f05e57bee59eacf2cc60a4dc22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 13:31:52 +00:00
Nick Chameyev
21ceb39058 [Partial Screensharing] Update app selector (ChooserActivity) header am: 2d2b24f09d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537653

Change-Id: Ica3a17529f4e730104bf6ee1b43bc5d24bbaf584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 13:31:27 +00:00