Commit Graph

53361 Commits

Author SHA1 Message Date
Winson
13d30660ef Fixing issue with canceling the thumbnail in addition to the app window.
Bug: 25392381
Change-Id: Ib507f53bcd2aad4771c2546f5e8bfe771769e9a2
2015-11-06 15:30:29 -08:00
Chad Brubaker
6e92454065 Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5 am: 2d7d8401a9
am: a8fd356640

* commit 'a8fd35664070134f0596238ad0c5bdaa3adc221b':
  Fix directory check in UserCertificateSource
2015-11-06 21:28:24 +00:00
Chad Brubaker
52fe096d86 Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3 am: dd6d0918c4
am: a21b4a528d

* commit 'a21b4a528dc7c728b3546899c90758d583f35495':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:26:55 +00:00
Chad Brubaker
74e67e04a5 Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697 am: 478fad3cf5
am: 54b4b8fdfc

* commit '54b4b8fdfc336b8a4902637e622c3ede879edcde':
  Use a builder for NetworkSecurityConfig
2015-11-06 21:25:31 +00:00
Chad Brubaker
a8fd356640 Merge "Fix directory check in UserCertificateSource" am: 1483ee3aa5
am: 2d7d8401a9

* commit '2d7d8401a9c1e03f8f141415b25cfb415df73695':
  Fix directory check in UserCertificateSource
2015-11-06 21:19:02 +00:00
Chad Brubaker
a21b4a528d Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3
am: dd6d0918c4

* commit 'dd6d0918c42aec3fb08d6df15822078e35cc4f33':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:17:34 +00:00
Chad Brubaker
2d7d8401a9 Merge "Fix directory check in UserCertificateSource"
am: 1483ee3aa5

* commit '1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
  Fix directory check in UserCertificateSource
2015-11-06 21:10:54 +00:00
Chad Brubaker
dd6d0918c4 Merge "Fix incorrect hasPerDomainConfigs check"
am: c5c51dafb3

* commit 'c5c51dafb3ede95622eb350dae0b662abb611925':
  Fix incorrect hasPerDomainConfigs check
2015-11-06 21:09:11 +00:00
Chad Brubaker
1483ee3aa5 Merge "Fix directory check in UserCertificateSource" 2015-11-06 21:02:23 +00:00
Chad Brubaker
c5c51dafb3 Merge "Fix incorrect hasPerDomainConfigs check" 2015-11-06 21:02:01 +00:00
Chad Brubaker
b0f8b4bb35 Fix directory check in UserCertificateSource
If the user has not added any CAs to the user trust store the user-added
directory will not have been created.

Change-Id: I8b5f73af3c0761c56969874231004fedbf7badda
2015-11-06 13:00:15 -08:00
Chad Brubaker
35de8d6d2b Fix incorrect hasPerDomainConfigs check
Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346
2015-11-06 12:50:31 -08:00
Chad Brubaker
54b4b8fdfc Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697
am: 478fad3cf5

* commit '478fad3cf53874f9cc96169cd25b29b9c031637a':
  Use a builder for NetworkSecurityConfig
2015-11-06 20:31:02 +00:00
Chad Brubaker
478fad3cf5 Merge "Use a builder for NetworkSecurityConfig"
am: 7e98f2e697

* commit '7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
  Use a builder for NetworkSecurityConfig
2015-11-06 20:25:33 +00:00
Chad Brubaker
7e98f2e697 Merge "Use a builder for NetworkSecurityConfig" 2015-11-06 20:21:29 +00:00
Jorim Jaggi
aa5c3b2637 Merge changes I619be025,I126765a3,I0307c191,I9425785f,I623bd48d, ...
* changes:
  Restore changes lost during merge
  Fix flicker at the end of docked stack divider animation
  Implement divider UX interactions
  Immediately start resizing when touching docked divider
  Fix black holes and flickering in docked resizing
  Migrate docked divider drawing to SysUI
  Supply app transition specs with a future
2015-11-06 19:28:42 +00:00
Makoto Onuki
6d2beef6a8 Merge "Add DPM.getUserRestrictions()" 2015-11-06 18:32:35 +00:00
Makoto Onuki
3a3092fab0 Add DPM.getUserRestrictions()
This returns per-DO/PO restrictions.

Bug 23902097

