Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,776 Commits 3 Branches 0 Tags
d74bcd3ca2e1ea302ce108a574324894e5be5568
Commit Graph

18063 Commits

Author SHA1 Message Date
Linus Tufvesson
ad26d42668 Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b66684981f am: 52547c1250 am: 2529d6ebbc am: 5c39e176f9 
Change-Id: Ic5eec8bf93a8adf3706d1488930ae34e2ff282e0
 2020-04-07 12:27:34 +00:00
Linus Tufvesson
2529d6ebbc Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b66684981f am: 52547c1250 
Change-Id: I32295bf291bc857ffe65833a905ae410b2b355c4
 2020-04-07 12:01:20 +00:00
Linus Tufvesson
b66684981f Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev 2020-04-07 11:32:16 +00:00
Kholoud Mohamed
0d692957c1 Merge "Remove platform-signed apps from configurable cross profile apps" into rvc-dev am: 5ec3cbac4c am: 0e434418d7 am: a5d68b63cc am: fbbc616ac5 
Change-Id: I1b36d3a4a1e5fe23fd9205ceb27f0591c963bbf9
 2020-04-07 10:41:40 +00:00
Kholoud Mohamed
0e434418d7 Merge "Remove platform-signed apps from configurable cross profile apps" into rvc-dev am: 5ec3cbac4c 
Change-Id: I190c4e382efa6f421f660cf2e316807766dfa9d3
 2020-04-07 09:56:52 +00:00
Kholoud Mohamed
5ec3cbac4c Merge "Remove platform-signed apps from configurable cross profile apps" into rvc-dev 2020-04-07 09:55:18 +00:00
Automerger Merge Worker
5d2bd7315a Merge "Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa am: c9e647b261" into rvc-d1-dev-plus-aosp am: e4e72b6309 am: 975453319d 
Change-Id: I7408b8bdf2b5f5637444f5f5edcd9ac5329ee763
 2020-04-07 02:11:39 +00:00
Selim Cinek
02c1e738b2 Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa am: c9e647b261 
Change-Id: Icf9aa76842f573387abce5a23382112f3e0323f9
 2020-04-07 01:31:19 +00:00
Selim Cinek
8776260b29 Merge changes I76df6529,I99594ae9 into rvc-dev am: 35910cacaa 
Change-Id: I06c716ffda5d55888b4ad81130699de75ae1f98e
 2020-04-07 01:30:28 +00:00
Selim Cinek
35910cacaa Merge changes I76df6529,I99594ae9 into rvc-dev 
* changes:
  Fixed the heads up layout of conversations
  Fixed an issue where the conversation title was showing doubled
 2020-04-07 01:22:04 +00:00
kholoud mohamed
9bbab6a6df Remove platform-signed apps from configurable cross profile apps 
Most apps that declare the INTERACT_ACROSS_PROFILES permission do
not have it granted, but get the app-op instead. We do not
normally want platform-signed apps that are actually given the
permission to appear in the user-configurable section in Settings,
so we remove them from the return value of
canUserAttemptToConfigureInteractAcrossProfiles in this CL.

Note that OEM can choose to allow some platform-signed apps to be
user-configurable by including them in their OEM whitelist file.
This CL respects that and allows these apps to be configured by the user,
despite being granted the permission. If the user rejects the app-op,
PermissionChecker correctly returns false.

Bug: 149742043
Test: atest CrossProfileAppsServiceImplRoboTest
Change-Id: I693338507eec9cdc0ba10a3584e994a58d2d113c
 2020-04-06 10:13:09 +00:00
Linus Tufvesson
ac272d5e9f Use TYPE_PRIVATE_PRESENTATION for private presentations 
Detect if the Presenation is targeting a private virtual display, and if they
are use the windowType TYPE_PRIVATE_PRESENTATION.

Bug: 152652348
Bug: 141745510
Test: atest CtsWindowManagerDeviceTestCases:PresentationTest
Test: atest CtsDisplayTestCases:android.display.cts.VirtualDisplayTest
Change-Id: I58834636e092f992e403342e36b475dc60e8f20a
 2020-04-06 09:43:41 +00:00
TreeHugger Robot
13bbf2e6e5 Merge "Pipe through attributionTag for package installation" 2020-04-05 01:50:40 +00:00
Philip P. Moltmann
c3278660cb Pipe through attributionTag for package installation 
Test: atest CtsAppOpsTestCases
Bug: 136595429
Change-Id: Ifda7464911faf505cd5287dbf48859e17452d3e5
 2020-04-03 17:38:36 -07:00
Selim Cinek
dcfa46c5ca Fixed an issue where the conversation title was showing doubled 
For conversations, it's not necessary anymore to extract
the conversation title into the heads up layout.

Fixes: 152655946
Test: add conversation group, observe no double text
Change-Id: I99594ae9e503cf8589603899e0053793be96958a
 2020-04-03 17:00:49 -07:00
Automerger Merge Worker
d21038c6e3 Merge "Merge "Enabled Content Capture in Service" into rvc-dev am: e081caae5f am: d3eda30c0c" into rvc-d1-dev-plus-aosp am: 05b85ccbf9 am: 6b984afe16 
Change-Id: Ia50ff46fdebf02f66ad896791060ec2f7204ab83
 2020-04-03 18:12:03 +00:00
