Commit Graph

12347 Commits

Author SHA1 Message Date
TreeHugger Robot
509428e9d7 Merge "Resolve boot unaware for suspension details activity" 2019-11-26 18:38:16 +00:00
Suprabh Shukla
fcca8a8382 Resolve boot unaware for suspension details activity
The neutral button starting ACTION_SHOW_SUSPENDED_APP_DETAILS should
still be shown when the profile is locked. The user will be directed to
unlock if they choose to start the activity.

Test: Manual, on a device with a wellbeing app:
1. Create a managed profile with a secure lock.
2. Suspend any app using the wellbeing app.
3. Reboot.
4. Without unlocking the profile, tap the suspended app's launcher icon.
5. A neutral button should be shown.
6. Tapping on the neutral button should redirect the user to a lock
screen.

Bug: 144837297
Change-Id: Ifa1d71d2e540a3d6df5bd9f429eb433be14c3024
2019-11-25 15:26:43 -08:00
Mathieu Chartier
d74687f679 Merge "Pass runtimeFlags to postForkSystemServer" 2019-11-25 18:06:51 +00:00
Sergej Salnikov
f2c2a1b595 Merge "Delete SearchManager.launchAssistService and convert SearchManager.launchAssist into @SystemApi method that handles both phone and TV devices." 2019-11-25 12:08:08 +00:00
TreeHugger Robot
cd79af4eec Merge "Initial IME inline suggestions APIs" 2019-11-23 01:21:02 +00:00
TreeHugger Robot
12b46ae6e7 Merge "Add TEST_MAPPING for com/android/internal/app." 2019-11-22 20:06:59 +00:00
Feng Cao
04830a3faf Initial IME inline suggestions APIs
Test: manual verification with other local changes
Bug: 137800469

Change-Id: Ia0ead9d7208512920a3277559cef0bb92bea35f5
2019-11-22 10:23:37 -08:00
Wale Ogunwale
08890b900a Fixed arg count with Quad/Quint pooled predicates
Typo from when they were added.

Bug: N/A
Test: N/A
Change-Id: I60b93d1aa8a9c5b9e6a4ae3733eb227790baccfe
2019-11-22 07:46:08 -08:00
Will Brockman
d643c8a41e Merge "Initial UiEventReported atom and UIEventLogger." 2019-11-22 14:32:08 +00:00
Mathieu Chartier
2cb0a4d860 Pass runtimeFlags to postForkSystemServer
Flags are now required by ART.

Bug: 139883463
Bug: 144383344
Test: showmap `pid system_server` and verify
Test: atest BootImageProfileTest
Change-Id: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
2019-11-21 15:54:13 -08:00
Winson Chiu
1e05667111 Merge "Overlayable actor enforcement" 2019-11-21 21:46:47 +00:00
TreeHugger Robot
5d1c9a388a Merge "Exposing WorkSource hidden APIs as system APIs" 2019-11-21 21:15:48 +00:00
Alison Cichowlas
c1a1bfe583 Add TEST_MAPPING for com/android/internal/app.
Exclude/ignore current failures.

Test: atest:all in test_mapping directory
Change-Id: Iaeb67c9f157fa9a2e0a0bd9ef374a0cf7585d57d
2019-11-21 16:13:43 -05:00
Winson
d9d1736767 Overlayable actor enforcement
Validates that the caller of an OverlayManager API that mutates state
is actually allowed to act on the target as defined in the target's
overlayable tag.

<overlayable name="MyResources" actor="namespace/name">

An actor is valid if any of the following is true:
 - is root/system
 - is the target overlay package
 - has the CHANGE_OVERLAY_PACKAGES permission and an actor is not defined
 - is the same package name as the sole resolved Activity for the actor specified
     in the overlayable definition, with only pre-installed, namespaced actors
     currently supported

Bug: 119442583
Bug: 135052950

Test: atest SystemConfigNamedActorTest
Test: atest com.android.server.om

Change-Id: If56b9e8366852eaef84f6bb25c3e6871eaa3f219
2019-11-21 12:01:41 -08:00
Will Brockman
fbaa7912d6 Initial UiEventReported atom and UIEventLogger.
Also a simple fake for unit testing, and UiEvent annotation.

See bug and design doc go/sysui-event-logs for further context.

Test: Manual with statsd_testdrive 90 (with local changes to use the Logger.)

Change-Id: Iac5834d81038cbca0d0f194885cdf0daa25d74a1
2019-11-21 19:36:09 +00:00
Tiger Huang
e155ed48fa Merge "Window Manager Flag Migration (6/n)" 2019-11-21 16:23:32 +00:00
skill
25b0f41e84 Delete SearchManager.launchAssistService and convert
SearchManager.launchAssist into @SystemApi method that handles both phone
and TV devices.

That allows apps to start Assistant.

