Commit Graph

20323 Commits

Author SHA1 Message Date
Jeff DeCew
2981ba6e75 Merge "Allow color in minimized notifications" into sc-dev 2021-03-15 13:29:36 +00:00
Jeff DeCew
3530bccf2b Merge changes I6e96864c,I6bc865d5,I15ca6994 into sc-dev
* changes:
  Hide app name from collapsed CallStyle.
  CallStyle now supports contextual actions (e.g. smart replies)
  Fix the layout issue with the expand button of the CallStyle
2021-03-15 13:18:03 +00:00
Aaron Huang
e29f0a55d8 Merge changes from topic "pacproxy-service" am: 16f50075b1 am: 688ae36dcb am: ce43593e5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6d34753e8bf9201e16121b8f3c6c83aa6358986
2021-03-15 12:56:09 +00:00
Aaron Huang
ce43593e5e Merge changes from topic "pacproxy-service" am: 16f50075b1 am: 688ae36dcb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294
2021-03-15 12:30:17 +00:00
Aaron Huang
16f50075b1 Merge changes from topic "pacproxy-service"
* changes:
  Make PacProxyService be a system service
  Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
2021-03-15 11:49:45 +00:00
Aaron Huang
5d31a15d84 Make PacProxyService be a system service
PacProxyInstaller class is running a thread all the time and is
listening to intent ACTION_PAC_REFRESH so it would be better to
make it be a system service with a manager class PacProxyManager
which is obtained with getSystemService(PacProxyManager.class).
Besides, rename PacProxyInstaller to PacProxyService will
be easier to know it's the service for PacProxyManager.

ConnectivityService is going to be a mainline module and it
needs constructor of PacProxyService to be SystemApi.
However, in current design, it needs to pass a handler and
an int arguments to the constructor which would be difficult
to maintain if just expose the constructor directly.

So, define a listener for the event that the current PAC
proxy has been installed so that the handler and the int
arguments can be removed from the constructor.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I2abff75ec59a17628ef006aad348c53fadbed076
2021-03-15 14:40:58 +08:00
Charles Chen
91734009df Merge "Add more logs in RootTDAOrganizer" into sc-dev 2021-03-15 02:47:52 +00:00
Jeff DeCew
5c72acc451 Allow color in minimized notifications
* This prevents the color change problem when expanding minimized notifications.
* The expander for minimized groups will use the non-highlight colors.

Fixes: 176899982
Test: manual
Change-Id: I592ebc1edc18075537c81bfa8d36dee9b6d011d1
2021-03-13 20:41:35 -05:00
Chris Li
3c2c7d9b42 Merge "Allow non-resizable to enter split screen from recent" into sc-dev 2021-03-13 22:31:52 +00:00
Chris Li
f834092444 Allow non-resizable to enter split screen from recent
Before, LegacySplitScreen is not allowing non-resizable to enter split
screen. Now, it also checks supportsNonResizableMultiWindow.

Fix: 181377395
Bug: 176061101
Test: manual
Change-Id: Iae4c65b5c8b0a139dbf8af55caba9f6c99d1f470
2021-03-12 16:04:11 -08:00
Nate Myren
23080b5bb5 Add a flag check in AppOpsManager to enable full stacktrace
Bug: 181558559

Test: N/A
Change-Id: I4b3d7ad50fa1937189ccc6572b55919275deae74
2021-03-12 15:54:11 -08:00
TreeHugger Robot
8771e57dd8 Merge "Created new @TestApi (and Shell command) to get policy-exempt apps." into sc-dev 2021-03-12 15:41:27 +00:00
Ching-Sung Li
0f77a1a084 Load default wallpaper by device's CMF color
Load default wallpaper by device's CMF color in WallpaperManager. The
fallback is to use default wallpaper if no matching wallpaper with
corresponding CMF color.

