Commit Graph

101032 Commits

Author SHA1 Message Date
Alex Johnston
b7fc2ab443 Merge "Update profile owner of org-owned device global restrictions" 2020-01-29 17:51:25 +00:00
Sally Yuen
96b878aada Merge "Implement multi-finger multi-tap gesture matchers for accessibility" 2020-01-29 17:41:28 +00:00
TreeHugger Robot
e9437d2ee3 Merge "Implement the necessary methods for identifying the DENY / FORCE_ALLOW causes for logging purposes." 2020-01-29 14:36:21 +00:00
Automerger Merge Worker
36a7559516 Merge "Tidy up module-lib API and locks" am: 98ab83c37d am: 779b5c6ee0 am: 1fc568f878
Change-Id: I4c7039b54aa185447108622b0608689ddf45bc2f
2020-01-29 14:33:36 +00:00
Automerger Merge Worker
fdb676b4dd Merge "Rename ZoneInfoDB -> ZoneInfoDb" am: 402674f2a0 am: c3e31d6ac5 am: f8a4287915
Change-Id: I72978765010e3da52bcdf00299f7ba999bc9201b
2020-01-29 14:33:04 +00:00
Automerger Merge Worker
1fc568f878 Merge "Tidy up module-lib API and locks" am: 98ab83c37d am: 779b5c6ee0
Change-Id: If558e1d5f1a438eedefaae4c8b7f8eda7862ee7b
2020-01-29 14:21:29 +00:00
Automerger Merge Worker
f8a4287915 Merge "Rename ZoneInfoDB -> ZoneInfoDb" am: 402674f2a0 am: c3e31d6ac5
Change-Id: Ib094f9f67112998c82642dd4f8688a75f8b8e0ee
2020-01-29 14:21:11 +00:00
Neil Fuller
779b5c6ee0 Merge "Tidy up module-lib API and locks"
am: 98ab83c37d

Change-Id: I0c136617cef0d23e905757a0b6baf2b7e823212d
2020-01-29 06:19:05 -08:00
Neil Fuller
98ab83c37d Merge "Tidy up module-lib API and locks" 2020-01-29 14:10:18 +00:00
Neil Fuller
c3e31d6ac5 Merge "Rename ZoneInfoDB -> ZoneInfoDb"
am: 402674f2a0

Change-Id: I3dca8a93ccbc0f5e6fd4905db82bec6d8e088164
2020-01-29 06:05:50 -08:00
Treehugger Robot
402674f2a0 Merge "Rename ZoneInfoDB -> ZoneInfoDb" 2020-01-29 14:00:45 +00:00
Omer Nebil Yaveroglu
84f7c3fb53 Implement the necessary methods for identifying the DENY / FORCE_ALLOW
causes for logging purposes.

Bug: 147095027
Test: atest frameworks/base/core/tests/coretests/src/android/content/integrity/
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/integrity
Change-Id: Id502287b22fc54fd1585f81b313fb466d1f8442c
2020-01-29 12:21:14 +00:00
Automerger Merge Worker
3daccde526 Merge "Extract TimeDetector/TimeZoneDetector interfaces" am: 17ac92f460 am: a9e81b53a9 am: f751b9ec06
Change-Id: Ic029c262cc34f8c0232cda3558a57f2fcaceb797
2020-01-29 10:38:45 +00:00
Automerger Merge Worker
f751b9ec06 Merge "Extract TimeDetector/TimeZoneDetector interfaces" am: 17ac92f460 am: a9e81b53a9
Change-Id: I39134e3e45d3c6f2fac78a0180da7b83eb94b86f
2020-01-29 10:22:58 +00:00
Neil Fuller
a9e81b53a9 Merge "Extract TimeDetector/TimeZoneDetector interfaces"
am: 17ac92f460

Change-Id: I7e35f2eedbe57a8e77af8af70587a87dfa61bd26
2020-01-29 02:09:11 -08:00
Neil Fuller
17ac92f460 Merge "Extract TimeDetector/TimeZoneDetector interfaces" 2020-01-29 09:57:55 +00:00
Ryan Mitchell
1e80cd76ed Merge changes from topic "res-loader"
* changes:
  Refactor ResourcesLoader Tests
  Refactor ResourcesLoader APIs
