Commit Graph

11812 Commits

Author SHA1 Message Date
Benjamin Franz
326be27572 Merge "Profile Owner API to clear application data" 2017-08-31 08:59:30 +00:00
Jeff Sharkey
595987e619 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev am: f31cf45e82
am: 8ab5f7f324

Change-Id: Ica24924ff8e5c95bd14114fb0a1d82c21a7d30d4
2017-08-30 19:27:49 +00:00
Jeff Sharkey
f31cf45e82 Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev 2017-08-30 19:01:18 +00:00
Jeff Sharkey
f4de294297 Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI.  For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.

Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.

Thorough testing to verify behavior.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
2017-08-30 10:01:10 -06:00
Jorim Jaggi
e7d2b85068 Nuke everything obsoleted by task snapshots
Test: go/wm-smoke
Change-Id: If9c9c2e66d97d6a5fa94d0d62ae7459fdde2a9a0
2017-08-30 14:59:36 +02:00
Christopher Tate
4531b36031 Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev am: a050d6302f
am: 5296d3cc22

Change-Id: Iab41d0294670605f1d7ba933d534ed872d1d9b64
2017-08-30 02:01:06 +00:00
TreeHugger Robot
a050d6302f Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev 2017-08-29 23:47:50 +00:00
Benjamin Franz
a77e35782c Profile Owner API to clear application data
This new API lets DOs clear application data on a per package basis. It
can be used to reset misbehaving packages as well as for a light-weight
session model where employees log in to a device and have their data
cleared when they log out.

Test: cts-tradefed run singleCommand cts -m DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testClearApplicationData
--abi arm64-v8a
Bug: 63910199
Change-Id: I6a03ae90fffe6159172ea7e46f9b8b69efeabcfe
2017-08-29 12:18:02 +01:00
Felipe Leme
f3ee0b4c84 Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev am: 55309e79cf
am: 1f9f8597e9

Change-Id: Ie57ae681b0068f4b060aa1a8c87c92cb511ca9ed
2017-08-29 03:38:45 +00:00
Felipe Leme
c24a56ae06 Hides the Save UI while handling a pending intent from CustomDescription.
When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.

That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.

Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes: 64309238
2017-08-28 18:04:15 -07:00
Christopher Tate
11620edf31 Note cross-user permission requirement for relevant wallpaper operations
Documentary change only.

Bug: 62343054
Test: N/A
Change-Id: Ibf6617b2c25306852478089b60a019479f8d2bcd
2017-08-28 14:19:32 -07:00
Winson Chung
107cac6555 Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev am: 3ea1e3d57d
am: 6514dca8ee

Change-Id: Ic21c453ab216bb3d4a58542c4efd1f06ee66bc9b
2017-08-26 06:41:39 +00:00
TreeHugger Robot
3ea1e3d57d Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev 2017-08-26 06:22:34 +00:00
Santos Cordon
46ea857e47 Merge "Allow VR State Listeners with RESTRICTED_VR_ACCESS permission." into oc-mr1-dev am: 0405d12a31
am: 49ef0ee289

Change-Id: I04313ee8bc289714e25d1e69d3fcabfb7eb93aef
2017-08-25 20:41:06 +00:00
TreeHugger Robot
71a02b2f55 Merge changes I91673d51,I50bc9e06
* changes:
  Corrected typo in magnification spec crop calculation.
  Generate stack override config in AM vs. WM
2017-08-25 19:03:35 +00:00
Winson Chung
f7e03e1a9e Add API to disallow entering PiP when launching a new activity
- Use this API when launching the camera from a double tap gesture where
  the user expects the camera to start for immediate use.
- Fix missing case of restoring the enter pip state.

Bug: 63916952
Test: Double tap to launch the camera, and ensure it does not trigger
      the current activity to enter PiP (if it supports it)

Change-Id: I2acf44984bcc57dff75701d0e9cbd6b798a97cd8
2017-08-25 10:33:23 -07:00
Wale Ogunwale
f75962a2f0 Generate stack override config in AM vs. WM
First step in allowing activity manager to drive the override
configuration of stacks at creation time vs. using what window manager
returns. Also moves us in the direction where callers outside of AM/WM
will eventually be able to drive the window configuration.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: I50bc9e0634779142c173e501d16e7aa1b71f28ce
2017-08-25 10:01:45 -07:00
Benjamin Franz
afb458f52c Merge "Refactor all lock task related methods into a new class" 2017-08-25 15:54:02 +00:00
Benjamin Franz
a83859ffaa Refactor all lock task related methods into a new class
This simplifies the way lock task mode is called by creating a class
that is fully responsible for managing locked tasks. This enables unit
testing and makes it easier to see where individual calls are coming
from. Feeling is that there are some subtle bugs around synchronization
and expectations on the locked task APIs.

