Commit Graph

640958 Commits

Author SHA1 Message Date
Winson Chung
54255f7ab4 Merge "Skip setting focused window to the recents animation target" into sc-dev 2021-04-29 22:02:14 +00:00
Beverly Tai
95531c2bb5 Merge "Add callback to DozeParameters on alwaysOn change" into sc-dev 2021-04-29 21:53:53 +00:00
TreeHugger Robot
ea1b5d878c Merge "Fixing empty PendingAlarmInfo after alarm store changes" into sc-dev 2021-04-29 21:51:18 +00:00
TreeHugger Robot
1461322b42 Merge "Re-enable AppOpsServiceTest#testShutdown" into sc-dev 2021-04-29 21:50:28 +00:00
Varun Shah
b24e692267 Bump Standby Bucket for FGS sooner.
Instead of waiting 30 minutes to update the standby bucket for FGS, we
will now only wait for 1 minute due to the new restrictions.
Additionally, the continuity check for interaction is now reduced to
ten minutes from two hours. This is to ensure there are no irregular
bucket de-elevations from ACTIVE.
This change is gated by targetSdkVersion check and is only enabled if
apps target S or above.

Bug: 183972877
Test: atest OomAdjusterTests
Change-Id: Icb2638ba5a20ebb79d55b0575bf351eadc11f8f6
2021-04-29 14:49:12 -07:00
Tracy Zhou
133e340e1d Merge "Add onSwipeToHomeFinished to OverviewProxyListener" into sc-dev 2021-04-29 21:43:19 +00:00
Martin Brabham
329a11f7c6 Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3 am: 50e294ad9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I00dc7f393edb9b562c97147d053302159c12fcdb
2021-04-29 21:33:10 +00:00
Martin Brabham
d50c8e0703 OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd am: e897917de7 am: 2d3dbcab8f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: Ia4d99bf5f2dcee3d688796dfa3e11c1d104132a1
2021-04-29 21:32:57 +00:00
TreeHugger Robot
22fba34bba Merge "Grant CONTROL_CAR_POWER_POLICY permission to car shell" into sc-dev 2021-04-29 21:32:46 +00:00
Peter Collingbourne
a3b1c2e028 Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54 am: 43ce684e3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I9472707d7d680ad63794ed4b61ecd1e4506ae5c5
2021-04-29 21:32:03 +00:00
Jack Nudelman
71a0c99113 [automerger skipped] Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d am: 296cec5c58 am: 611a55f03d -s ours
am skip reason: Merged-In I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e with SHA-1 2cdad9f0a2 is already in history

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

Change-Id: If8adee8736161618173cc16f3c7d611beaafeca7
2021-04-29 21:30:28 +00:00
Grace Jia
acdaa7e8d8 [automerger skipped] Add D2D sharing level setting APIs. am: d5eb6fb0ef am: f018ea3c3e am: 5585bdb0ec -s ours
am skip reason: Merged-In I86f88d68c8629a0329dcde7b2d17928cacec37e7 with SHA-1 b53cb66e5f is already in history

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

Change-Id: I1dda8c96b0356db74ae93b90029e9a9062145d8d
2021-04-29 21:30:07 +00:00
Jing Ji
be5425c6fd Merge "Add state BOUND_FGS_OR_TOP and FGS into ProcessState Enum in ProcStats" into sc-dev 2021-04-29 21:23:11 +00:00
Brad Ebinger
bde5c37520 Bound Telecom logging recursion
Put a bound on the recursion in Session#toString
to ensure we do not accidently cause a Stack overflow

Bug: 186694546
AOSP: aosp/1691210
Test: atest TeleServiceTests
Change-Id: I52f44dd02d0d860d0894e9b84fded8cf5ff5a18e
2021-04-29 21:18:17 +00:00
Brad Ebinger
9ee6f30273 Bound Telecom logging recursion
Put a bound on the recursion in Session#toString
to ensure we do not accidently cause a Stack overflow

Bug: 186694546
Test: atest TeleServiceTests
Merged-In: I52f44dd02d0d860d0894e9b84fded8cf5ff5a18e
Change-Id: I52f44dd02d0d860d0894e9b84fded8cf5ff5a18e
2021-04-29 21:15:21 +00:00
Songchun Fan
07144bbf07 [incremental] don't uninstall on unhealthy
Only uninstall on UNRECOVERABLE on USB.

