Commit Graph

53419 Commits

Author SHA1 Message Date
George Mount
abf1eb3cd9 Merge "Have focus avoid middle of a foucs chain when possible." 2015-11-11 15:32:20 +00:00
Nicolas Geoffray
183501e1aa Merge "Remove performBootDexOpt and am's ensurePackageDexOpt." 2015-11-11 12:58:27 +00:00
Nicolas Geoffray
27c0737969 Remove performBootDexOpt and am's ensurePackageDexOpt.
Except common shared libraries and boot image, all compilations
are now done through BackgroundDexOptService.

Change-Id: Ib736e253c38b0c8085bc94e45f4e61a048f66e26
2015-11-11 12:19:08 +00:00
Mahaver Chopra
7830daaa70 Documentation for ACTION_PROVISION_MANAGED_USER
Adding documentation for ACTION_PROVISION_MANAGED_USER in
DevicePolicyManager

Bug: 25614750
Change-Id: I7aa4dd3acd3f4e97a9057bf5f05ca853af54ac01
2015-11-11 11:54:26 +00:00
Keisuke Kuroyanagi
6b814d8aed Merge "Use constants for return value of TextView#doKeyDown" 2015-11-11 02:35:18 +00:00
Makoto Onuki
246b5a0993 Merge "Do not call into ActivityManager from DPMS within DPMS lock" 2015-11-10 22:57:05 +00:00
Makoto Onuki
53de36f9c4 Do not call into ActivityManager from DPMS within DPMS lock
This will allow AMS to call into DPMS within the AMS lock instead,
which will help  I1537bd57b34696768ee81a979d53bb396efbc12a.

- AM.clearApplicationUserData() will not be allowed for any DA
apps.

Bug 25567963

Change-Id: I9f0d071c815a011be4f4c85c502c39d0fe0fe5e8
2015-11-10 14:55:30 -08:00
Rob Carr
40725b6f86 Merge "Clarify geometry management for SurfaceView" 2015-11-10 21:54:45 +00:00
Robert Carr
64aadd0849 Clarify geometry management for SurfaceView
In the hardware accelerated case, RenderThread needs
to be the authority of information on the geometry of
the SurfaceView (this will occur via moving the
repositionWindow call to RenderThread). In order
to support this we have to enable calling relayoutWindow
without geometry (so that it will not fight with
repositionWindow). Add such a mode to relayoutWindow
and use it from SurfaceView. Add size to repositionChild
while we are here.

Bug: 22802885
Change-Id: Ie45132c22f34cc6ecfe2446912b30bd1df414406
2015-11-10 19:21:22 +00:00
Christopher Tate
0a61b36013 Introduce socket stats tag for restore traffic
As well as system API for emplacing it.

Change-Id: If33fbd23552261efe3b00d75c22ff823564f43e6
2015-11-10 11:13:12 -08:00
Winson Chung
974f55fa13 Merge "Saving additional context when taking task screenshots." 2015-11-10 18:24:48 +00:00
Mahaver Chopra
68ce6dc10a Merge "Add ACTION_PROVISION_MANAGED_USER" 2015-11-10 14:08:02 +00:00
Mahaver Chopra
5e73256a48 Add ACTION_PROVISION_MANAGED_USER
Adding ACTION_PROVISION_MANAGED_USER to DevicePolicyManager.

Bug: 25462684
Change-Id: Ic90c3471f3a9c431d728197a19ab25b9946f090a
2015-11-10 10:58:51 +00:00
Keisuke Kuroyanagi
a08a48cb98 Merge "Support KEYCODE_{CUT, COPY, PASTE} in TextView." 2015-11-10 07:46:51 +00:00
Winson
c809cbb926 Saving additional context when taking task screenshots.
- Save the original task size and screen orientation.  This ensures that
  we will be able to display the screenshots in the right orientation if
  we start taking non-square thumbnails.

Change-Id: I17ffe1fc05a447f67753149695a4eaf0baa36e8e
2015-11-09 17:36:35 -08:00
Roozbeh Pournader
5960b940d4 Merge "Fix case where some locales may have empty langauges." 2015-11-10 01:13:50 +00:00
Todd Kennedy
cab5208adf Merge "Move 'un/install' to cmd" 2015-11-10 01:12:32 +00:00
Roozbeh Pournader
417bbe0179 Fix case where some locales may have empty langauges.
This is to make the behvior the same as before
47f71a697a for cases when some of the
locales' languages are empty.

Change-Id: Ifee92e199f20130e060670f244eb3b4b7be13872
2015-11-09 17:10:46 -08:00
Roozbeh Pournader
87e1db355b Merge "Use the full locale list in resourceQualifierString()." 2015-11-10 00:45:49 +00:00
Todd Kennedy
72cfcd02b8 Move 'un/install' to cmd
Move the implementation of the install variants and uninstall to the cmd
command. Additionally, make two other important changes: 1) replace calls
to the legacy PackageManager#installPackageAsUser with the PackageInstaller
2) allow streaming package bits for 'pm install'