Change-Id: I225c1b01444fe2f60e5a6674d327182cc9bb15dc
2015-11-06 10:30:08 -08:00
Makoto Onuki
86cd001e36 Merge "Have AudioService listen to DISALLOW_UNMUTE_MICROPHONE and" 2015-11-06 18:29:12 +00:00
Todd Kennedy
71d1f399c2 Merge "Move 'un/install' to cmd" 2015-11-06 17:31:02 +00:00
Todd Kennedy
ec059d839d 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: Ia49dac0ccd6470f9d1c1964bdeb3c0b22b856075
2015-11-06 09:27:22 -08:00
Svet Ganov
f2acc54aad Fix some docs
Change-Id: Ie28788330249a1f96b7b168a05546d3d0862a9cf
2015-11-06 17:16:06 +00:00
Jorim Jaggi
a7262a8956 Immediately start resizing when touching docked divider
Before, the surface was made full-screen only after
a certain amount of time. Now, immediately make the surface
full-screen, as soon as the divider is touched, to make
resizing much snappier.

Bug: 24507122
Change-Id: I9425785fca4e62964a959a432c80a81d346602c5
2015-11-06 16:17:42 +01:00
Jorim Jaggi
253a20fad8 Fix black holes and flickering in docked resizing
When we start a resize with the docked stack divider,
set the surface background to be full-screen, and use
the traditional surface clipping/positioning in window
manager to adjust the size. This ensures that we don't
have any black holes because of asynchronicity (except
at the very beginning, but this can be worked around
later), and the position of the right/bottom activity
is always in sync with the position of the divider.

Also fix a bug in NonClientDecorView where the first
request to draw was dropped (because the thread hasn't
started up yet), and the main thread was waiting for it
indefinitily.

Bug: 24507122
Change-Id: I623bd48d5be64fac2fba45241b84f265944d200d
2015-11-06 16:17:14 +01:00
Jorim Jaggi
61f39a7b98 Migrate docked divider drawing to SysUI
Move docked divider drawing to SysUI. This let's us have real
time shadows in the future. Keep DockedStackDividerController
for placing/visibility in window manager.

Change-Id: I82c10add626d30f2ba180ee2a21cdbe6ddfe0371
2015-11-06 16:13:11 +01:00
Jorim Jaggi
2f7d292596 Supply app transition specs with a future
Because we retain activity surfaces now, the app transition specs
which were calculated/generated after the onPause() call when going
from recents -> app were too slow. Instead, supply a cross-process
future, which gets fetched when the window manager is about to be
ready to execute the app transition. In practice, this still gets
executed immediately after the onPause call.

If we have a retained surface, this adds some latency, but since we
absolutely need the specs to execute the transition, we have that
latency no matter where exactly we generate the specs.

If we don't have a retained surface, the specs are not calculated on
the critical path, so it's faster.

Bug: 19940527
Change-Id: I80d2c6f6b3a6568a70339619ecefbc3bd8409bd8
2015-11-06 16:12:59 +01:00
Bart Sears
8382f98f62 Merge "Revert "Clarify geometry management for SurfaceView"" 2015-11-06 09:08:46 +00:00
Bart Sears
7d73643f7a Revert "Clarify geometry management for SurfaceView"
This reverts commit 78a45f2bd8.

Change-Id: I782f688f52a85df84d9facef2fbf88c28f4a7082
2015-11-06 09:07:58 +00:00
Rob Carr
b9765b4c15 Merge "Clarify geometry management for SurfaceView" 2015-11-06 02:09:35 +00:00
Filip Gruszczynski
63a35e2343 Fix minor problems when resizing/maximizing docked window.
When maximizing the transition should originate from visible bounds, so
the first frame matches what is visible to the user. When switching to
the big surface, we only need to increase the layer by one, instead of
having artificially large value. If we use the large value, it will
cause a flicker over system windows.

Also includes some cleanup, like static imports and necessary logging.

Bug: 24913915

Change-Id: I84d7594622aa639e2008c662f941edf9c20b3202
2015-11-05 16:16:19 -08:00
Robert Carr
78a45f2bd8 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.

Change-Id: I12f85f586a38bf86367f3d964cb49f19003d441f
2015-11-05 15:37:42 -08:00
Sanket Agarwal
7058e4ca58 Radio features for Automotive usecase.
1. Add clock to metadata - If the CAR does not have a clock (no network
or bad clock) then Radio RDS could be used as a proxy.
2. Add support for emergency announcement - If the CAR wants to make an
emergency announcement.
    2.1 Add support for callbacks.

Bug: b/24807501
Bug: b/22701655