Also added unit tests for the new manager class.

Test: bit
FrameworksServicesTests:com.android.server.am.LockTaskManagerTest
Test: go/wm-smoke
Test: cts-tradefed run cts -m DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Bug: 63909481
Change-Id: I3fa8606778fea5a801c21aebeb231db5a6bee47f
2017-08-25 14:54:42 +01:00
Santos Cordon
e6d7723307 Allow VR State Listeners with RESTRICTED_VR_ACCESS permission.
Extend the ability to use VrStateListeners to applications that
have RESTRICTED_VR_ACCESS permission.  Previously, it required
ACCESS_VR_MANAGER only.

Add VrStateCallback object and methods to VrManager to access the
functionality outside of frameworks.

Bug: 64360244
Test: Manual. Tested ability from VrCore.

Change-Id: I01f1c75b1ccd44a09364df84218168cf6caab322
2017-08-24 21:45:24 +00:00
Wale Ogunwale
3382ab1fc7 Migrated some windowing methods from StackId to WindowConfiguration
First pass at transitioning away from using stack ids for windowing mode
to WindowConfiguration. Added some TODO that will require the introduction
of applicationType in WindowConfiguration before additional conversation
can be done.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: I2b315623faa16445a9f942e082089123842cb5a1
2017-08-24 08:57:10 -07:00
Winson Chung
6d904f45db Merge "Move PiP state check exception to the client side" into oc-mr1-dev am: 3a02835a02
am: 82ff58e40e

Change-Id: I12a79c551d45acad5e701a4e727f67ffb4051fa4
2017-08-24 05:24:48 +00:00
Winson Chung
298f95b1ad Move PiP state check exception to the client side
- When calling enterPictureInPictureMode(), the state of the activity in
  the client may be out of sync with the state of the activity in the
  system, causing an exception to be thrown erroneously. Instead, fail
  silently in the system if this occurs, and throw the exception in the
  client when it attempts to enter PiP from an invalid state.

Bug: 63753007
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ia99cc086805edc31f997d4325f7a5ccd7c85a77e
2017-08-23 15:06:32 -07:00
George Mount
2c0131aeb1 Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev am: 230e025841
am: 2d3e8b8ddb

Change-Id: I8077587dfcfd160028635d4dd11c0438317febc3
2017-08-23 21:18:14 +00:00
George Mount
230e025841 Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev 2017-08-23 20:52:34 +00:00
George Mount
3f81c33a35 Use hardware bitmap for shared element snapshots.
Bug: 64851247

Drawing to software bitmaps does not support many
features, most especially hardware bitmaps. This
changes the implementation to using hardware bitmaps
for View snapshots.

Also fixed broken TransitionTest discovered while
testing.

Test: I4ede02db67e578ea4a25069b683f1989c611e06c
Change-Id: I185bbfe1f789055c9efdba5297a74e481607afaf
2017-08-23 20:51:13 +00:00
Selim Cinek
b481c010e6 Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev am: 60a09546c0
am: 0c8a132ea3

Change-Id: Ie7e15d7c4010c0e3cbf0081a1a4084767c83b1fa
2017-08-23 16:23:40 +00:00
Selim Cinek
05bba9e284 Merge "Fixed a bug with app provided media spans" into oc-mr1-dev am: 3c47a11598
am: 09adc8f1a3

Change-Id: Iefd242f4b242ae0861f7f1fd9b8b8b89b06d6f20
2017-08-23 04:23:57 +00:00
Selim Cinek
87c3153dcd Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView
2017-08-23 02:30:14 +00:00
Svet Ganov
50f75df634 Merge "Allow clearing instant app meta-data" into oc-mr1-dev am: e391175330
am: a80370745b

Change-Id: I719169bc27017a8e8c4d6a858c14ca2a458acc95
2017-08-23 00:13:48 +00:00
Selim Cinek
ef89f578f2 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev am: 9d41e8cd47
am: a7ea41c7d7

Change-Id: I91899094a4798d83b8e2e24b41d5f11a3a9bb045
2017-08-23 00:06:29 +00:00
Selim Cinek
48f66b7b77 Fixed a bug with app provided media spans
Since notifications are colorized now,
We need to clear color spans from media
notifications, otherwise the contrast won't
be ensured.

Test: use media notification with color span, observe no span
Fixes: 64445955
Change-Id: Ib4f5b14196c604468c8c00ba48f294b1b2d102e3
2017-08-22 23:24:38 +00:00
TreeHugger Robot
e391175330 Merge "Allow clearing instant app meta-data" into oc-mr1-dev 2017-08-22 22:49:03 +00:00
TreeHugger Robot
9d41e8cd47 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev 2017-08-22 22:48:14 +00:00
Selim Cinek
fc8073c4b6 Fixed a bug with decorated custom views
Even if their layout still maches, the content was unrecoverably
destroyed, so we can't just reapply it anymore.

