Commit Graph

20374 Commits

Author SHA1 Message Date
Jeff DeCew
7d1ca13d41 Merge "Minimal change to remove development settings." into sc-dev 2021-03-20 02:34:24 +00:00
Chris Tate
c243f46c6f Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev 2021-03-19 20:27:43 +00:00
Branden Archer
30491b1daf Merge "Allow PO to enable security logging on work profile" into sc-dev 2021-03-19 20:24:30 +00:00
Jeff DeCew
6f667c3b5a Minimal change to remove development settings.
Fixes: 183120687
Test: manual
Change-Id: I5632e131b47058ebe25ab21db004eb90498bc299
2021-03-19 15:59:47 -04:00
Julia Reynolds
e363bcdbfa Merge "Be more specific about media statuses" into sc-dev 2021-03-19 19:01:23 +00:00
TreeHugger Robot
06d70ab66d Merge "Allow the system to specify user-force when restricting." into sc-dev 2021-03-19 18:19:37 +00:00
Christopher Tate
529052350f DO NOT MERGE - Disallow deletion of channels with FGS notifications
Bug: 156090809
Test: atest CtsAppTestCases:NotificationManagerTest
Test: atest CtsAppTestCases:android.app.cts.ServiceTest
Change-Id: I1c2bb78d86f194585d273661cecf3419f51965df
Merged-In: I1c2bb78d86f194585d273661cecf3419f51965df
(cherry picked from commit 39b3890268913bc2dc8b90671d042c0e9b4090d2)
2021-03-19 16:43:32 +00:00
Julia Reynolds
eb1698b1d3 Be more specific about media statuses
Test: atest ConversationStatusTest
Fixes: 183130972
Change-Id: I0d05619bface3ff633c3bf4c02f8b7bf01876fe8
2021-03-19 15:24:16 +00:00
Kweku Adams
071a10efdb Allow the system to specify user-force when restricting.
There are certain situations where user-force is the right reason to
apply when placing an app in the RESTRICTED bucket, but the previous
APIs didn't allow for those situations. Introduce a new one to account
for those scenarios.

Bug: 183103253
Test: atest AppStandbyControllerTests
Change-Id: Ifbdc7de8975f31110224b7c20328f9c53abe68d9
2021-03-19 15:17:33 +00:00
Jeff DeCew
a84cafdd58 Merge "Fix an likely ClassCastException in Notification.visitUris" into sc-dev 2021-03-19 00:11:32 +00:00
Shuo Qian
405df3c983 Merge "Add push mechanism in DPM for ConnecitivityService Remove DPM.isNetworkSlicingEnabledForUser" into sc-dev 2021-03-18 22:55:21 +00:00
Shuo Qian
0c3d39fea6 Add push mechanism in DPM for ConnecitivityService
Remove DPM.isNetworkSlicingEnabledForUser

Test: Unit test added but commented; atest DevicePolicyManagerTest
Bug: 178655595
Change-Id: I77d1996f33b017221a14799e71f2df2123f99b32
Merged-In: I77d1996f33b017221a14799e71f2df2123f99b32
2021-03-18 22:15:00 +00:00
Alex Johnston
255b41f170 Merge "hasKeyPair callable by the cred mng app" into sc-dev 2021-03-18 20:06:17 +00:00
Kholoud Mohamed
b9f9e6fbac Merge "Add a new broadcast to notify when dpm constants change" into sc-dev 2021-03-18 17:02:55 +00:00
TreeHugger Robot
ab681d10bb Merge "Fix IntDef for DevicePolicyManager.PrivateDnsMode" into sc-dev 2021-03-18 17:01:02 +00:00
Alex Johnston
98bb355acb hasKeyPair callable by the cred mng app
The credential management app can call
hasKeyPair. The provided alias must be
found in the credential management
app's authentication policy.

Bug: 177979648
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
      atest android.devicepolicy.cts.CredentialManagementAppTest
Change-Id: Ib28549fb4e2848ba012df2d154d28f2002ec6e59
2021-03-18 14:18:40 +00:00
Julia Reynolds
d31299c5a8 Merge "Rename notificationchannel constant values" into sc-dev 2021-03-18 14:03:53 +00:00
Julia Reynolds
18417de2c5 Merge changes I5a807bbb,Icc3dd959 into sc-dev
* changes:
  Add an intdef
  Fix contrast issues in channel blocking ui