Bug: 178161042
Test: Build ROM and manual test
Change-Id: Iea818784f05f730e3cde79e95771a84db1b39225
2021-03-12 08:25:13 +00:00
Felipe Leme
4691ce920a Created new @TestApi (and Shell command) to get policy-exempt apps.
Test: adb shell cmd device_policy list-policy-exempt-apps
Test: atest FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest#testGetPolicyExemptApps_noPermission,testGetPolicyExemptApps_empty,testGetPolicyExemptApps_baseOnly,testGetPolicyExemptApps_vendorOnly,testGetPolicyExemptApps_baseAndVendor

Bug: 181238156
Fixes: 182373142

Change-Id: I990c53d1a2b9a6e15ad9fcae310badb7aae834d1
2021-03-11 15:20:13 -08:00
Jeff DeCew
4018c5075a Hide app name from collapsed CallStyle.
Also some small fixes:
* Bind the title in the CallStyle builder.
* Remove an unnecessary findViewById.
* Rename a method overload for clarity.

Bug: 179178086
Test: manual inspection
Change-Id: I6e96864c17718b9729b108e4db82534aad33675f
2021-03-11 14:53:07 -05:00
Jeff DeCew
12fa627bfb CallStyle now supports contextual actions (e.g. smart replies)
* This required that call style also has a collapsed state which has no actions.  Removing actions from the collapsed state resolves a bunch of bugs that were being introduced.  There's just too much of SystemUI that assumes collapsed notifications don't have actions to fix this right now.
* To make the collapsed state match stylistically, I also had to remove the progress bar from that state for vertical space reasons.

Bug: 179178086
Test: atest NotificationTemplateTests
Test: visual inspection ; expand/collapse
Change-Id: I6bc865d5fca8459ffaa6031d220d8bfa08545d89
2021-03-11 14:53:07 -05:00
TreeHugger Robot
e8eaea0ef2 Merge "Documentation fix: Permission grant opt-out" into sc-dev 2021-03-11 13:26:20 +00:00
Riddle Hsu
592bdb62b8 Merge "Do not report config change to activity if nothing changed" into sc-dev 2021-03-11 12:25:03 +00:00
Kholoud Mohamed
5c88989203 Merge "Allow forceUpdateUserSetupComplete on user builds" into sc-dev 2021-03-11 11:31:42 +00:00
Jeff DeCew
269093b8d8 Merge "Fix rules for exempting notifications from the expanded state." into sc-dev 2021-03-11 01:09:20 +00:00
Jeff DeCew
364576c7e0 Merge "Flow text around the large icon." into sc-dev 2021-03-10 22:19:22 +00:00
Patrick Baumann
e673774033 Merge "Add IllegalStateException with packageName on null info" into sc-dev 2021-03-10 21:14:21 +00:00
Jeff DeCew
bbcb857d3a Merge "CallStyle notifications now include their adjusted actions in the actions list." into sc-dev 2021-03-10 21:10:19 +00:00
Todd Kennedy
8db272ff65 Merge "Null check before invoking callback" into sc-dev 2021-03-10 21:00:40 +00:00
kholoud mohamed
3c4b814189 Allow forceUpdateUserSetupComplete on user builds
This fixes some failing cts tests running on user builds.

Test: atest android.devicepolicy.cts.DevicePolicyManagerTest
Fixes: 181567444
Change-Id: I07c3a98fcbe79d41fb224967569b877eefbc593c
2021-03-10 18:15:41 +00:00
Todd Kennedy
8fd52796c4 Null check before invoking callback
Also made sure to invoke the callback on the main
handler thread, like all other callbacks.

Fixes: 182164620
Test: atest PackageManagerTests
Change-Id: Ic2abe0877a716e83a10965bf348888a53ae95db8
2021-03-10 08:57:05 -08:00
Riddle Hsu
4b5690b9bd Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" am: 90e336819c am: 5028f8923a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3f761098ec224c709b1f779e3e4b296f08e265a
2021-03-10 16:38:05 +00:00
Riddle Hsu
5b9845ad38 Do not report config change to activity if nothing changed
Currently the diff only counts public fields. If only the rotation
of the window configuration is changed, the activity still receives
onConfigurationChanged which is unexpected.