BUG: 186468840
Test: atest android.cts.statsdatom.incremental.AppErrorAtomTests
Change-Id: I4bdb9b05658fe60795d5eac4ba9e111e39dffa2c
2021-04-29 21:14:25 +00:00
Martin Brabham
50e294ad9b Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
2021-04-29 21:10:28 +00:00
Martin Brabham
2d3dbcab8f OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd am: e897917de7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: I98f507b1e35126406ae5f768a346afa8e4dd22d5
2021-04-29 21:10:21 +00:00
Peter Collingbourne
43ce684e3b Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: Ia06cfe69ef224be2cbe3abf32df3f83622481861
2021-04-29 21:09:27 +00:00
Jack Nudelman
611a55f03d Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d am: 296cec5c58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: I30f132276181affdc448995ab7b93900b6f22512
2021-04-29 21:08:28 +00:00
Grace Jia
5585bdb0ec Add D2D sharing level setting APIs. am: d5eb6fb0ef am: f018ea3c3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623183

Change-Id: Ic98c8b07df96a19472176a65109aff99cd9704a2
2021-04-29 21:08:24 +00:00
Adam He
1acd0739fa Change clearEvents() to clear existing events rather than setting
mEvents to null to remove possible NPE.

* clearEvents() needs to be called by destroy() which could cause race
condition on whether mEvents is null for other func calls.

Fixes: 185162720
Test: atest CtsContentCaptureServiceTestCases
Change-Id: I7330e651bc890c8a86822158efcf17a61e927112
2021-04-29 13:56:58 -07:00
Garfield Tan
6ba68bb08a Fix 2 LaunchParamsPersister issues
The first one is it erroneously accepts tasks with null realActivity. It
shouldn't save launch params for such tasks.

The second one is when it receives a package removed notification from
PackageManagerService, it touches mLaunchParamsMap without holding WM
global lock.

Bug: 186696426
Test: atest LaunchParamsPersister
Change-Id: Ib0159835f177b7a3e9208bf77b3b608920262588
2021-04-29 13:56:39 -07:00
Martin Brabham
8411b5d7b3 Merge changes from topic "bluetooth_oob_api" am: 2e67798711
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I5c7de78ec2e77a617daf90cdc45052865d03a037
2021-04-29 20:56:21 +00:00
Martin Brabham
e897917de7 OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: I36420ea92322b00a6b55a4b4c5bbd759cc7ee263
2021-04-29 20:53:58 +00:00
Amy Zhang
e6af84e4a0 Update TODO docs in TunerClient on resource id/handle mapping
The resource id/handle mapping is no longer needed in the TunerClient
once the TunerService migration is done.

The mapping should only be maintained in the TunerService

Test: make
Bug: 186785141
Change-Id: Idfb02fe5935d9b25aac749c0f77eda111e0959ea
2021-04-29 13:52:33 -07:00
Nate Myren
c6c38cd6f0 TEMP: note "RECORD_AUDIO_HOTWORD" in SoundTriggerMiddleware
note the RECORD_AUDIO_HOTWORD op, rather than the RECORD_AUDIO. In
addition, check the RECORD_AUDIO permission for preflight, not data
delivery

Bug: 186164881
Test: Manual
Change-Id: I3275647d0f9a6e3ce8b97a556f56723b49170c8e
2021-04-29 20:47:04 +00:00
Jing Ji
72eee56f06 Merge "Support aggregation over association sources per process" into sc-dev 2021-04-29 20:46:50 +00:00
Peter Collingbourne
b16d968e54 Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I778cc45627af85a3b7bc5a140540302772638c1d
2021-04-29 20:46:46 +00:00
Jack Nudelman
296cec5c58 Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: Iaefd51c1ebe49a81739600c6ef56d5663e54a81d
2021-04-29 20:43:24 +00:00
Grace Jia
f018ea3c3e Add D2D sharing level setting APIs. am: d5eb6fb0ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623183

Change-Id: I5b17ef39ba935914c9e63a363c972d00ac664d0a
2021-04-29 20:42:32 +00:00
George Mount
02843213c0 Fling while overscrolled: ScrollView/HorizontalScrollView
Bug: 186430321

ScrollView and HorizontalScrollView was not allowing a fling
effect while overscrolling. This adds the ability to fling
while overscrolling.

Test: new test
Test: manual ApiDemos
Change-Id: Iebd402ff0f5b6f16518ecc5403e085cb58de5976
2021-04-29 20:37:56 +00:00
Lucas Dupin
fd734e66d7 Merge "Remove legacy QS background" into sc-dev 2021-04-29 20:36:15 +00:00
Kohsuke Yatoh
85cdd80a0f Add JavaDoc for android:suppressesSpellChecker.
It got removed when resolving merge conflict in
commit 6b22120e8f

Bug: 153473490
Test: n/a
Change-Id: I914269722d145ffe8a06589a7e5ca01db5166418
2021-04-29 13:35:51 -07:00
Amy Zhang
168a40a6a7 Get media share memory handle only when the filter is not a passthrough
media filter

Previously we get the share memory handle on filter opening, which only
has the information on filter types.