Bug: 128538467
Test: manual
Change-Id: Ie05c910768062c00717df66e35b4118805458999
2019-11-21 15:56:08 +01:00
TreeHugger Robot
3331df77af Merge "Deprecate the use of ICU.addLikelySubtags" 2019-11-21 02:07:10 +00:00
TreeHugger Robot
dfe69d9e2d Merge "Move UserTypeDetails & UserTypeFactory to services" 2019-11-21 00:43:29 +00:00
Suprabh Shukla
f7cffa7aaf Exposing WorkSource hidden APIs as system APIs
Users of these APIs are planning to move to apex.

Test: atest FrameworksCoreTests:android.os.WorkSourceTest
atest CtsOsTestCases:android.os.cts.WorkSourceTest

Bug: 143551137
Change-Id: I2e97a8b469254ea92e3ee21571ee8ae3cbb9abbe
2019-11-20 14:26:47 -08:00
Wale Ogunwale
f189acd023 Add 3, 4, & 5 Predicate arg types to PooledLamdba
Bug: N/A
Test: They pass!
Change-Id: Ib3cd168c00899097ce4340ba10b34041f91bc32d
2019-11-20 16:44:06 +00:00
Andrei-Valentin Onea
16257fc141 Merge "Revert "Revert submission from topic "separate-testing"."" am: addcc36534 am: 97a11fb8ab
am: aeed8fb461

Change-Id: I14adcd7f9682483550a198af99bfb9f87b5505f5
2019-11-19 19:44:07 -08:00
Andrei-Valentin Onea
aeed8fb461 Merge "Revert "Revert submission from topic "separate-testing"."" am: addcc36534
am: 97a11fb8ab

Change-Id: I368ccb483ba72c8fea622a3179c7e22aa7d7ab7e
2019-11-19 15:41:46 -08:00
Andrei-Valentin Onea
97a11fb8ab Merge "Revert "Revert submission from topic "separate-testing".""
am: addcc36534

Change-Id: I4de366196f91ef1fe17c617a117b29503f8f68e1
2019-11-19 15:28:29 -08:00
Tyler Gunn
18325cf2d4 Merge "Add prioritized enableCarMode API in UiModeManager" 2019-11-19 23:16:33 +00:00
Hall Liu
ae63546d19 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
am: dab3711435

Change-Id: Ib75482a87545f7743f0049c8e51c354d2294c2af
2019-11-19 15:12:28 -08:00
Hall Liu
dab3711435 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
James O'Leary
f632e989a0 Add test mapping for ScreenshotHelperTests
Runs tests on presubmit


Test: Ran `atest` in core/tests/screenshothelpertests,
`atest` successfully picked up screenshothelpertest as
a presubmit test, ran it, and the test succeeded. Test
output available here:
https://drive.google.com/open?id=12M28e84bkAZtnQYe7-6f8ybs31bULWV_
Bug: b/140526005
Change-Id: Ic0a288c88232eeddd03591b590b0ef3d8c98fa93
2019-11-19 19:46:29 +00:00
Satakshi Rana
2613be298f Merge "Screenshot Notification Smart Action: AiAi and - Sys UI integration" into qt-qpr1-dev
am: 73b4e1923a

Change-Id: Ib545347db4b8aa49f2467e785d0572ce2f5d5b25
2019-11-19 09:22:01 -08:00
Satakshi Rana
73b4e1923a Merge "Screenshot Notification Smart Action: AiAi and - Sys UI integration" into qt-qpr1-dev 2019-11-19 17:14:49 +00:00
Artur Satayev
785d3a03b9 Merge "Add @UnsupportedAppUsage annotations for greylist." 2019-11-19 15:05:51 +00:00
Artur Satayev
751e55114c Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

This is partial merge of aosp/Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09. Telephony greylist cleanup has been done separately. Note that annotations outside of frameworks/base/ have been merged from AOSP.

Bug: 137350495
Test: m
Exempt-From-Owner-Approval: merge
Change-Id: I015c466e8b69cc0fed5e9d394ba865aad11d8ba6
2019-11-19 15:05:35 +00:00
Alison Cichowlas
8261f2bd36 Merge "Restore app pinning." 2019-11-19 14:33:38 +00:00
Alison Cichowlas
1fd471509a Restore app pinning.
Bug: 143229724
Test: atest AbstractResolverComparatorTest; atest ChooserActivityTest
Change-Id: I71d4334c8d3beed94495b41d5264a95cbbd132ff
2019-11-19 09:31:40 -05:00
Andrei-Valentin Onea
addcc36534 Merge "Revert "Revert submission from topic "separate-testing"."" 2019-11-19 14:12:47 +00:00
Robert Horvath
16af2395a7 Merge changes from topic "inattentive-sleep"
* changes:
  Remove inattentive sleep string translations
  Fade out inattentive sleep warning overlay
2019-11-19 09:29:07 +00:00
Satakshi
ce35ce9f08 Screenshot Notification Smart Action: AiAi and - Sys UI integration
Create a constant in ContentSuggestionsManager, which will
be used to pass a hardware bitmap to ContentSuggestionsService.
In the presence of this key in the request extras, we skip taking a
snapshot in ContentSuggestionsPerUserService.
Bitmap is extracted from reading this value from extras in
ContentSuggestionsService.

