Commit Graph

12328 Commits

Author SHA1 Message Date
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
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
Jiyong Park
de26442649 Merge "remove framework_base_subdirs" am: 46397049fe
am: 7cd8f399f7

Change-Id: I1dc1009490d3e1d26257b7490f1a44bd91b91085
2019-11-16 07:35:07 -08:00
Jiyong Park
7cd8f399f7 Merge "remove framework_base_subdirs"
am: 46397049fe

Change-Id: I910bc8f5f7266e70fe3d8549aab51c2e504298a0
2019-11-16 07:31:54 -08:00
Jiyong Park
46397049fe Merge "remove framework_base_subdirs" 2019-11-16 15:21:03 +00:00
Jiyong Park
ced28d531d remove framework_base_subdirs
Metalava no longer requires it at least for droidstubs in this
directory. Even when local_sourcepath is not set, the -sourcepath option
is set to the module directory (frameworks/base in this case), and
metalava tries to find package.html files under the directory to know if
a package is hidden or not.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 144264106
Test: m

Merged-In: Idfa2aa392ae1da9582e7691a8c06c986baad5088
(cherry picked from commit e53786e864)
Change-Id: Idfa2aa392ae1da9582e7691a8c06c986baad5088
2019-11-16 20:48:06 +09:00
TreeHugger Robot
19e6a8c5c1 Merge "remove framework_base_subdirs" 2019-11-16 08:08:52 +00:00
Jayachandran C
82e53b725a Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17 am: 0a86ee3b3e
am: 78f84d5abe

Change-Id: I24e2c0c353f9e74a65c2e3d24a43338022b3efc4
2019-11-15 22:25:23 -08:00
Jayachandran C
78f84d5abe Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17
am: 0a86ee3b3e

Change-Id: I2b1be68cd2eea8a4795a882933ed91dbf6ed83ee
2019-11-15 22:11:01 -08:00
Jayachandran C
0a86ee3b3e Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 337df70e17

Change-Id: Iba519e0e11af591d93f9bca5e09aab6191240b39
2019-11-15 19:11:44 -08:00
Chen Xu
8eb62f9485 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
Merged-In: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-11-15 18:02:40 -08:00
Jayachandran C
16dce22bf5 Remove usage of Telephonymanager getDefault() and from() hidden APIs
This CL changes to use getSystemService(TelephonyManager.class)

Bug: 140768340
Test: Build
Change-Id: I1fcf2c17456f126584df359547f64c07c168aa65
2019-11-15 15:46:43 -08:00
James O'Leary
fe08abee19 [DO NOT MERGE] Convert TakeScreenshot finishers Runnables to Consumer<Uri>
am: 712eb51dc9

Change-Id: I1a5cc3ceef3f95e02abcbe86fcafd56e19aedc65
2019-11-15 14:05:59 -08:00
Hyangseok Chae
1e83f128f0 Support talkback for functions on the caption view.
Accessibility talkback feature works partially.
Support talkback for a title on caption view.

Test: manual
1. Enable Accessibility TalkBack
2. Execute application with freeform
3. Touch title on the freeform window
4. Check speech "App in Pop-up window"

Bug: 144271785

Change-Id: I5ab3cd23610f37a8b930de4710abf8ae62f65b84
(cherry picked from commit b51a68057f5d1498e3a87a10928d8377ad82acd0)
2019-11-15 21:42:47 +00:00
Adam Bookatz
b9a57da94c Merge "Introduce user types" 2019-11-15 19:15:37 +00:00
TreeHugger Robot
28c7e9c2ea Merge "Pipe through featureId from caller to permission checks in telephony code" 2019-11-15 18:18:02 +00:00
James O'Leary
712eb51dc9 [DO NOT MERGE] Convert TakeScreenshot finishers Runnables to Consumer<Uri>
Test: n/a
Bug: b/131082115
Change-Id: Ia84d034d08ff4d004fc9852dc5156d46059e8b00
2019-11-15 16:41:21 +00:00
atrost
f69bbe1a45 Make CompatConfig be package private.
All access will go through PlatformCompat Service.
This is a step towards having callbacks upon a config change, which is
needed for seLinux support.

Test: test app + adb command locally
Bug: 143539591
Bug: 143758748
Change-Id: I31d1c40e99894e77e85a8c33eb07ed9052c8e43a
2019-11-15 16:34:32 +00:00
Mark Tabry
15fb09d1e9 Merge changes from topic "VmsWestworld"
* changes:
  Add AIDL interface and puller implementation for automotive devices.
  Define new atoms for Vehicle Maps Service.
2019-11-15 15:52:24 +00:00
Robert Horvath
993e82eec7 Merge "Add setting to go to sleep after long user inactivity" 2019-11-15 15:05:15 +00:00
Victor Chang
57e23f19e6 Deprecate the use of ICU.addLikelySubtags
Bug: 124232146
Test: m droid
Change-Id: I25ad003c70b5028942d50d8e83d1cc62ee74d31b
2019-11-15 13:55:14 +00:00
Martijn Coenen
c272f94077 Merge "Re-land: Reconcile Zygote process name code with Q release." into stage-aosp-master
am: 0b5937472e

Change-Id: I4edfa7f78dc60bef5d681b0ae268f1d1f1d15b03
2019-11-15 00:16:45 -08:00