OSDN Git Service
Chad Brubaker [Wed, 11 Nov 2015 19:30:01 +0000 (19:30 +0000)]
Merge "Add support for debug-overrides configuration" am:
f1e813ea33
am:
467804448d
* commit '
467804448d6b13e04b4d9bc20fd195baa1f07e90':
Add support for debug-overrides configuration
Chad Brubaker [Wed, 11 Nov 2015 19:21:32 +0000 (19:21 +0000)]
Merge "Add support for debug-overrides configuration"
am:
f1e813ea33
* commit '
f1e813ea334c947ae0397bfa3a8e42be4fd4ae8c':
Add support for debug-overrides configuration
Chad Brubaker [Wed, 11 Nov 2015 19:03:30 +0000 (19:03 +0000)]
Merge "Add support for debug-overrides configuration"
Geoff Mendal [Wed, 11 Nov 2015 18:12:37 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
efa66ca345 -s ours
am:
bdc6cd2930 -s ours
* commit '
bdc6cd29303b12ca2fcd8e865f1bb6550b01652f':
Import translations. DO NOT MERGE
John Reck [Wed, 11 Nov 2015 18:08:15 +0000 (18:08 +0000)]
Merge "Fix memory corruption in SpotShadow" am:
8c85c00b5e
am:
8c8353a8c3
* commit '
8c8353a8c3152bc3ee4b74815d64c65c2c9d1991':
Fix memory corruption in SpotShadow
Geoff Mendal [Wed, 11 Nov 2015 18:03:38 +0000 (18:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
efa66ca345 -s ours
* commit '
efa66ca345bc9c82e9f4c88e4e902f935804ab73':
Import translations. DO NOT MERGE
John Reck [Wed, 11 Nov 2015 17:59:16 +0000 (17:59 +0000)]
Merge "Fix memory corruption in SpotShadow"
am:
8c85c00b5e
* commit '
8c85c00b5e8fffb226f4af225a67425b8d0f190b':
Fix memory corruption in SpotShadow
Geoff Mendal [Wed, 11 Nov 2015 17:56:56 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
John Reck [Wed, 11 Nov 2015 17:52:08 +0000 (17:52 +0000)]
Merge "Fix memory corruption in SpotShadow"
Geoff Mendal [Wed, 11 Nov 2015 17:49:48 +0000 (17:49 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours am:
adaccf62be -s ours
am:
d00e9f88d7 -s ours
* commit '
d00e9f88d704c713a313c18a2f5bc37986e7d6e3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE am:
984f7fb960 -s ours
am:
adaccf62be -s ours
* commit '
adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:41:18 +0000 (18:41 +0100)]
Import translations. DO NOT MERGE
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Nov 2015 17:32:10 +0000 (17:32 +0000)]
Import translations. DO NOT MERGE
am:
984f7fb960 -s ours
* commit '
984f7fb9603b55d3031f7df04fa37010513b712c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Nov 2015 17:07:16 +0000 (18:07 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ief45ae89cfe3bfd76390f8f70276c2411d0dfc30
Auto-generated-cl: translation import
Calin Juravle [Wed, 11 Nov 2015 17:05:42 +0000 (17:05 +0000)]
Merge "Parse method-trace properties only in debug builds." am:
8fa7e93050
am:
61abae774e
* commit '
61abae774e7cf3fd298ecab821692ac17417f4c5':
Parse method-trace properties only in debug builds.
Calin Juravle [Wed, 11 Nov 2015 17:00:22 +0000 (17:00 +0000)]
Merge "Parse method-trace properties only in debug builds."
am:
8fa7e93050
* commit '
8fa7e93050f5b3d7ccac8775fee302f1f4394d4f':
Parse method-trace properties only in debug builds.
Calin Juravle [Wed, 11 Nov 2015 16:54:52 +0000 (16:54 +0000)]
Merge "Parse method-trace properties only in debug builds."
Keith Mok [Wed, 11 Nov 2015 00:52:05 +0000 (16:52 -0800)]
Fix memory corruption in SpotShadow
The array list is too small and causing stack corruption
Change-Id: I0e34dad39357fb63977d2ce6f183ced7b6a632be
Calin Juravle [Tue, 10 Nov 2015 19:30:45 +0000 (19:30 +0000)]
Parse method-trace properties only in debug builds.
Bug:
25612377
Change-Id: Ia1d8e6c5afbdd70486d5aa8c059e70e27b03367d
Sebastien Hertz [Wed, 11 Nov 2015 01:20:27 +0000 (01:20 +0000)]
Allow debugging only for apps forked from zygote am:
f915991842 -s ours am:
48fdfa403e
am:
f8c9e499c0
* commit '
f8c9e499c0985c8893617e81dea75fbaaebee0d9':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Wed, 11 Nov 2015 01:11:33 +0000 (01:11 +0000)]
Allow debugging only for apps forked from zygote am:
f915991842 -s ours
am:
48fdfa403e
* commit '
48fdfa403eef469ea9bbcbf5509d919b7db447c7':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Wed, 11 Nov 2015 01:02:21 +0000 (01:02 +0000)]
Allow debugging only for apps forked from zygote
am:
f915991842 -s ours
* commit '
f91599184200e4e5f5b8bb01f9e7274d21a3dc9d':
Allow debugging only for apps forked from zygote
John Reck [Tue, 10 Nov 2015 23:31:11 +0000 (23:31 +0000)]
Merge "Fix HWUI Path Cache dangling pointer" am:
37bf3ec9d2
am:
7516d4d866
* commit '
7516d4d8667957688433b02b2f4985f1b3ab36ad':
Fix HWUI Path Cache dangling pointer
John Reck [Tue, 10 Nov 2015 23:26:01 +0000 (23:26 +0000)]
Merge "Fix HWUI Path Cache dangling pointer"
am:
37bf3ec9d2
* commit '
37bf3ec9d2fb3dfdccfe043e51723e4e543f0703':
Fix HWUI Path Cache dangling pointer
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug:
23050463
(cherry picked from commit
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
(cherry picked from commit
ff8dc21278b19b22ed8dc9f9475850838336d351)
John Reck [Tue, 10 Nov 2015 23:20:03 +0000 (23:20 +0000)]
Merge "Fix HWUI Path Cache dangling pointer"
Chad Brubaker [Mon, 9 Nov 2015 21:38:51 +0000 (13:38 -0800)]
Add support for debug-overrides configuration
Debug overrides are only used if the application is debuggable in
order to help local debugging and development by trusting additional
CAs. In a non-debuggable version of the application the debug-overrides
are ignored.
Trust anchors in the debug override configuration have two key
differences from those in base-config and domain-config:
1) trust anchors in the debug-overrides are trusted for all connections
in addition to any trust anchors included in the relevant base/domain
configs.
2) By default trust anchors in the debug config override pins, as their
purpose is for connecting to non-standard servers for debugging and
testing and those servers should not be pinned in the production
configuration.
Change-Id: I15ee98eae182be0ffaa49b06bc5e1c6c3d22baee
Svetoslav Ganov [Tue, 10 Nov 2015 01:07:27 +0000 (01:07 +0000)]
Merge "Avoid NPE in printspooler when changing language" am:
8d8515e708
am:
5522efb130
* commit '
5522efb1300cfa87a8434bd396093a2ae076fa69':
Avoid NPE in printspooler when changing language
Svetoslav Ganov [Tue, 10 Nov 2015 01:03:05 +0000 (01:03 +0000)]
Merge "Avoid NPE in printspooler when changing language"
am:
8d8515e708
* commit '
8d8515e708f0cebf69587750bbb3abcb315cc61e':
Avoid NPE in printspooler when changing language
Svetoslav Ganov [Tue, 10 Nov 2015 00:58:28 +0000 (00:58 +0000)]
Merge "Avoid NPE in printspooler when changing language"
Jeff Sharkey [Mon, 9 Nov 2015 21:58:49 +0000 (21:58 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am:
00765ef5a2 am:
e6538dcc06
am:
d9c10d7edd
* commit '
d9c10d7edd52f5c1efb6d40f1c36b376b7a34934':
Block directory selection in openable modes.
Jeff Sharkey [Mon, 9 Nov 2015 21:53:02 +0000 (21:53 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am:
00765ef5a2
am:
e6538dcc06
* commit '
e6538dcc06c2547ac8a58c265e6b586fc9652ef3':
Block directory selection in openable modes.
Jeff Sharkey [Mon, 9 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
am:
00765ef5a2
* commit '
00765ef5a2a0981d18a15f3acaf4119592d42996':
Block directory selection in openable modes.
Jeff Sharkey [Mon, 9 Nov 2015 21:40:29 +0000 (21:40 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
Marco Nelissen [Mon, 9 Nov 2015 21:39:41 +0000 (21:39 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am:
83702ec3ed am:
02bf433f90
am:
8fb0121cb6
* commit '
8fb0121cb60ddf54a22bff088670594f422edea9':
Fix race condition when setting default ringtones
Marco Nelissen [Mon, 9 Nov 2015 21:34:14 +0000 (21:34 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am:
83702ec3ed
am:
02bf433f90
* commit '
02bf433f902aa34483aa2fc1b410f393b35058f1':
Fix race condition when setting default ringtones
Marco Nelissen [Mon, 9 Nov 2015 21:28:32 +0000 (21:28 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
am:
83702ec3ed
* commit '
83702ec3edf3bd17eff90a409cc3cf5efab48cff':
Fix race condition when setting default ringtones
Marco Nelissen [Mon, 9 Nov 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
Nick Kralevich [Mon, 9 Nov 2015 20:34:02 +0000 (20:34 +0000)]
Merge "system_server: allow /proc read access to other UIDs" am:
51b48b3877
am:
02cc328d9d
* commit '
02cc328d9df39a4abae55bf047a88a9e8129783d':
system_server: allow /proc read access to other UIDs
Nick Kralevich [Mon, 9 Nov 2015 20:28:30 +0000 (20:28 +0000)]
Merge "system_server: allow /proc read access to other UIDs"
am:
51b48b3877
* commit '
51b48b38774b8babe339890e1c888dfd8647ee72':
system_server: allow /proc read access to other UIDs
Nick Kralevich [Mon, 9 Nov 2015 20:05:22 +0000 (20:05 +0000)]
Merge "system_server: allow /proc read access to other UIDs"
Geoff Mendal [Mon, 9 Nov 2015 18:02:10 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
f3b3a2ce2b -s ours
am:
919b74ae35 -s ours
* commit '
919b74ae355102deb2e6c35e95803edf29cea1d6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:57:11 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
f3b3a2ce2b -s ours
* commit '
f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:51:40 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 9 Nov 2015 17:43:57 +0000 (18:43 +0100)]
Import translations. DO NOT MERGE
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 17:39:01 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE am:
49eeda33dd -s ours am:
0414438abe -s ours
am:
9ab5fb52a0 -s ours
* commit '
9ab5fb52a0d2d03b86a3862363f0594356a90bcd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:34:42 +0000 (17:34 +0000)]
Import translations. DO NOT MERGE am:
49eeda33dd -s ours
am:
0414438abe -s ours
* commit '
0414438abe0718f5007d7b580981d6ba204b655c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:27:25 +0000 (17:27 +0000)]
Import translations. DO NOT MERGE
am:
49eeda33dd -s ours
* commit '
49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:10:12 +0000 (18:10 +0100)]
Import translations. DO NOT MERGE
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:37:24 +0000 (13:37 +0000)]
Import translations. DO NOT MERGE am:
210f0afaf9 -s ours
am:
a1d0738253 -s ours
* commit '
a1d07382539525a44baf0ca581e04fb445639831':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 13:29:12 +0000 (13:29 +0000)]
Import translations. DO NOT MERGE
am:
210f0afaf9 -s ours
* commit '
210f0afaf9011d044d261f1044a1a7368cb89e7e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 13:11:08 +0000 (05:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
Digish Pandya [Wed, 4 Nov 2015 05:30:28 +0000 (11:00 +0530)]
Fix HWUI Path Cache dangling pointer
When precache, PathTexture is added to PathCache, and it is released after drawn if we want to clean it.
But the PathCache LRU still holds the entry of the PathTexture object. When trim the cache in
the end of each frame, LRU finds that its mListener is not NULL and invoke the functor, however,
mListerer points to the released PathTexture object and is a dangling pointer, thus leads to crash.
Smart pointer don't help here since they only manage scopes, while PathTexture is also controled by
its cleanup field.
The fix is to also remove the LRU entry of PathTexture*, it will also release the texture object
and there won't be texture leaks.
Change-Id: Iaa0621df5dc71532e9e75b38ad94384353930b95
Nick Kralevich [Sun, 8 Nov 2015 01:04:04 +0000 (17:04 -0800)]
system_server: allow /proc read access to other UIDs
Add system_server to AID_READPROC, to allow system_server to read
/proc entries associated with other UIDs.
Bug:
23310674
Change-Id: I1602b8ee30670cde4ed56e2f901524c105895352
Chad Brubaker [Sat, 7 Nov 2015 22:23:00 +0000 (22:23 +0000)]
Merge "Support nested domain-config elements" am:
749501e88e
am:
b549899d0b
* commit '
b549899d0b6b95032a9c75e64c9276acd85510d1':
Support nested domain-config elements
Chad Brubaker [Sat, 7 Nov 2015 22:21:40 +0000 (22:21 +0000)]
Merge "Add xml source for network security configuration" am:
ead46ecc84
am:
0cb8f01410
* commit '
0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
Add xml source for network security configuration
Chad Brubaker [Sat, 7 Nov 2015 22:16:10 +0000 (22:16 +0000)]
Merge "Support nested domain-config elements"
am:
749501e88e
* commit '
749501e88e5fa6bdc6594a9db5c232e31bdda867':
Support nested domain-config elements
Chad Brubaker [Sat, 7 Nov 2015 22:14:36 +0000 (22:14 +0000)]
Merge "Add xml source for network security configuration"
am:
ead46ecc84
* commit '
ead46ecc843e3686ff5ae8008f4452fc79f847e7':
Add xml source for network security configuration
Chad Brubaker [Sat, 7 Nov 2015 22:11:04 +0000 (22:11 +0000)]
Merge "Support nested domain-config elements"
Chad Brubaker [Sat, 7 Nov 2015 22:10:50 +0000 (22:10 +0000)]
Merge "Add xml source for network security configuration"
Chad Brubaker [Sat, 7 Nov 2015 07:02:37 +0000 (23:02 -0800)]
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
Chad Brubaker [Thu, 5 Nov 2015 07:55:29 +0000 (23:55 -0800)]
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
Chad Brubaker [Sat, 7 Nov 2015 02:47:59 +0000 (02:47 +0000)]
Merge "Fix incorrect hstsEnforced lookup" am:
1347cb81f4
am:
90b9ed5c82
* commit '
90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc':
Fix incorrect hstsEnforced lookup
Chad Brubaker [Sat, 7 Nov 2015 02:42:05 +0000 (02:42 +0000)]
Merge "Fix incorrect hstsEnforced lookup"
am:
1347cb81f4
* commit '
1347cb81f402c628f3346ea350a5862749901d59':
Fix incorrect hstsEnforced lookup
Chad Brubaker [Sat, 7 Nov 2015 02:37:45 +0000 (02:37 +0000)]
Merge "Fix incorrect hstsEnforced lookup"
Chad Brubaker [Sat, 7 Nov 2015 02:08:12 +0000 (18:08 -0800)]
Fix incorrect hstsEnforced lookup
Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018
Chad Brubaker [Fri, 6 Nov 2015 21:19:02 +0000 (21:19 +0000)]
Merge "Fix directory check in UserCertificateSource" am:
1483ee3aa5
am:
2d7d8401a9
* commit '
2d7d8401a9c1e03f8f141415b25cfb415df73695':
Fix directory check in UserCertificateSource
Chad Brubaker [Fri, 6 Nov 2015 21:17:34 +0000 (21:17 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check" am:
c5c51dafb3
am:
dd6d0918c4
* commit '
dd6d0918c42aec3fb08d6df15822078e35cc4f33':
Fix incorrect hasPerDomainConfigs check
Chad Brubaker [Fri, 6 Nov 2015 21:10:54 +0000 (21:10 +0000)]
Merge "Fix directory check in UserCertificateSource"
am:
1483ee3aa5
* commit '
1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
Fix directory check in UserCertificateSource
Chad Brubaker [Fri, 6 Nov 2015 21:09:11 +0000 (21:09 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check"
am:
c5c51dafb3
* commit '
c5c51dafb3ede95622eb350dae0b662abb611925':
Fix incorrect hasPerDomainConfigs check
Chad Brubaker [Fri, 6 Nov 2015 21:02:23 +0000 (21:02 +0000)]
Merge "Fix directory check in UserCertificateSource"
Chad Brubaker [Fri, 6 Nov 2015 21:02:01 +0000 (21:02 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check"
Chad Brubaker [Fri, 6 Nov 2015 20:52:12 +0000 (12:52 -0800)]
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
Chad Brubaker [Fri, 6 Nov 2015 20:50:31 +0000 (12:50 -0800)]
Fix incorrect hasPerDomainConfigs check
Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346
Chad Brubaker [Fri, 6 Nov 2015 20:31:02 +0000 (20:31 +0000)]
Merge "Use a builder for NetworkSecurityConfig" am:
7e98f2e697
am:
478fad3cf5
* commit '
478fad3cf53874f9cc96169cd25b29b9c031637a':
Use a builder for NetworkSecurityConfig
Chad Brubaker [Fri, 6 Nov 2015 20:25:33 +0000 (20:25 +0000)]
Merge "Use a builder for NetworkSecurityConfig"
am:
7e98f2e697
* commit '
7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
Use a builder for NetworkSecurityConfig
Chad Brubaker [Fri, 6 Nov 2015 20:21:29 +0000 (20:21 +0000)]
Merge "Use a builder for NetworkSecurityConfig"
Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]
Fix race condition when setting default ringtones
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.
Bug:
18625739
Bug:
22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
Chris Elliott [Fri, 6 Nov 2015 18:46:32 +0000 (18:46 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am:
d9a2be8d3d -s ours am:
634221adb2
am:
54919264d8
* commit '
54919264d8ab758a29c6d417d7bcd5a949c0b6e9':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 18:41:35 +0000 (18:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am:
d9a2be8d3d -s ours
am:
634221adb2
* commit '
634221adb28f765233889cca32078e4b042198f3':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 18:36:16 +0000 (18:36 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
am:
d9a2be8d3d -s ours
* commit '
d9a2be8d3d5bd0e170fec71c316373e268a8c17f':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 17:41:17 +0000 (17:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
This reverts commit
7e19e286cc990daaafe934ed82ddfa00762907d6.
Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
Jeff Sharkey [Fri, 6 Nov 2015 17:16:22 +0000 (09:16 -0800)]
Block directory selection in openable modes.
When picking documents to return to apps requesting CATEGORY_OPENABLE
we can't let the user select directories.
Bug:
25455200
Change-Id: I8076883ee5b019eab4d2adb841952865f21e413e
Svetoslav Ganov [Fri, 6 Nov 2015 00:46:35 +0000 (00:46 +0000)]
Merge "Take into account default app for default grants" am:
7abb36599d
am:
57fb4bd4f7
* commit '
57fb4bd4f704c93ff73e055e6602ee18f7dbf669':
Take into account default app for default grants
Svetoslav Ganov [Fri, 6 Nov 2015 00:40:48 +0000 (00:40 +0000)]
Merge "Take into account default app for default grants"
am:
7abb36599d
* commit '
7abb36599d9537296d9a51f766152025c6ed0491':
Take into account default app for default grants
Svetoslav Ganov [Fri, 6 Nov 2015 00:36:44 +0000 (00:36 +0000)]
Merge "Revert "Take into account default app for default grants"" am:
9ae3aeec53
am:
0c4ce4474f
* commit '
0c4ce4474ff0020b2b041f26fb00efbdc0783285':
Revert "Take into account default app for default grants"
Svetoslav Ganov [Fri, 6 Nov 2015 00:34:21 +0000 (00:34 +0000)]
Merge "Take into account default app for default grants"
Svetoslav [Fri, 6 Nov 2015 00:33:02 +0000 (16:33 -0800)]
Take into account default app for default grants
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
Svetoslav Ganov [Fri, 6 Nov 2015 00:31:13 +0000 (00:31 +0000)]
Merge "Revert "Take into account default app for default grants""
am:
9ae3aeec53
* commit '
9ae3aeec532ce5a7908d395049efb61399875360':
Revert "Take into account default app for default grants"
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:59 +0000 (00:24 +0000)]
Merge "Revert "Take into account default app for default grants""
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:47 +0000 (00:24 +0000)]
Revert "Take into account default app for default grants"
Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.
This reverts commit
fce33d58d87fd494686aae4e21332b58ec260b73.
Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272
Tenghui Zhu [Fri, 6 Nov 2015 00:06:02 +0000 (00:06 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" am:
3226c57321
am:
cca2857ebb
* commit '
cca2857ebb52d3ba06bbd42de7db2c33e04cf0cc':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Fri, 6 Nov 2015 00:00:33 +0000 (00:00 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow"
am:
3226c57321
* commit '
3226c57321f15384ef7c1e93589c6d2a58cbe86c':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Thu, 5 Nov 2015 23:56:56 +0000 (23:56 +0000)]
Merge "When the incoming light source is invalid, don't generate any shadow"
Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]
When the incoming light source is invalid, don't generate any shadow
b/
25417885
Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
Chad Brubaker [Thu, 5 Nov 2015 07:36:07 +0000 (23:36 -0800)]
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
Chris Craik [Thu, 5 Nov 2015 20:37:23 +0000 (20:37 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am:
0cf48e9120 am:
17fc83cbde
am:
c06ccd77c1
* commit '
c06ccd77c129cdf198c64babdfd8d289aa8ff908':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:36:00 +0000 (20:36 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am:
e10faaa410 am:
2de7e39ffa
am:
73d60ff36f
* commit '
73d60ff36fbf656d022c2d4f35b8e9f2d25e795f':
Kick movement preconditions onto handler thread.
Chris Craik [Thu, 5 Nov 2015 20:31:39 +0000 (20:31 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am:
0cf48e9120
am:
17fc83cbde
* commit '
17fc83cbde8ab1e92664d12a0fed306e9054ca55':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:30:12 +0000 (20:30 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am:
e10faaa410
am:
2de7e39ffa
* commit '
2de7e39ffa387b370e5997542811fd05a73cb8fc':
Kick movement preconditions onto handler thread.