Change-Id: I5680f57208d377daadb69b2cc09c233c02fe5016
2015-11-09 15:07:18 -08:00
Doris Liu
46a91b6e77 Merge "Fix animator sometimes not being ended when end() is called without start()'ing" 2015-11-09 22:52:24 +00:00
Doris Liu
66d4856653 Fix animator sometimes not being ended when end() is called without start()'ing
Bug: 23713124
Change-Id: I2e00cedb9c74e14d2361579bba89d3d1dbfe4d22
2015-11-09 14:44:35 -08:00
Jinsuk Kim
cb802870f7 CEC: Queue up callbacks to handle on final result
While one party calls oneTouchPlay() to initiate the action and
put it in progress, the other parties making the same call gets
an error 'operation in progress'. This is not really an error,
but there was no other choice for them but just to wait till
the action is completed and the service is ready to accept
the API call again.

This CL resolves the inconvenice by allowing multiple callbacks
rather than returning IN_PROGRESS for those joining later. Same
was applied to queryDisplayStatus().

Change-Id: I5fc9aba4aa73e76a25f8fdec37e11cd961a3d35f
(cherry picked from commit 98a25f1ee27c1b4362a23981edc17fc92199a876)
2015-11-09 19:14:56 +00:00
Chong Zhang
c2c17c4e8d Merge "Fix flicker when releasing drag of divider" 2015-11-09 18:51:17 +00:00
Philip P. Moltmann
5bc68b533b Merge "Add a alert that allows the user to approve a print service when we print using it the first time." 2015-11-09 18:38:24 +00:00
Chong Zhang
d153c4f6f0 Fix flicker when releasing drag of divider
bug: 25564523
Change-Id: I9c19f40f27cc80b8e6e0e98a0d6455941bd624e7
2015-11-09 10:34:14 -08:00
Guang Zhu
f49bec047a Merge "Revert "Move 'un/install' to cmd"" 2015-11-09 18:10:54 +00:00
Julia Reynolds
d7ba82d154 Merge "Bring back notification lights and sanitized color." 2015-11-09 18:01:59 +00:00
Philip P. Moltmann
853a6f564a Add a alert that allows the user to approve a print service when
we print using it the first time.

This warning used to be shown when the print settings app was used
to enable a service.

If two warning as shown for the same print service we automcatially
dismiss all dialogs once one dialog is confirmed. Please note that
we are not confirming the printjob as it is unexpeced to have a
single click to confirm multiple print jobs.

Change-Id: I8bb0a49bac2063c1c55e2f24bd34df2c44e2df89
Bug: 24135353
2015-11-09 09:49:26 -08:00
Tao Bai
082593ba10 Merge "Using addAssetPathAsSharedLibrary to load asset." 2015-11-09 17:40:55 +00:00
Julia Reynolds
10ee1fcf79 Bring back notification lights and sanitized color.
buildUnstyled() was doing more than I noticed in
I81f8ffed0eb76084b2f2b25b97e325858f0a1d05.

Change-Id: I2109fc0d5bae692676b0ca72ff5048f0a3037375
2015-11-09 12:33:42 -05:00
Roozbeh Pournader
6da1693c0c Merge "Removed unused setLocale() method." 2015-11-09 17:22:37 +00:00
Todd Kennedy
18bc3305e4 Revert "Move 'un/install' to cmd"
This reverts commit ec059d839d.

Change-Id: Ieaa1373e96fb4cc20aa41c3159518bd9e86c572b
2015-11-09 15:36:43 +00:00
Nicolas Prévot
d59262667c Merge "Add method to tell the dpc if provisioning is allowed." 2015-11-09 13:49:31 +00:00
Jeff Sharkey
5d7e951686 Merge "More APIs for encryption-aware apps." 2015-11-08 21:32:56 +00:00
Jeff Sharkey
e17ac15697 More APIs for encryption-aware apps.
Apps can mark manifest components as being encryption-aware, which
means they can safely be run before the credential encrypted storage
is available.

Start adding filtering logic so that we only return these components
when a user is running "with amnesia."  That is to say, only device
encrypted storage is available, so the user is running but with only
partial knowledge of its data.

To avoid calling into ActivityManager with the PackageManager lock
held, we quickly determine user state and splice the state into the
flags for later per-component evaluation.

Bug: 22358539
Change-Id: Idc56ec29f1ef04da8963e004314d7f5e47400997
2015-11-08 13:29:16 -08:00
Chad Brubaker
da3dc74f49 Merge "Support nested domain-config elements" am: 749501e88e am: b549899d0b
am: 8427d98f7c

