Commit Graph

18746 Commits

Author SHA1 Message Date
Jeff Sharkey
49d152a711 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf am: 5c4203f396 am: 0197a6d5e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I6e8e09a2ebb762248d1067967adb16c07f411333
2020-06-23 17:06:49 +00:00
Jeff Sharkey
0197a6d5e6 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf am: 5c4203f396
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I4223e9fdb016bbdfbd075fce757744bd9fa25f35
2020-06-23 16:47:02 +00:00
TreeHugger Robot
9bc8e57bbe Merge changes from topic "featureIdCleanup"
* changes:
  Do not allow invalid attribution tags
  Remove legacy support for "featureId".
2020-06-23 16:20:57 +00:00
Jeff Sharkey
38a6333ff6 Merge "Override MIME type to match MediaStore behavior." into rvc-dev 2020-06-23 15:56:44 +00:00
Jeff Sharkey
83aaf908a6 Override MIME type to match MediaStore behavior.
Internally, DownloadManager synchronizes its contents with MediaStore,
which relies heavily on using file extensions to determine MIME types.

To prevent these two databases from getting confused, this change
adjusts DownloadManager to force the MIME type of already-completed
downloads based on the file extension, matching what MediaStore does.

Bug: 159594536
Test: atest PublicApiAccessTest#testAddCompletedWithoutExtension
Change-Id: I60c613eafcfe55007dffcac2d7d1fe375b753c19
2020-06-23 07:13:13 -06:00
Issei Suzuki
89983c49b0 Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbef0 am: 34e1bd049d am: cec5f1e901 am: e621d1ac79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931082

Change-Id: If39eac860c4d461660333aa55df3539218fa2564
2020-06-23 12:42:54 +00:00
Issei Suzuki
cec5f1e901 Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbef0 am: 34e1bd049d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931082

Change-Id: I404a2e8ee40c8768aac88c3dc39c1317a7cb2def
2020-06-23 12:17:49 +00:00
Issei Suzuki
16868fbef0 Merge "Update virtual display size before turning it on." into rvc-dev 2020-06-23 11:46:16 +00:00
Kweku Adams
2a365580c0 Merge "Disable restricted bucket." into rvc-dev am: 6cca001863 am: aea41aec2b am: ebba61330d am: 303ddce2ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11740346

Change-Id: I105331902d59d2f56f30ebbaaaf45680bdc72f20
2020-06-23 01:07:14 +00:00
Kweku Adams
aea41aec2b Merge "Disable restricted bucket." into rvc-dev am: 6cca001863
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11740346

Change-Id: If3eb3f5bcb9b99e3bed7f89ba03048bb8f7d3f05
2020-06-23 00:18:30 +00:00
Kweku Adams
6cca001863 Merge "Disable restricted bucket." into rvc-dev 2020-06-23 00:13:41 +00:00
Michael Groover
7032cfbe9f Merge "Update docs for methods that require subscriberId" into rvc-dev am: 2bcb70322c am: 64baddcb32 am: cbbc274eef am: dcfb58ce63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: Ib39318aadd8caca0689ba2d09932eb2119990926
2020-06-22 20:17:16 +00:00
Michael Groover
dcfb58ce63 Merge "Update docs for methods that require subscriberId" into rvc-dev am: 2bcb70322c am: 64baddcb32 am: cbbc274eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: Iac86f4af0953a45eb934e64e01ced4bad153aac9
2020-06-22 19:50:37 +00:00
Michael Groover
b9e3d1a84c Merge "Update docs for methods that require subscriberId" into rvc-dev am: 2bcb70322c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: I627d3015c0e2cad832a8fd9926fc2079241bd9cd
2020-06-22 19:31:31 +00:00
Michael Groover
2bcb70322c Merge "Update docs for methods that require subscriberId" into rvc-dev 2020-06-22 19:30:10 +00:00
Hongwei Wang
07a5e3f2b4 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: 4cac31dde3 am: 29afe59ac4 am: c0643da38f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I7b3fed3f60e3e6f10ce4cebb4a777a4f5e5b819b
2020-06-22 19:13:38 +00:00
Hongwei Wang
4cac31dde3 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: Ic4d994aa3635098e269dc3e198a96ad84f976910
2020-06-22 18:27:57 +00:00
Hongwei Wang
997150ee0a Merge "Updates enterPictureInPicture API doc" into rvc-dev 2020-06-22 18:14:10 +00:00
Stanislav Zholnin
d3fbb9fe8b Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a37c am: 113387f309 am: 7f757a3006 am: 1ed2d1e39a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930479

Change-Id: Ib06abfe9399b0c69ab26c137b77f395033c55219
2020-06-22 09:14:07 +00:00
Stanislav Zholnin
7f757a3006 Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a37c am: 113387f309
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930479