2021-03-18 13:49:05 +00:00
Kholoud Mohamed
9c8071e410 Merge "Exposed some testAPIs in ActivityManager" into sc-dev 2021-03-18 10:13:04 +00:00
Wei Sheng Shih
4a1f799020 Merge "Remove the timeout which used for cleanup splash screen" into sc-dev 2021-03-18 09:45:39 +00:00
Almaz Mingaleev
d355fee300 Merge "Add time related API to TimeManager." into sc-dev 2021-03-18 09:23:30 +00:00
wilsonshih
5cafb53ce6 Remove the timeout which used for cleanup splash screen
Remove the internal timeout to clean up the starting window, for now on
the developers are responsible for removing it.

- Also clean up some redundant members.

Bug: 181838419
Test: atest SplashscreenTests
Change-Id: Iebcccbca454eb7fda4bed637cb5866deec36cf6b
2021-03-18 11:36:44 +08:00
Julia Reynolds
4c8fecf214 Rename notificationchannel constant values
Test: make
Fixes: 183052700
Change-Id: Ib44c142f4aecbd7f834034ef392ff53a05e7ae0e
2021-03-17 21:43:27 -04:00
Julia Reynolds
039f924455 Add an intdef
Test: make
Fixes: 176822079
Change-Id: I5a807bbbb89a7bd07d7d46c792b9e2199201713a
2021-03-18 01:31:58 +00:00
Chalard Jean
717e9eeaee Merge "Annotate NSM heavy methods with @WorkerThread" am: db9e849986 am: 11166d7d71 am: 25cae56500
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859

Change-Id: I6115f4ed727a78f5ed800e7e254913220d1d5bec
2021-03-17 22:10:58 +00:00
Branden Archer
c943c6a31b Allow PO to enable security logging on work profile
Test: The following were run:
  atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testSecurityLogging
  atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testSecurityLoggingDelegate
  atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSecurityLoggingWithSingleUser
  atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSecurityLoggingDelegate

Bug: 165905995
Change-Id: I06632ad7ff06b1d7a5877f6dbcd164dd40673bcf
2021-03-17 14:44:52 -07:00
kholoud mohamed
23c36dbe21 Exposed some testAPIs in ActivityManager
- Added the following testAPIs to replace the usage
of adb shell commands in tests:
* stopUser and ACTION_USER_STOPPED
* waitForBroadcastIdle

- Changed the documentation for switchUser to correctly
reflect that it accepts CREATE_USERS

Test: verfied that tests can access the APIs
Bug: 181030374
Change-Id: I92b92471a18cf97a118d3f1946d6e06c277a76f1
2021-03-17 21:08:02 +00:00
TreeHugger Robot
883f474ea8 Merge "Expand try/catch for DeviceConfig in AppOpsManager" into sc-dev 2021-03-17 19:29:56 +00:00
TreeHugger Robot
d5cf5ab4a8 Merge "Fixed broken HTML tag." into sc-dev 2021-03-17 18:40:02 +00:00
Nate Myren
e1add58118 Merge "Remove R QPR attribution hacks" into sc-dev 2021-03-17 18:26:54 +00:00
Nate Myren
add3f1bdf1 Expand try/catch for DeviceConfig in AppOpsManager
Some apps, such as the shell, do not seem to be able to always access
the DeviceConfig, and get an NPE. Fail gracefully when this happens.

Test: manual
Fixes: 182907280
Change-Id: If4de34f2022c165ad8bf5a950c8a04cfd5abacc9
2021-03-17 10:03:59 -07:00
Jeff DeCew
3f654a2cf6 Fix an likely ClassCastException in Notification.visitUris
The code (and unit test) treated EXTRA_AUDIO_CONTENTS_URI as a Uri, but the extra is very explicitly documented as a String.  Sample code and everything.

Fixes: 182997213
Test: atest NotificationManagerServiceTest#testVisitUris
Test: atest NotificationManagerServiceTest#testVisitUris_audioContentsString
Change-Id: I3cfc657f88d8e273270c777b199ce056ff2ffc67
2021-03-17 11:06:43 -04:00
Rubin Xu
b2d9eb2f98 Fix IntDef for DevicePolicyManager.PrivateDnsMode
Remove the flag bit since it's not a flag.

Bug: 174238861
Test: none
Change-Id: I38515af4c9da6fec54cf3fe7c159b5fb1b4bebab
2021-03-17 14:28:38 +00:00
Bernardo Rufino
b5c1bd7b0d Merge "Remove collapsePanels() publicAlternatives" into sc-dev 2021-03-17 11:30:15 +00:00
Chalard Jean
25cae56500 Merge "Annotate NSM heavy methods with @WorkerThread" am: db9e849986 am: 11166d7d71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859