2020-01-29 06:57:47 +00:00
Jack Yu
728f207b23 Merge "Added data coding scheme and location check time support" 2020-01-29 04:03:57 +00:00
TreeHugger Robot
e0206059a1 Merge "Revert "Partial Revert of ag/10161061"" 2020-01-29 02:32:59 +00:00
Automerger Merge Worker
6b398d9c37 Merge "CloseGuard: Fix JavaDoc code sample to use correct API" am: 88d4019b82 am: 87a25e33dd am: 363872235e
Change-Id: I615b0718b938185d9fa721c173d2bf0af3fc61d5
2020-01-29 01:52:04 +00:00
Automerger Merge Worker
363872235e Merge "CloseGuard: Fix JavaDoc code sample to use correct API" am: 88d4019b82 am: 87a25e33dd
Change-Id: I0248f3f77dead262ebf536a357514e0c998376f1
2020-01-29 01:39:38 +00:00
Yurii Zubrytskyi
577c74b861 Merge "Port the current code to new IncFS" 2020-01-29 01:37:01 +00:00
David Su
87a25e33dd Merge "CloseGuard: Fix JavaDoc code sample to use correct API"
am: 88d4019b82

Change-Id: Ia7a2358ca77ec0b25817f4b52c6793648933e2c4
2020-01-28 17:25:45 -08:00
Treehugger Robot
88d4019b82 Merge "CloseGuard: Fix JavaDoc code sample to use correct API" 2020-01-29 01:18:12 +00:00
Mady Mellor
e71999af40 Merge "Bubbles / notifs / shortcuts: if the id's don't match throw an error" 2020-01-29 01:10:53 +00:00
Roshan Pius
28b79072a9 Revert "Partial Revert of ag/10161061"
This reverts commit 81d7cece57.

Reason for revert: The telephony unit tests are fixed.
Bug: 148282682

Change-Id: Ib835f0abf4faf33ea3a54420c84c1f8383d663c3
2020-01-29 00:51:25 +00:00
Jack Yu
641db9a36a Added data coding scheme and location check time support
AT&T requires showing data coding scheme, location check
time, whether shown to the user or not in the test menu.
Expanded database to support this.

Bug: 144152683
Test: Manully sending fake messages and verified database
Change-Id: Ib5b78802e7548da9f92492aae4c94ed3488b5e3d
2020-01-28 16:46:30 -08:00
Automerger Merge Worker
901ee527fc Fix potential double destroy of AssetManager am: 0a8a1e9d40 am: 303d3874f2 am: e29951e29e
Change-Id: Ie636f378bb68f414760453198f4c08762182568a
2020-01-29 00:39:53 +00:00
Automerger Merge Worker
e29951e29e Fix potential double destroy of AssetManager am: 0a8a1e9d40 am: 303d3874f2
Change-Id: I3ddb9a9b1b67341b76ead480662356944d9146e6
2020-01-29 00:28:12 +00:00
Automerger Merge Worker
303d3874f2 Fix potential double destroy of AssetManager am: 0a8a1e9d40
Change-Id: I10010fa2087e7978dc88b1d1e6f6e5d3a4661499
2020-01-29 00:12:51 +00:00
Ryan Mitchell
4579c0aea2 Refactor ResourcesLoader APIs
This changes refactors the ResourcesLoader APIs.
The main changes are:

Rather than pairing a ResourcesLoader with a ResourcesProvider, a
ResourcesProvider is paired with an AssetsProvider which is only
responsible for overriding the values of file-base resources and
assets. An AssetsProvider can be shared between multiple
ResourcesProviders.

ResourcesLoader now holds a list of ResourcesProviders.

ResourcesLoaders are part of ResourcesKeys and requests for resources
with the same loaders will use the same underlying ResourcesImpl. This
allows the loader specific code in RM to be cleaned up.

ResourcesLoaders and Resources objects use callbacks to notify RM
of changes to the Resources instance that may require a new
ResourcesImpl.

When a context is created from another context, the new context will
include the loaders of the original context. Change to list of either
context's loaders will not change the loaders of the other context,
but changes to the providers a loaders uses will update all Resources
objects that use that loader.

Activity resources will include the loaders of the application context
at the time of the Activity's creation.