Yara Hassan
6da9a23c6f Merge "Enabled Content Capture in Service" into rvc-dev am: e081caae5f am: d3eda30c0c 
Change-Id: Ica43bf4ac43fc15011f4fb1f0ff624690ad95bd1
 2020-04-03 17:16:06 +00:00
Yara Hassan
5781186727 Merge "Enabled Content Capture in Service" into rvc-dev am: e081caae5f 
Change-Id: I9caf74b18f4138eed5b1669de700d27b9d6d509d
 2020-04-03 16:55:48 +00:00
Yara Hassan
e081caae5f Merge "Enabled Content Capture in Service" into rvc-dev 2020-04-03 16:53:42 +00:00
Amith Yamasani
f8585e3ddf Merge "Mark secondary lockscreen API as SystemApi." into rvc-dev am: 040563da5f am: bc712d51e3 am: 411632a273 am: f41ae2211d 
Change-Id: Idc4a305107e2dae25d933373062d466282aae644
 2020-04-03 15:31:03 +00:00
Amith Yamasani
411632a273 Merge "Mark secondary lockscreen API as SystemApi." into rvc-dev am: 040563da5f am: bc712d51e3 
Change-Id: I600661b31d31eea8f12ca6fd8b21ef52929fd2ca
 2020-04-03 14:50:28 +00:00
Amith Yamasani
c8cc71a091 Merge "Mark secondary lockscreen API as SystemApi." into rvc-dev am: 040563da5f 
Change-Id: Idd633967cc9eb5f16d7dbf29de9f2ea6efb09e1e
 2020-04-03 14:28:23 +00:00
Amith Yamasani
040563da5f Merge "Mark secondary lockscreen API as SystemApi." into rvc-dev 2020-04-03 14:13:43 +00:00
Bernardo Rufino
feb39a637a Merge "Rename test in TEST_MAPPING" into rvc-dev am: 884e9515d6 am: f2c0580ea2 am: 0ed8b87bd3 am: e2b6aaf551 
Change-Id: I4fa1d411e81a3ceca8dbcbb577796ff522ce23a1
 2020-04-03 11:23:43 +00:00
Bernardo Rufino
f2c0580ea2 Merge "Rename test in TEST_MAPPING" into rvc-dev am: 884e9515d6 
Change-Id: Ia0c52ca3580daec1ed4392fbf1b2f11f9ba9ef0c
 2020-04-03 10:21:09 +00:00
Bernardo Rufino
884e9515d6 Merge "Rename test in TEST_MAPPING" into rvc-dev 2020-04-03 10:02:09 +00:00
Jing Ji
cf6722409a Merge "Fix some Java doc errors" into rvc-dev am: 0cfca4a3c4 am: 2173365c0e am: fdcc629715 am: c07b61ed0e 
Change-Id: Ibd5e21c9bce641282c44528ef63c707fd7dcf99c
 2020-04-03 09:05:45 +00:00
Bernardo Rufino
434c17c0e6 Rename test in TEST_MAPPING 
ToastTest became ToastWindowTest in ag/10919524, updating TEST_MAPPING
to reflect that.

Test: croot frameworks/base/core/java/android/app && atest --dry-run --test-mapping
Test: croot frameworks/base/core/java/android/widget && atest --dry-run --test-mapping
Test: croot frameworks/base/services/core/java/com/android/server && atest --dry-run --test-mapping
Bug: 152973950
Change-Id: I5b9e9b83d17c4a93a1e830c26d7f44001ccf175d
 2020-04-03 08:48:00 +01:00
Jing Ji
2173365c0e Merge "Fix some Java doc errors" into rvc-dev am: 0cfca4a3c4 
Change-Id: I948baf8f73c4ccec44574dc167ae34219e432be1
 2020-04-03 07:46:54 +00:00
Makoto Onuki
dfce6bde75 Merge "Add WTF when a system server wrapper can't be found" into rvc-dev am: bea34c409f am: 90ea8e34db am: c57d84ef9c am: 6390ab2439 
Change-Id: I66f2d9192c9e70b474ee66a1a5ed4af639931b33
 2020-04-02 21:47:35 +00:00
Jing Ji
e2757e64b7 Fix some Java doc errors 
Bug: 148413462
Test: Manual
Change-Id: Idfabf5ac6548fd821bc69afb3588c1d124d0011b
 2020-04-02 14:27:04 -07:00
Makoto Onuki
c57d84ef9c Merge "Add WTF when a system server wrapper can't be found" into rvc-dev am: bea34c409f am: 90ea8e34db 
Change-Id: I1d62a8e67b3b606cdbe9c6abe6caa81c17932c18
 2020-04-02 21:11:01 +00:00
Makoto Onuki
36bfe3e01c Merge "Add WTF when a system server wrapper can't be found" into rvc-dev am: bea34c409f 
Change-Id: I046320bca3c7faa63fb296ceb36f3c0e5559e765
 2020-04-02 20:51:09 +00:00
