Commit Graph

18211 Commits

Author SHA1 Message Date
Charles Chen
dc26be9316 Merge "Enable IMS and its config context to obtain UI component" into rvc-dev am: 8655743001 am: e3138eca89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818544

Change-Id: I2e820a5300bb6fb4e7d0f4444c09cad4a2d0a9c5
2020-06-24 03:51:10 +00:00
Charles Chen
8655743001 Merge "Enable IMS and its config context to obtain UI component" into rvc-dev 2020-06-24 03:33:53 +00:00
Jeff Sharkey
eac11fa9c4 Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282

Change-Id: I27c7f67dcbdbf5371c3ebc7cf9e955c7b695b700
2020-06-23 16:34:52 +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
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
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
Charles Chen
d2fd037ab3 Enable IMS and its config context to obtain UI component
Test: atest StrictModeTest
Bug: 157027563

Change-Id: I172ceb2e17722a7cba917a6e3a808d7559cad3e0
2020-06-23 03:45:17 +08: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
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
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
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
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
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
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
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
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
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
Evan Rosky
affc0e64ce Merge "Use actual resizability for split-screen operations" into rvc-dev am: 058a713a74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854827

Change-Id: Id8b069365f30540fd3dda9824187976fb4174a59
2020-06-18 17:40:30 +00:00
Evan Rosky
058a713a74 Merge "Use actual resizability for split-screen operations" into rvc-dev 2020-06-18 17:25:53 +00:00
Nikita Ioffe
2ea633314f Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518

Change-Id: I0c5fc35f9251c3ffd43b43d63b7bfbbddf8d5061
2020-06-16 20:31:04 +00:00
Nikita Ioffe
663727472a Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev 2020-06-16 20:17:29 +00:00
Shawn Lin
095fe5e396 Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: I9ab450adab3542aa3d8b05ddccfd015dcc657a1c
2020-06-16 09:32:54 +00:00
Shawn Lin
1c2e8eafff Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev 2020-06-16 09:32:15 +00:00
Evan Rosky
889f49683f Use actual resizability for split-screen operations
Split-screen and activity-start were relying on resizeMode,
but that is what the activity requests vs how the system
actually treats a given task/activity. This caused some
inconsistencies in how non-resizable things were handled
when the developer option to force resizability was turned
on.

Also needed to fix an issue where non-leaf tasks would
get stuck with an out-dated intent. In particular, this
happened with the root HOME task which meant its
resizeMode could never change from that of FallbackHome.

Bug: 158514252
Test: enable force resizable in dev options and then launch
      camera into secondary split.
Change-Id: If06d047813315f39894bead19d2cbe0c9444f254
2020-06-15 19:57:55 -07:00
TreeHugger Robot
3679ed262e Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867441

Change-Id: I958250d37114932d7db384bf77fc3a4e742a2e1d
2020-06-15 20:16:22 +00:00
TreeHugger Robot
9ac716fc8b Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev 2020-06-15 20:06:31 +00:00
Stanislav Zholnin
9edce64ef2 Properly handle situation when currentOpPackageName returns null.
Fixes: 158309330
Test: adb shell content query --uri content://com.android.contacts/data --projection  contact_id:raw_contact_id:_id:display_name:last_time_used:data1:account_type:mimetype
Change-Id: I6c5d0c4fef150ba45721d474ac0f83778d543467
2020-06-15 17:28:33 +01:00
shawnlin
2806269a5a Fixed the conflict of the release methods of ActivityView & TaskEmbedder
There is a case in Bubble that we might release a un-initialized
TaskEmbedder while calling ActivityView.release() (ex. create a bubble
and don't expand it and then dismiss it) which will cause an exception.

Allow ActivityView.release() to be called at anytime and check the
initialization state before calling TaskEmbedder.release().

Bug: 155417004
Test: 1. Add bubbles and don't expands them then dimiss them
      2. Check logs.
Change-Id: I583ddd36f407c908cb63c109834940fc91c8d130
2020-06-15 15:47:14 +08:00
Jordan Jozwiak
a50847e505 DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ib5e4bb9400789f5666cd5b8d466afdd89f76e724
2020-06-12 16:32:43 +00:00
Jordan Jozwiak
7048655cbe Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev 2020-06-12 16:21:05 +00:00
TreeHugger Robot
b6f3f8c8f5 Merge "Update javadoc for END_OF_DAY event." into rvc-dev am: a4c3cd425b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815144

Change-Id: Ia99822e02b14423b96985acf59f429e6c21e29b0
2020-06-11 22:26:08 +00:00
TreeHugger Robot
a4c3cd425b Merge "Update javadoc for END_OF_DAY event." into rvc-dev 2020-06-11 22:11:50 +00:00
Nikita Ioffe
ac095e5a1d Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage
This provides a signal for MediaProvider to whitelist access for full
external storage access.

Here is an overview of how the flow looks like:

1. When app is started within instrumentation with --no-isolated-storage
flag, ActivityManagerService will grant OP_NO_ISOLATED_STORAGE to that
package.
2. MediaProvider will note the OP_NO_ISOLATED_STORAGE app op as fallback
in case app doesn't have MANAGE_EXTERNAL_STORAGE permissions.
3. When instrumentation finishes, ActivityManagerService will change
mode of OP_NO_ISOLATED_STORAGE app op to MODE_ERRORED.

Test: atest ExternalStorageHostTest
Bug: 149894531
Change-Id: I51cd87e5e887b887fd8ac7a1a7ffff208266ffa8
2020-06-11 19:51:54 +01:00
TreeHugger Robot
bf52673a6a Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: Icc00a6f35213958cb5badfb4e7311e646608b1bf
2020-06-11 18:41:57 +00:00
TreeHugger Robot
0561690cac Merge "Apply theme shape clipping to group convo avatars" into rvc-dev 2020-06-11 18:22:46 +00:00
Alex Johnston
c1a731879b Merge "Update setCameraDisabled javadoc" into rvc-dev am: bde41fcacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818602

Change-Id: Ic6ee5e324cce51734d1f1f02739bf5c967c673d8
2020-06-11 11:48:03 +00:00