Bug: 147359613
Test: atest ResourceLoaderTests
Change-Id: I2957c803d3f0c1280abfd3c723d76b18df2c3789
2020-01-28 15:35:14 -08:00
TreeHugger Robot
8326cae642 Merge "Fix response id in FillResponse parceling." 2020-01-28 23:26:39 +00:00
Yinglei Wang
f367889de8 Merge "modify quick settings to adopt the accessibility state api" 2020-01-28 23:18:15 +00:00
Danny Epstein
dab6c77154 Merge "Don't draw default focus highlight unless focused." 2020-01-28 22:48:32 +00:00
Adam He
cb6826a9e2 Fix response id in FillResponse parceling.
Fixes: 148412653
Test: atest CtsAutoFillServiceTestCases
Change-Id: I5c3dfa81d09e613deadf2f3969e3d6122de230db
2020-01-28 14:06:12 -08:00
Mady Mellor
bd35832d9b Merge "Bubble API: post update when bubble notification suppression flag changes" 2020-01-28 22:04:38 +00:00
yingleiw
4a72a74b2a modify quick settings to adopt the accessibility state api
Seperated out the state part from contentDescription. Also changed the
tile on/off states from mocking switch to unavailable/on/off state
description based on State.state. During testing, I removed event
merging (including source node merging) for state and content change
events. Use event text for state description changed part will be in a
seperate CL.

Test: tested on the quick settings tiles for focusing and state change
evnets. With the event merging removed, the state change is announced
when the focus keeps on the tile. Before my change, content change is
not announced when the focus keeps on the tile due to source node change
in event merging.

Fix: 148473520

Change-Id: I5b6aee6f0982cf4e0a3962fbe15239314f3a2de4
2020-01-28 13:31:13 -08:00
Dieter Hsu
3cbd098e7a Implement multi-finger multi-tap gesture matchers for accessibility
This matcher would detect following gestures when accessibility flag
flagRequestMultiFingerGestures enabled:

- 2-finger single tap
- 2-finger double tap
- 2-finger triple tap
- 3-finger single tap
- 3-finger double tap
- 3-finger triple tap

Bug: 142277684
Bug: 142276516
Bug: 136131815
Test: atest AccessibilityGestureDetectorTest TouchExplorerTest GestureManifoldTest

Change-Id: I0aa6e858520d0b36c81df6fe08fd86d7d0803d5a
2020-01-28 13:24:12 -08:00
TreeHugger Robot
42ce71195c Merge "Handle controlInputMethodAnim correctly when IME isn't ready" 2020-01-28 21:09:07 +00:00
Rob Carr
55a32151b4 Merge "WM: Defer transactions for BLAST Surfaces too." 2020-01-28 20:19:18 +00:00
Yurii Zubrytskyi
4a25dfb2de Port the current code to new IncFS
Bug: 146080380
Test: manual, "cmd incremental install-start"

Change-Id: I6761c3f0e58b6d4de1ae3c4b31c23204fba9f740
2020-01-28 12:10:17 -08:00
Rob Carr
c847a7ad12 Merge "ViewRootImpl: Always run finishBLASTSync" 2020-01-28 19:32:53 +00:00
Jorim Jaggi
d7f10ed088 Handle controlInputMethodAnim correctly when IME isn't ready
- Store pending control request when request needs to go over IME
- Abort pending control request when losing control
- Use timeout in case we haven't heard back from IME

Test: InsetsControllerTest
Bug: 111084606
Change-Id: Icb6a9d8ad9134f8cb836e15c09c2b2295219fc15
2020-01-28 20:24:02 +01:00
TreeHugger Robot
6308b5e2ad Merge "Guard Context Hub Service on Context Hub feature" 2020-01-28 19:09:55 +00:00
David Su
1ac48fd8d6 Merge "Move cacerts_wfa from system to Wifi APEX" 2020-01-28 18:54:29 +00:00
TreeHugger Robot
e428a2cc04 Merge "Deprecate Canvas.EdgeType" 2020-01-28 18:13:01 +00:00
TreeHugger Robot
617b3b71da Merge "Remove getState from InsetsAnimationControlCallbacks" 2020-01-28 17:57:27 +00:00
Meng Wang
094d46dd30 Merge "Telephony: do not use hidden API" 2020-01-28 17:44:32 +00:00
Automerger Merge Worker
bf4cf726d3 Merge "Fix ordered background broadcast API" am: dd6d0b26af am: 950f73800c
Change-Id: Idf232eb4ae82d1e143b89d713294f8e762a048c7
2020-01-28 17:18:33 +00:00
Jordan Liu
950f73800c Merge "Fix ordered background broadcast API"
am: dd6d0b26af

Change-Id: I45a57ea9d6b7981a6f2a93aab84f204f21b18582
2020-01-28 09:09:15 -08:00