Create ScreenshotNotificationSmartActionsProvider, which is overridden
in GoogleSystemUI.
Calling AiAi is guarded by a device config flag created in cl/277143225.

(cherry picked from commit d2010f2628 and c45d86fc15)

Test: Manually tested the code in this CL and corresponding change in SystemUIGoogle.
Took a screenshot and verified that AiAi gets invoked and the screenshot notification
shows smart actions.
Ran new tests added in this CL
'atest ScreenshotNotificationSmartActionsTest'
'atest ContentSuggestionsPerUserServiceTest'
Bug: 141634285
Change-Id: I439a4be9aac53fb02b566ae4d438afe3edf2b37a
Merged-In: I439a4be9aac53fb02b566ae4d438afe3edf2b37a
2019-11-18 16:06:08 -08:00
Bookatz
dffffc08ae Move UserTypeDetails & UserTypeFactory to services
These two classes should be in service side, i.e.
frameworks/base/service.

Test: atest com.android.server.pm.UserTests
Bug: 142151520
Change-Id: Idcd62ce4469bb194a16fc9ba932178fdd6fe50e5
2019-11-18 14:50:49 -08:00
Hall Liu
1d7a53da98 Merge changes from topic "mainline4"
* changes:
  Add new API for Telecom to send phone state
  Minor style correction to avoid merge conflict
  non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
Tyler Gunn
daef668a99 Add prioritized enableCarMode API in UiModeManager
Per design doc (go/android-car-mode-design), added new system API to
enable car mode and specify a priority for the calling app.
Also modified UiModeManager to pass the package name of the caller to
UiModeManagerService.

Bug: 136109592
Test: Added new unit tests and CTS tests.
Test: Added Telecom test app functionality to verify.
Change-Id: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
2019-11-18 13:03:30 -08:00
Chavi Weingarten
bc66f23f1a Merge "Support talkback for functions on the caption view." 2019-11-18 20:34:59 +00:00
Andrei Onea
02d81c0c11 Revert "Revert submission from topic "separate-testing"."
This reverts commit 44d9a1d8dd.
Re-land testing for compatibility change gating. This should fix the art
buildbot breakage.

Bug: 140367850
Test: atest PlatformCompatGating
Test: art/tools/buildbot-build.sh --host
Change-Id: I1070e5e62aed67f1b09044b84674b06afc85c8cc
2019-11-18 20:05:54 +00:00
Aran Ink
6a1fbf8462 Merge "Convert TakeScreenshot finishers Runnables to Consumer<Uri>" 2019-11-18 18:22:19 +00:00
Aran Ink
eb565fc85a Convert TakeScreenshot finishers Runnables to Consumer<Uri>
Test: Automated tests pass.
Change-Id: I431dc812903a61a862497287bfd5e4871f399002
2019-11-18 10:40:01 -05:00
Anna Trostanetski
77361b326d Merge "Make CompatConfig be package private." am: 688b3aea7c am: eec638dada
am: 57d083db3b

Change-Id: I53846ae6444b539f3955df33c586a22c6f4e79f1
2019-11-18 07:14:17 -08:00
Anna Trostanetski
57d083db3b Merge "Make CompatConfig be package private." am: 688b3aea7c
am: eec638dada

Change-Id: I7c5fec41bd74e19bffcdcbb6a096197f365936a4
2019-11-18 07:10:44 -08:00
Anna Trostanetski
eec638dada Merge "Make CompatConfig be package private."
am: 688b3aea7c

Change-Id: Id8fcdf026bc41b94a3050d9d261b41cbb97a38e5
2019-11-18 07:07:22 -08:00
Anna Trostanetski
688b3aea7c Merge "Make CompatConfig be package private." 2019-11-18 14:51:32 +00:00
Tiger Huang
332793ba05 Window Manager Flag Migration (6/n)
Refactor the insets APIs:
- Remove top/side in the names of types
- Add a type for the caption bar
- Rename InsetSide to InternalInsetsSide which is a enumeration, so that
  we can have a public @InsetsSide which is a bit-wise variable
- Fix the naming about insets: inset --> insets

Bug: 118118435
Test: atest InsetsSourceProviderTest InsetsStateControllerTest
            InsetsPolicyTest WindowStateTests CommandQueueTest
            RegisterStatusBarResultTest InsetsFlagsTest
            LightBarControllerTest RegisterStatusBarResultTest

Change-Id: I27a066299eea9927ce61f6cb5d489ad79bca42ba
2019-11-18 17:31:42 +08:00
Jiyong Park
de26442649 Merge "remove framework_base_subdirs" am: 46397049fe
am: 7cd8f399f7

Change-Id: I1dc1009490d3e1d26257b7490f1a44bd91b91085
2019-11-16 07:35:07 -08:00