* commit '8427d98f7c3d6c1c05d78c5a9202c4110c3732b5':
  Support nested domain-config elements
2015-11-07 22:28:24 +00:00
Chad Brubaker
0420d8de74 Merge "Add xml source for network security configuration" am: ead46ecc84 am: 0cb8f01410
am: 06d93173b1

* commit '06d93173b1fe98013a41f3a35993dea8e60e48ad':
  Add xml source for network security configuration
2015-11-07 22:27:01 +00:00
Chad Brubaker
8427d98f7c Merge "Support nested domain-config elements" am: 749501e88e
am: b549899d0b

* commit 'b549899d0b6b95032a9c75e64c9276acd85510d1':
  Support nested domain-config elements
2015-11-07 22:23:00 +00:00
Chad Brubaker
06d93173b1 Merge "Add xml source for network security configuration" am: ead46ecc84
am: 0cb8f01410

* commit '0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
  Add xml source for network security configuration
2015-11-07 22:21:40 +00:00
Chad Brubaker
b549899d0b Merge "Support nested domain-config elements"
am: 749501e88e

* commit '749501e88e5fa6bdc6594a9db5c232e31bdda867':
  Support nested domain-config elements
2015-11-07 22:16:10 +00:00
Chad Brubaker
0cb8f01410 Merge "Add xml source for network security configuration"
am: ead46ecc84

* commit 'ead46ecc843e3686ff5ae8008f4452fc79f847e7':
  Add xml source for network security configuration
2015-11-07 22:14:36 +00:00
Chad Brubaker
bd173c28fc Support nested domain-config elements
Nested domain-config inherit unset parameters from the domain-config
they are nested in. This helps avoid copy and pasted configs that are
almost the same except a few minor differences for a domain with
slightly different requirements.

For example: Consider a domain-config for example.com that, among other
settings, does not enforce hsts. Now if you want the rules for
example.com to apply to secure.example.com except that hsts _is_
enforced you can make a nested domain-config for secure.example.com
under example.com that sets hstsEnforced="true" and nothing else.

Change-Id: I9e33f7e62127fd7f4f15c3560fff2f2626477bd4
2015-11-07 13:31:04 -08:00
Roozbeh Pournader
47f71a697a Use the full locale list in resourceQualifierString().
Previously, only the first locale was dumped to the output in
android.content.res.Configuration#resourceQualifierString(). Now the full
locale list is part of the output.

Change-Id: I5d4b73738a14d48533ee96c38dbc6c4b204ea998
2015-11-07 11:55:38 -08:00
Roozbeh Pournader
0d02bd8442 Removed unused setLocale() method.
The setLocale() method in android.content.res.AssetManager was not
used. Removing it to reduce maintenance cost.

Change-Id: I1b168fe84c2465d1ebc2b62bb965eda885e1220a
2015-11-07 11:22:24 -08:00
Chad Brubaker
5f96702f58 Add xml source for network security configuration
XmlConfigSource parses an ApplicationConfig from an xml resource.
Currently this supports app-wide default configuration via the
base-config element, per domain via the domain-config element and
inheritance of unset properties at parse time.

Inheritance of unset properties is currently only:
domain-config -> base-config -> platform default configuration
Where the most specific value is used.
For example: If the base-config specifies trust anchors, all connections
will use those anchors except for connections to a domain which has a
domain-config that specifies trust anchors, in which case the
domain-config's trust anchors will be used. If the domain-config or
base-config don't set trust anchors, or don't exist, then the platform
default trust anchors will be used.

Nested domain-config entries, debug-overrides, and thorough
documentation of the xml format will follow in later commits.

Change-Id: I1232ff1e8079a81b340bc12e142f0889f6947aa0
2015-11-06 22:24:01 -08:00
Chad Brubaker
eea9672b3d Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81f4 am: 90b9ed5c82
am: d28d4bcf9b

* commit 'd28d4bcf9b6c9d8142fbed995250d41a59387c72':
  Fix incorrect hstsEnforced lookup
2015-11-07 02:53:50 +00:00
Chad Brubaker
d28d4bcf9b Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81f4
am: 90b9ed5c82

* commit '90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc':
  Fix incorrect hstsEnforced lookup
2015-11-07 02:47:59 +00:00
Chad Brubaker
90b9ed5c82 Merge "Fix incorrect hstsEnforced lookup"
am: 1347cb81f4

* commit '1347cb81f402c628f3346ea350a5862749901d59':
  Fix incorrect hstsEnforced lookup
2015-11-07 02:42:05 +00:00
Chad Brubaker
1347cb81f4 Merge "Fix incorrect hstsEnforced lookup" 2015-11-07 02:37:45 +00:00