Bug: 165794724
Test: AppConfigurationTests
Change-Id: Ice2db32b700493bcd47a38468ae66e91504895a6
2021-03-10 15:41:32 +00:00
Jeff DeCew
cdf6b6b4c9 Flow text around the large icon.
This is only necessary when a notification is posted without a title.

Fixes: 177976174
Test: Manual inspection of various staes.
Change-Id: I15fdc31e1557b7e5d6fb99e410f4bf37d6734ac4
2021-03-10 10:34:58 -05:00
Charles Chen
6acca0650c Merge "Fix deadlock between WMG and WMS" into sc-dev 2021-03-10 15:09:46 +00:00
Julia Reynolds
58050d1515 Merge changes I363c1670,Id16e8a0d into sc-dev
* changes:
  FGS notifs are no longer upranked
  Update comment
2021-03-10 14:42:50 +00:00
Charles Chen
ddb41ad5d5 Merge "Relaxed WallpaperManager API assertion" into sc-dev 2021-03-10 08:17:22 +00:00
weihua.li
af6f90bbf1 Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo
Use memInfo.getTotalRss instead of memInfo.getTotalPss
to get the value of 'TOTAL of Rss Total'.

bug 182328162

Signed-off-by: weihua.li <weihua.li@unisoc.com>
Change-Id: I5487abe4870e10f4ee79c86c0ad0e75a3843deb1
2021-03-10 13:56:35 +08:00
Jeff DeCew
8733c51248 Fix rules for exempting notifications from the expanded state.
Bug: 175207142
Test: Post a notification with a customContentView, but not a bigCustomContentView; note that it is no longer expandable.
Change-Id: I9bf41f3313e68ddbb43485cee37911bc8cfeb012
2021-03-09 21:48:06 -05:00
Jeff Sharkey
c8faccf35a Merge changes from topic "mar8" into sc-dev
* changes:
  Refinement of ContextParams behavior.
  Relax null checks to fix tests.
2021-03-09 22:35:49 +00:00
Patrick Baumann
92a23d32a9 Add IllegalStateException with packageName on null info
This change returns the behavior of initializeJavaContextClassLoader in
LoadedApk to throw an IllegalStateException calling out the package it
attempted to fetch. This was removed when client-side caching was added
resulting in a different stack trace without this critical piece of
information that could help make sense of why this is happening.

Bug: 180418767
Bug: 140788621
Test: N/A; builds
Change-Id: Ia1ceff922f693093012eb6e3e0f6e1d90222cde7
2021-03-09 21:54:53 +00:00
Jeff DeCew
1a7ae5b90b CallStyle notifications now include their adjusted actions in the actions list.
Also, NotificationManagerService.fixNotification ensures correct actions.

Bug: 179178086
Test: Post CallStyle notification, validate actions exist.
Test: Set breakpoint inside fixNotification logic to ensure conditional is catching the style correctly.
Change-Id: I669c89d844b3e6258831543417f49efddd4cd4f2
2021-03-09 13:14:42 -05:00
Julia Reynolds
348edec283 Update comment
Test: make
Fixes: 181350653
Change-Id: Id16e8a0d36a4e3664a175f87e323179b648eed04
2021-03-09 15:01:18 +00:00
Eran Messeri
5442128882 Documentation fix: Permission grant opt-out
The documentation for EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT says
it should be used ACTION_PROVISION_MANAGED_DEVICE. However, that is
deprecated since it's no longer needed (and there's another way to
provision a fully-managed device).

Remove reference to the deprecated constant and simply mention device
owner provisioning.

Bug: 182180699
Test: That it compiles.
Change-Id: I8681c09fb9fa008f0e2ccf62c5dad8d37cd1b843
2021-03-09 14:23:32 +00:00
Charles Chen
045230a432 Fix deadlock between WMG and WMS
The dealock happened while WM#addView and WMS holds lock and called
onWindowTokenRemoved.

WM#addView -> WMG#addView(holds WMG lock) ->
... -> WMS#addWindow(holds WMS lock)
(holds WMS lock) ... -> WindowTokenClient#onWindowTokenRemoved
... -> WMG#closeAll(holds WMG lock)

This CL calls to WMG#closeAll asynchronously to release WMG lock