Change-Id: I4091f82e7b95901a88cd9528c92df4519fb3edd1
2021-03-17 03:08:28 +00:00
Chalard Jean
db9e849986 Merge "Annotate NSM heavy methods with @WorkerThread" 2021-03-17 02:03:22 +00:00
Ivan Chiang
8017e2b6dd Merge "Add new permission MANAGE_MEDIA" into sc-dev 2021-03-17 01:50:59 +00:00
Nate Myren
f882feeabc Remove R QPR attribution hacks
Bug: 172868375
Test: manual
Change-Id: I5e731bb821e879f6c314604912f13800ca668aa4
2021-03-16 15:10:36 -07:00
Felipe Leme
7f49f69f02 Fixed broken HTML tag.
Test: m -j doc-comment-check-docs
Fixes: 182908993

Change-Id: I8514c1010f3be6ffcbc0f160b6354050ff9a930e
2021-03-16 19:44:48 +00:00
Evan Rosky
1b529aa19d Merge "Do the same size-configuration bucketing on both server and client" into sc-dev 2021-03-16 19:37:12 +00:00
Jay Aliomer
adb6b16829 Merge "Local Wallpaper Color high resource usage" into sc-dev 2021-03-16 17:43:00 +00:00
Benjamin Franz
0b3f22b216 Merge "Create per-app treatment for overriding minimum aspect ratio" into sc-dev 2021-03-16 15:51:43 +00:00
Bernardo Rufino
5752b1b27b Remove collapsePanels() publicAlternatives
Back when we added Intent.ACSD to publicAlternatives of collapsePanels()
in ag/13035420, we didn't have the complete picture of which use-cases
the Intent.ACSD would remain valid for and I thought there might still
be 3p valid use-cases. Turns out cinek@ was right in that CL.

After finished implementation, there are not 3p valid use-cases for
Intent.ACSD anymore - this is explained in detail in ag/13331897 but
TL;DR; for security reasons we're deprecating the intent and in S the
platform will automatically be responsible for collapsing the shade
where applicable. So, the result is that there are no public
alternatives to collapsePanels() anymore and this is on purpose since
having this capability lead to abuse.

Test: Builds
Bug: 159105552
Change-Id: I5ead6f83d19b00a27498a0ef42b6957667964644
2021-03-16 14:21:22 +00:00
Benjamin Franz
c4a55ff629 Create per-app treatment for overriding minimum aspect ratio
We define three change ids in this change:
OVERRIDE_MIN_ASPECT_RATIO
OVERRIDE_MIN_ASPECT_RATIO_MEDIUM
OVERRIDE_MIN_ASPECT_RATIO_LARGE

Depending on which change ids are enabled, we override the minimum
aspect ratio of a given app to the value corresponding to the treatment.

Bug: 174042980
Test: atest WmTests:SizeCompatTests
Change-Id: I2db2a3acbd051b651b7ab0dc4c51c38a0276430b
2021-03-16 09:50:16 +00:00
Ivan Chiang
f31754e049 Add new permission MANAGE_MEDIA
Test: m -j, Booted
Test: atest CtsPermission2TestCases
Bug: 181112025
Change-Id: I4f2ef6c0562346ab61e43a7fdc8a2316d75c509c
2021-03-16 15:09:33 +08:00
Evan Rosky
6c5f8fc3d8 Do the same size-configuration bucketing on both server and client
Otherwise they get out-of-sync and sometimes AR will not relaunch
the app, but the app client will think it needs to be relaunched

Bug: 181697795
Test: app configuration tests pass.
      With 3-button nav, open app in split and observe launcher
      reconfigure properly.
Change-Id: Idc8d71d92d9ae107e3adb949a2137de6c08908e9
2021-03-15 15:37:07 -07:00
Jay Aliomer
6bb6687f88 Local Wallpaper Color high resource usage
Fixes: b/182482946
Test: WallpaperManagerTest
Change-Id: Ic4161e43e30f71886984d22a47b086d647188613
2021-03-15 17:58:31 -04:00
Zhen Zhang
23f7206dbc Create component used metrics in UsageStats
Created a new metrics called mLastTimeComponentUsed in UsageStats.
It is persisted and loaded as other metrics.

Bug: 175829712
Test: core/tests/coretests/src/android/app/usage/UsageStatsTest
Test: cts/UsageStatsTest
Test: UsageStatsDatabaseTest
Test: UsageStatsServiceTest
Test: UsageStatsPersistenceTest
Change-Id: I10cf5c40cf5955246a6a04e96ac0352b4ed29acd
2021-03-15 14:24:08 -07:00
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