Makoto Onuki
bea34c409f Merge "Add WTF when a system server wrapper can't be found" into rvc-dev 2020-04-02 20:39:32 +00:00
Adam Bookatz
23ad552f29 Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe am: 9c60339434 am: 592d9b70c3 
Change-Id: Ide6f81439d1bde5f4d7cdb4947503fe6d0d81686
 2020-04-02 20:24:47 +00:00
Adam Bookatz
9c60339434 Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe 
Change-Id: Iecb8be029904271b73530e09e4d020a2a3965463
 2020-04-02 19:21:25 +00:00
Adam Bookatz
08da76161c Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 
Change-Id: I703ba5f4dd669f4461aca1597763e4ba05336400
 2020-04-02 19:00:17 +00:00
Adam Bookatz
2f559add63 Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev 2020-04-02 18:42:07 +00:00
Leon Scroggins
2eee1b57b5 Merge "Replace ImageDecoder.sApiLevel with a SystemApi helper" 2020-04-02 14:00:10 +00:00
Yara Hassan
6b6c4b1889 Enabled Content Capture in Service 
Bug: 150451947
Fix: 150451947
Test: Locally
Change-Id: Icbcbe4c46c4c5eb39b176b80c01dcce96f9dfbbd
 2020-04-02 12:25:35 +01:00
Neil Fuller
1fde0596bb Make manual suggestions synchronous/return result 
Modify the suggestManual...() methods on TimeDetector and
TimeZoneDetector to be synchronous, and have them return true/false to
indicate if the call "succeeded". This is being done before adding more
calls that will be used by apps like SettingsUI; generally all calls
that are user facing and could conceivably fail should return
success/failure information and therefore need to happen synchronously.

Test: atest services/tests/servicestests/src/com/android/server/timedetector/
Test: atest services/tests/servicestests/src/com/android/server/timezonedetector/
Bug: 140712361
Change-Id: I5b6b7fb5af2ffe88392b2ca8d1e8fff2a187521b
 2020-04-02 11:18:04 +01:00
Yvonne Jiang
70a62376d0 Mark secondary lockscreen API as SystemApi. 
It is currently not meant for use by general enterprise device admins.

Bug: 152478326

Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Test: atest KeyguardUpdateMonitorTest
Test: atest AdminSecondaryLockScreenControllerTest
Change-Id: I6d60bc35a4e8f74b1da55b042582a2f2fa89d57f
 2020-04-02 08:41:04 +00:00
Makoto Onuki
a455e5e281 Add WTF when a system server wrapper can't be found 
2nd try -- enable it only within the system server.

This is to detect someone trying to access system services too
early during a boot.

Bug: 149406139
Test: Boot with "adb logcat | grep -w SystemServiceRegistry" and make sure no wtf is logged
Change-Id: I64c6776cedaeb534d98621db2955d585e6846b8d
 2020-04-01 17:27:58 -07:00
Steve Elliott
fec64f3ea3 Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev am: 4605ca9daa am: 33449a1a70 am: f80e65cb74 am: beb03ec62f 
Change-Id: I5991caaae30aed03d8ad8dfcf239c2214c690f2d
 2020-04-01 18:45:50 +00:00
Steve Elliott
f80e65cb74 Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev am: 4605ca9daa am: 33449a1a70 
Change-Id: I58b798384785d423588389e8365f862e7e630815
 2020-04-01 18:11:22 +00:00
Steve Elliott
4c89ecc3c4 Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev am: 4605ca9daa 
Change-Id: I154229f393c1d32d2f9774423937d25157716dac
 2020-04-01 17:52:59 +00:00
Steve Elliott
4605ca9daa Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev 
* changes:
  Reinflate notif when [un]marked as conversation
  Update conversation UI when importance changed
  Add unread count badge to conversation layout
 2020-04-01 17:34:36 +00:00
Leon Scroggins III
143dfeff2d Replace ImageDecoder.sApiLevel with a SystemApi helper 
Bug: 152322291
Test: CtsGraphicsTestCases

ImageDecoder is moving to a mainline module, so the system can no longer
access the @hidden sApiLevel without making it @SystemApi. Instead of
promoting the existing API, provide a common class to be used by any UI
rendering class that needs to access the targetSdkVersion. Switch AVD to
use the new class, which is a SystemApi.

Change-Id: Ie7172fb93364a1e04ab844b8fa64887bf9d8b005
 2020-04-01 13:18:00 -04:00
Wale Ogunwale
c041d6cab3 Merge "Add TestApi interfaces for window organizers" into rvc-dev am: 1df5eb0130 am: d5c303746b am: f8385e93f1 am: 79bbf1a611 
Change-Id: I026e9bfd3e26f34026509b5fa69a9f1a6e585995
 2020-04-01 14:34:42 +00:00
Wale Ogunwale
f8385e93f1 Merge "Add TestApi interfaces for window organizers" into rvc-dev am: 1df5eb0130 am: d5c303746b 
Change-Id: Iaeb7bc6426c4e0c3fc423b39804cd43f5ec7b00a
 2020-04-01 13:56:24 +00:00