fixes: 181839758
Test: manual
Change-Id: I0cf8a505043a4def4dcf346952873b1362a92084
2021-03-09 21:39:38 +08:00
Paul Hu
a8469c27cb Merge "New API for comparing two intents of PendingIntent object." am: 687da317ad am: 46a371b494
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0beb8b5bebdddba8e01f3dbef595212862150365
2021-03-09 11:51:29 +00:00
Paul Hu
687da317ad Merge "New API for comparing two intents of PendingIntent object." 2021-03-09 10:55:00 +00:00
paulhu
514881581d New API for comparing two intents of PendingIntent object.
Bug: 174237997
Test: atest PendingIntentTest
Merged-In: Ic5eb20f94ff6fd6953315a5f848effa25b813da7

Change-Id: Ic5eb20f94ff6fd6953315a5f848effa25b813da7
2021-03-09 02:49:43 +00:00
Remi NGUYEN VAN
92d9a9a796 Merge "New API for comparing two intents of PendingIntent object." into sc-dev 2021-03-09 02:45:30 +00:00
Chilun Huang
6cd1cb58f7 Merge "Introduce ConfigurationController" into sc-dev 2021-03-09 01:58:58 +00:00
Jeff Sharkey
29e882b417 Refinement of ContextParams behavior.
Since this parameters object is likely going to grow over time, we
should offer a way for callers to easily "inherit" all sub-parameters
by default, instead of making them copy the values manually.

This also gives a path for legacy apps to automatically preserve any
new sub-parameters that have been added in more modern API levels.

This change also relaxes the nullability annotations to match the
existing createAttributionContext() behavior, while also supporting
clearing of specific inherited values.

Bug: 181812281
Test: atest CtsContentTestCases:android.content.cts.ContextTest
Change-Id: Ic797e1aef578926b04ea0000ca3a1bf8684183b9
2021-03-08 18:07:00 -07:00
James O'Leary
d96ed76ddc Merge "Fix boot time regression on Wembley" into sc-dev 2021-03-08 21:33:37 +00:00
Mady Mellor
e15c6dd81a Merge changes from topic "mm_setSuppress" into sc-dev
* changes:
  SysUI changes for setSuppressBubble
  Track locusId visibility in ShellTaskOrganizer
  Add locus id to ActivityRecord / TaskInfo
  Bubble API: suppress bubble
2021-03-08 21:27:36 +00:00
Jeff DeCew
1b3157fa77 Merge "Default colored notifications use accent color for icon; System notifications use default color." into sc-dev 2021-03-08 17:28:22 +00:00
James O'Leary
bddae911fc Fix boot time regression on Wembley
After a ton of regression testing on Forrest and checking dashboards,
turns out the boot time regression due to new color code only happens
on Wembley in CI.

Wembley in CI has 1 GB of RAM, or at least, it returns true for
`ActivityManager.isLowRamDevice`

To fix the regression, when we're performing clustering
on a low RAM device, we'll use the prior clustering strategy (Kmeans,
5 colors). Net impact is speed improvement + there will be less options
for colors. Kmeans erases less common colors first, and those colors
tend to be good candidates for highly chromatic colors.

Fixes: 181348302
Fixes: 181194430
Test: Did about 50 runs on Forrest, isolated issue. Final Forrest
run showing that startservices_avg decreases to previous levels on
Wembley with this CL is here:
https://android-build.googleplex.com/builds/forrest/run/L87800000829799585
To see the improvement back to baseline (~1350 ms), open that link,
at the table of the bottom of the page, click "asit/perf/boottime_test",
then click Artifacts, then click
test_results15031410639465275315_8163110686177237845.txt, and search
for SystemUIBootTiming_startservices_avg.
Alternatively, here is a direct link to the test results text file:
https://android-build.googleplex.com/builds/I89400007809099518/git_master/P20404532/successiveboottest/inv_17043739560101466259/test_results15031410639465275315_8163110686177237845.txt

Change-Id: I53ee5b5f95e6fd54f1327005e391d428f650dbfa
2021-03-08 11:29:22 -05:00