Change-Id: Ib3131de03a022181559fd31da6701d9d3fa8698d
(cherry picked from commit 659688a129189f2a9aa353ddf9e107d5f293c4ca)
2015-11-05 22:50:59 +00:00
Paul Lawrence
6bcc32504f Fix build
Change-Id: I0ebff8e41c2aa5bec2466d075d9143a5a525e02d
2015-11-05 14:17:03 -08:00
Paul Lawrence
9548b380d9 Merge "Add developer option to convert from FDE to FBE" 2015-11-05 21:41:03 +00:00
Chad Brubaker
80a73f5939 Use a builder for NetworkSecurityConfig
The builder supports all the standard builder set* methods as well as
setting a parent builder to use when values are not set (recursively).
This allows us to have a level of inheretence in configurations without
complicating the lookup and trust checking logic by doing inheretence
when building the configs.

Change-Id: I054af83451e52761227479eadf9cb9803437505f
2015-11-05 12:50:30 -08:00
Chad Brubaker
f386e9da36 Merge "Add initial network security config implementation" am: 8c35820720 am: 0bafbbfcb4
am: b4b53b0741

* commit 'b4b53b0741b6ff75842d6630d5d1010c4efa766c':
  Add initial network security config implementation
2015-11-05 19:05:47 +00:00
Chad Brubaker
b4b53b0741 Merge "Add initial network security config implementation" am: 8c35820720
am: 0bafbbfcb4

* commit '0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
  Add initial network security config implementation
2015-11-05 18:58:39 +00:00
Chad Brubaker
0bafbbfcb4 Merge "Add initial network security config implementation"
am: 8c35820720

* commit '8c358207206c5e19541c65e3f9761d1adb54550b':
  Add initial network security config implementation
2015-11-05 18:52:46 +00:00
Chad Brubaker
8c35820720 Merge "Add initial network security config implementation" 2015-11-05 18:46:24 +00:00
Felipe Leme
46475e4028 Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG: 25455734" 2015-11-05 02:19:06 +00:00
Chris Tate
adf0698b40 Merge "Make WorkSource version of alarm listener API @SystemApi" 2015-11-05 02:02:49 +00:00
Chris Tate
e6ae842365 Merge "Docs: be explicit about oldState contract for backup helpers" 2015-11-05 01:49:24 +00:00
Christopher Tate
1203aa05f8 Docs: be explicit about oldState contract for backup helpers
Call out specifically that each helper must only consume the
prior-state data that it produced in the first place, not reading
beyond its own part of the state file.

Bug 25473872

Change-Id: I1f24a5738a799eb21d966510372a0f3852436166
2015-11-04 17:35:17 -08:00
Tomasz Mikolajewski
0c55387059 Merge "Add support for opening files in specified MIME type to DocumentsProvider." 2015-11-04 23:17:14 +00:00
Chad Brubaker
6bc1e3966c Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.

This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
  certificate pinning.
* Policy on what to do with cleartext traffic.

In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.

This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.

Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
2015-11-04 14:31:18 -08:00
Makoto Onuki
d45a4a2ecb Have AudioService listen to DISALLOW_UNMUTE_MICROPHONE and
... DISALLOW_ADJUST_VOLUME, instead of UserManager pushing
new settings to AudioService.

Also:
- Allow PO to set these two restrictions.

- Now AS.setMasterMuteInternal() respects mUseFixedVolume to make
it consistent with readPersistedSettings().

- When a user switches and restores the mute state in
AS.readPersistedSettings(), also check the current user restrictions
in addition to system settings. Because of the delay in AudioService
before persisting the mute settings in setMasterMuteInternal() and
setMicrophoneMute(), there's was an edge case
DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME would be ignored
when the user switches right after they are set.

Bug 24981972

Change-Id: I4d9b709a0a0e6812319204568c6e44d6664bdeb4
2015-11-04 14:29:31 -08:00
Chris Tate
49ab8dd5f3 Merge "Fix BlobBackupHelper state tracking" 2015-11-04 21:42:55 +00:00
Riley Andrews
29869c3893 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d am: 2c740f1dcf am: 6c1144dc0f
am: 132bb1e4b1

* commit '132bb1e4b10755d2bc0810135511fd999badbe4b':
  Convert ashmem bitmap thresholds to constants.
2015-11-04 20:43:38 +00:00
Riley Andrews
132bb1e4b1 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d am: 2c740f1dcf
am: 6c1144dc0f

* commit '6c1144dc0f8b2452ca2a204ca471e2d23339d5a3':
  Convert ashmem bitmap thresholds to constants.
2015-11-04 20:37:18 +00:00
Riley Andrews
2c740f1dcf Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am: c8bb39d98d

* commit 'c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
  Convert ashmem bitmap thresholds to constants.
2015-11-04 20:24:36 +00:00