Fixes: 62911941
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

Change-Id: I3a50c96484686958570ac5e4949df3ad4b8a421a
2017-08-22 14:58:59 -07:00
Svet Ganov
f935a70398 Allow clearing instant app meta-data
The package manager has an API to clear the data of an app
which does not work for uninstalled instant apps for which
we store some meta-data (icon, title, cookie). This change
allows clearing the data of an uninstalled instant app.

Test: Instant cookie CTS tests use this API

bug:64517837

Change-Id: Ia929fead71b5ae786e88ddd0fa8e8a490d970dd0
2017-08-22 12:22:38 -07:00
Wale Ogunwale
3af8736334 Merge "Introducing windowing mode in WindowConfiguration." 2017-08-22 17:13:12 +00:00
Phil Weaver
5add014517 Merge "Place focus on window when a11y performs an action" into oc-mr1-dev am: c6c9e089db
am: df79ca699d

Change-Id: I2089f32e0f370378eaf472cfeca5cc829e780e04
2017-08-22 17:07:26 +00:00
Phil Weaver
c6c9e089db Merge "Place focus on window when a11y performs an action" into oc-mr1-dev 2017-08-22 16:42:13 +00:00
Wale Ogunwale
687b427334 Introducing windowing mode in WindowConfiguration.
Currently Stacks (specifically their ids) are used to determine
windowing mode for activities. This isn't flexible when it comes
to changing/mixing various windowing modes at different levels
of the window hierarchy. E.g. how do you have the non-default
display support freeform or split-screen or how do you
interleave freeform windows with fullscreen windows.
To help with this problem we are introducing windowing mode
in WindowConfiguration that can be used to set the windowing
mode for any WindowContainer in the hierarchy.

Currently all displays are set to fullscreen windowing mode and
stacks windowing modes are set based on their id.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: Iccdc3212cda651998d6ad76ce5261d089bff897a
2017-08-22 06:53:01 -07:00
Jorim Jaggi
249a45363a resolve merge conflicts of c55cce487c to master
Change-Id: If833e3c5efed891fb1ba7b32b2edc96a60ea2566
2017-08-22 13:28:57 +02:00
TreeHugger Robot
56af51d67e Merge "Log reportFullyDrawn into TRON" into oc-mr1-dev 2017-08-21 16:47:21 +00:00
Jorim Jaggi
4d27b84d95 Log reportFullyDrawn into TRON
Test: AppStartTests
Change-Id: I17c511c9c4305c4cb327d52c81d97ad6d6a8c9d3
Fixes: 36093481
2017-08-21 15:35:49 +02:00
Wale Ogunwale
822e512127 Introducing WindowConfiguration
Used to house configurations that don't affect resources and that
we don't want to communicate to apps, but need to be propagated
along side Configuration.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I97de3efbe6d5e1d3b07156a8cfbce9be5eae5cb5
2017-08-18 07:57:06 -07:00
Phil Weaver
5dc3ebcec6 Place focus on window when a11y performs an action
Bug: 62344706
Test: Now able to bring up keyboard in split-screen mode.
Also a11y CTS and unit tests pass.

Change-Id: Ic4340425680c89e8fc5e586aa1d363b01fd69763
2017-08-17 16:48:48 -07:00
Julia Reynolds
33515a25cb Merge changes I36636687,I4c45f787 into oc-mr1-dev am: 54ff7e7582
am: d82e4add2a

Change-Id: I8b3eded4fb3f3e0913db1176aae1197a1020db2b
2017-08-17 16:10:59 +00:00
TreeHugger Robot
54ff7e7582 Merge changes I36636687,I4c45f787 into oc-mr1-dev
* changes:
  Doc updates
  Translate default channel on locale change
2017-08-17 15:54:52 +00:00
Daniel Sandler
1b5b4a9b38 Merge changes from topic "revert-injectors" into oc-mr1-dev am: d33fe05c66
am: bb143bafe2

Change-Id: Ifb14907d0ac210a247d3014235193c13c7e20263
2017-08-17 14:50:53 +00:00
Daniel Sandler
d33fe05c66 Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
  Revert "Add API to allow apps more control over instantiation"
  Revert "Add plugin to swap out recents"
2017-08-17 14:32:40 +00:00
Charles He
478b2b7cbf Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev am: 8b2513e439
am: 337ee0771e

Change-Id: Ib4eca8d5ea79e5ac65496bee8390e5ce4cd8fb64
2017-08-17 08:12:56 +00:00