Now we move the share memory handle to the filter config API call so
that only the non-passthrough filter will get the share memory handle.

Test: sample tis on cuttlefish
Bug: 185627837
Change-Id: I33fd4950ec12291f6ca31a36b081d66643d5c319
2021-04-29 13:25:23 -07:00
Bill Yi
543791e6f4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82f341d6143d0ef888eab164c227ca9496b0c82c
2021-04-29 20:20:34 +00:00
Bill Yi
dbc607aaee Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib2fd274816853bdeb6dbe4e1fbb52075f4c9b361
2021-04-29 20:17:11 +00:00
Abhijoy Saha
381edd74d4 Add phone call check to app opp usage callback.
This fixes issue where calls are not included inside privacy items in AAOS.

Bug: 186518774
Test: Manual
Change-Id: Ie7b057c5af21b5fb1c51f6f9a4067c85b9ea373b
2021-04-29 20:16:41 +00:00
Julia Reynolds
75fd8835fa [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: f70b22f3be -s ours am: 9b873fe85e -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 d61aae299c is already in history

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

Change-Id: I2b87f72765fe3f968bcdede0d346313d68c3cfd6
2021-04-29 20:06:29 +00:00
Mady Mellor
435ab536c2 Fix text color for bubble user education screens
Test: manual - look at user education screens for the bubble stack and
               manage button in light & dark theme and make sure the
               text is as expected
Bug: 183238079
Change-Id: Ia83b2e849f46c3e3eb055ff263a0171f4ad62288
2021-04-29 12:57:07 -07:00
Jeff Sharkey
b8e4b883ae Ensure privileged APIs require runtime permission.
When users revoke a runtime permission, they expect all interactions
to be blocked, including those protected by the BLUETOOTH_PRIVILEGED
permission.

This change finishes applying that policy to any remaining Bluetooth
APIs which didn't already implement it.  To keep the implementation
straightforward, this change does "data delivery" checks when
registering for callbacks; the ideal behavior would be to wait
until data is actually delivered through the callbacks, but
RemoteCallbackList doesn't have support for AttributionSource yet.

Bug: 186405452
Test: atest BluetoothInstrumentationTests
Change-Id: Idd7be143eb8baff020a0718065293baae708041b
2021-04-29 13:55:07 -06:00
Jay Sullivan
a26bf49927 Merge "Make REVOKE_WHEN_REQUESTED a SystemApi field" into sc-dev 2021-04-29 19:52:33 +00:00
Beth Thibodeau
ced62779fb Fix timing issue for flaky tests
Inject SystemClock so that we can mock it in tests and ensure the clock
will always advance. Also switched to using elapsedRealtime, which is
guaranteed to be monotonic

Fixes: 182813365
Test: atest MediaDataManagerTest
Change-Id: I133fb48e8242dc7f8e75bfa5c585c8b6142963aa
2021-04-29 15:49:37 -04:00
Julia Reynolds
267965a8fc [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: 3ec2ca42fc -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I7e2e2401a00eff36334b2961627f9a40e84d45a3
2021-04-29 19:48:09 +00:00
Julia Reynolds
9b873fe85e [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: f70b22f3be -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: Ibda9eec07625c1c002ea16bf9f1b79234e56eab7
2021-04-29 19:47:18 +00:00
Soonil Nagarkar
da4d1c3639 Fix cache by userId bugs
Three bugs were present here:

1) isLocationEnabled() will return incorrect results for USER_CURRENT
and USER_CURRENT_OR_SELF
2) Disabling the location enabled cache does not work properly in the
system process, we only disable the cache for a single instance of
LocationManager.
3) isLocationEnabled() was not respecting the user as defined by the
context used to create the LocationManager.

Bug: 185401689
Test: atest CtsLocationFineTestCases
Change-Id: I84bff02604a4b2d84494a0e099e172c4ffb400a2
2021-04-29 12:44:03 -07:00
Alexander Dorokhine
1ddbd46377 Merge "Remove AndroidFuture from AppSearch." into sc-dev 2021-04-29 19:43:17 +00:00
Evan Severson
4a225373ec Merge "Fix incorrect index usage in SensorPrivacyService init" into sc-dev 2021-04-29 19:40:01 +00:00
Matt Pietal
7fe397d6a5 Wallet affordance - Fix taps
Logic was reversed for FalsingManager.

Fixes: 186775789
Test: manual
Change-Id: I21c959ed774e763c7be2ad09a83dc1dc3ccf9206
2021-04-29 15:38:43 -04:00
TreeHugger Robot
9936b8cbf1 Merge "Expose test APIs on ContentInfo and add CTS coverage" into sc-dev 2021-04-29 19:36:11 +00:00