Change-Id: Idd9acf7078c05270b99bf064702e92257ddc2496
2020-06-22 08:40:35 +00:00
Stanislav Zholnin
b234c0a600 Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev am: 7a65a7a37c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930479

Change-Id: I8fc36dcc5d7a1769e302735a1a613356329926ff
2020-06-22 08:25:18 +00:00
Stanislav Zholnin
7a65a7a37c Merge "Prevent developer provided strings from being uploaded through statsd." into rvc-dev 2020-06-22 08:10:52 +00:00
TreeHugger Robot
96140c8b07 Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 am: ba0db734e6 am: d676060146 am: 721e445b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I9df265b1e5ab8734b3f2917e3bd933f11809e026
2020-06-22 03:55:20 +00:00
TreeHugger Robot
d676060146 Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 am: ba0db734e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I22ad6b374f4f966e1fd2b02ac23caf7817bde105
2020-06-22 03:31:19 +00:00
TreeHugger Robot
35b794f35e Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936460

Change-Id: I9eb11d6ad4f4583269811ba77e8aa4b76f17c3e0
2020-06-22 03:18:55 +00:00
TreeHugger Robot
48e9dc67f1 Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev 2020-06-22 03:04:37 +00:00
Jeff Chang
79f5a49b3c Revert "Fix transition return issues when more than 1 level depth"
This reverts commit 6d834d86fb.

Reason for revert: <http://b/159230864 WhatsApp image is visible after existing a chat>
Bug: 159230864

Change-Id: Ib266cff2e06a82ae9a0e85142ef80ae00328a040
2020-06-20 06:09:04 +00:00
TreeHugger Robot
d4719d4aea Merge "Improve app-ops docs" 2020-06-20 04:26:19 +00:00
Philip P. Moltmann
b06f5eed35 Improve app-ops docs
- featureId was renamed attributionTag
- explain the difference between instantious and long running ops
- factor proxying into its own section

Test: docs only
Change-Id: Ib94b55f1fa7ba4da71dcf41e8af2d29b73e8bad0
2020-06-20 03:01:36 +00:00
Philip P. Moltmann
a51c2ef3ea Do not allow invalid attribution tags
Fixes: 151105954
Test: atest CtsAppOpsTestCases
Change-Id: I2b210172bd042300cc8aa54edf3f68b6aa3420fe
2020-06-19 19:57:27 -07:00
Michael Groover
f4f6a7adac Update docs for methods that require subscriberId
In Android 10 additional restrictions were required to access the
subscriberId. The NetworkStatsManager has several methods that accept
a subscriberId of the mobile network for which usage should be queried.
This commit updates the docs for these methods to reference the new
access restrictions and offer null as an option to obtain the usage
for all mobile networks.

Fixes: 157871064
Test: m docs
Change-Id: I95c730c9418fced6312eb3ba4e0d69e6299f3ded
2020-06-19 19:48:07 -07:00
Automerger Merge Worker
a3bc86ea47 Merge "Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328 am: b41ace7709" into rvc-qpr-dev-plus-aosp am: 49cc74c60e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: I77bc10cc1173b2a653d5c796ddd4d4ef76fc1455
2020-06-19 22:41:40 +00:00
TreeHugger Robot
c2623c38d3 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328 am: b41ace7709
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: Iba3af539238fbc97e0c7a251723c4d50d31ee92a
2020-06-19 22:18:25 +00:00
TreeHugger Robot
319a6644f3 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: I4a5f511e3739df3ef55070887bbe8929767e58d7
2020-06-19 21:43:33 +00:00
TreeHugger Robot
7ec25249ab Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev 2020-06-19 21:29:40 +00:00
Stanislav Zholnin
456b496e4a Save AsyncOps for later forwarding instead of SyncOps.
Fixes: 159082266
Test: atest AppOpsLoggingTest
Change-Id: I3f8da9d7c2925233e5e53cfa7fd5e4cd1c258b29
2020-06-19 19:48:35 +01:00
Stanislav Zholnin
54762b293e Prevent developer provided strings from being uploaded through statsd.
- in situation when developer provides message when op is noted, do not
report it through stack trace collection infrastructure
 - collect only statcktraces for OP_FLAG_SELF and OP_FLAG_TRUSTED_PROXIED to
match collection of appops counts

Test: atest  android.app.appops.cts.RuntimeMessageCollectionTest
Fixes: 159433071
Change-Id: I1ab56a530832873a1f1f68aba5ab6eabc9e8a17a
2020-06-19 19:43:03 +01:00
Nikolas Havrikov
b1eae3a0bc Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188 am: 11334e7104 am: 18f1c524b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: I4391e46830831858cd39489204f8c4d815b9aa86
2020-06-19 18:37:24 +00:00
Nikolas Havrikov
11334e7104 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495 am: fb0af32188
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Idc130a88857cb4332d2af1c401aeb0c63cb20f12
2020-06-19 18:14:39 +00:00
Nikolas Havrikov
a457821085 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev am: 0cf1ad8495
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11911999

Change-Id: Id964f7b5ffed9c9836f8fd8db2d958f8ea9be582
2020-06-19 18:01:06 +00:00
TreeHugger Robot
8d0d16fd2d Merge "Copying some ActivityManager hidden APIs to Internal" 2020-06-19 17:49:48 +00:00
Nikolas Havrikov
0cf1ad8495 Merge "Ensure mShowDialogs gets updated as part of global config update" into rvc-dev 2020-06-19 17:49:34 +00:00
Issei Suzuki
ea5bec73f4 Update virtual display size before turning it on.
When a bubble is expanded, a virtual display turns on, an activity for
the bubble is resumed, and the activity draws contents on the virtual
display. The system waits until the contents is drawn, then shows the
contents in the bubble.

However, if size of the virtual display is changed after resuming the
activity, an app transition initiated by the activity is canceled, and
this sequence gets stuck. As a result, contents in the bubble is never
displayed.

Test: Manual.
Bug: 158675422
Change-Id: I3ba0805fd09f4dee36dae6a236b5b6fc7983e06b
2020-06-19 18:14:33 +02:00
Nikolas Havrikov
7771e6ebf5 Ensure mShowDialogs gets updated as part of global config update
The "App keeps crashing" dialog appears on Android TV even
though it should not. This would usually be accounted for
by setting mShowDialogs to false in the ActivityTaskManagerService
on boot. However, this does not happen because the service uses a
method of the ActivityTaskManager which pulls its configuration
from the context, which at this point is not yet updated to reflect
relevant values like the uiMode.

This change solves this problem by introducing an internal method
in the ActivityTaskManager, which acts on a given configuration
instead of the one from the context. This is helpful because the
caller ActivityTaskManagerService is holding on to the correct
configuration in the first place.

Furthermore, this change does not impact any outward-facing
behavior, nor does it introduce code duplication as the old
method of ActivityTaskManager new merely delegates its task
to the new one with the same configuration it would have
originally pulled from the context.

Test: Manually on ADT-3 device
Bug: 159019027
Change-Id: I0fac574a69a19243c2e62b967978ef5d8318ee51
2020-06-19 15:23:50 +02:00
Alex Johnston
55d78b8675 Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e381 am: 4e332683a7 am: da45fdc99f am: b00d036912
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10919475

Change-Id: I69ae26a0dabb271a9f59abe1c060be0f4285c06c
2020-06-19 13:19:45 +00:00
Alex Johnston
b00d036912 Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e381 am: 4e332683a7 am: da45fdc99f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10919475

Change-Id: I6521bb68ebe4103c66488410bd4a09353f04d3b3
2020-06-19 13:07:02 +00:00
Alex Johnston
362ada443c Merge "Change behaviour of screen capture disabled" into rvc-dev am: 2a02c8e381
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10919475

Change-Id: I6bc664c4a640c76bb0b83478e4cfcaa2d1ee64c9
2020-06-19 12:34:10 +00:00
Alex Johnston
2a02c8e381 Merge "Change behaviour of screen capture disabled" into rvc-dev 2020-06-19 12:20:38 +00:00
Suprabh Shukla
1f79c1af5b Copying some ActivityManager hidden APIs to Internal
Starting with updating references in alarm manager. Will update
references across the module in a follow up.
This is the first step to formalize them as in-process SystemApi.

Test: atest CtsAlarmManagerTestCases
atest FrameworksMockingServicesTests:com.android.server.alarm

Bug: 159382386
Change-Id: If066187bf26f1f6c532ab0f986996d427c1a17fa
2020-06-18 22:43:52 -07:00
Alex Johnston
302c1fe947 Change behaviour of screen capture disabled
Background
* Historically, when the screen capture disabled
  policy was set on the personal profile, screen
  capture was disabled for the whole device
  (per-device).
* This should be changed to only be disabled in
  the personal profile (per-profile).

Changes
* Renamed DevicePolicyCache methods to setScreenCaptureAllowed
  and isScreenCaptureAllowed
* Added parameter ownerCanAddInternalSystemWindow to
  isScreenCaptureAllowed

Bug: 148453838
Bug: 157035400
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: If1bd68f0ec3e88497c5d3b4382977b526b2364ba
2020-06-18 22:58:28 +01:00