213088 Commits

Author SHA1 Message Date
John Reck
7516d4d866 Merge "Fix HWUI Path Cache dangling pointer"
am: 37bf3ec9d2

* commit '37bf3ec9d2fb3dfdccfe043e51723e4e543f0703':
  Fix HWUI Path Cache dangling pointer
2015-11-10 23:26:01 +00:00
John Reck
37bf3ec9d2 Merge "Fix HWUI Path Cache dangling pointer" 2015-11-10 23:20:03 +00:00
Chad Brubaker
08d36202da 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
2015-11-10 12:40:00 -08:00
Svetoslav Ganov
5522efb130 Merge "Avoid NPE in printspooler when changing language"
am: 8d8515e708

* commit '8d8515e708f0cebf69587750bbb3abcb315cc61e':
  Avoid NPE in printspooler when changing language
2015-11-10 01:03:05 +00:00
Svetoslav Ganov
8d8515e708 Merge "Avoid NPE in printspooler when changing language" 2015-11-10 00:58:28 +00:00
Nick Kralevich
02cc328d9d Merge "system_server: allow /proc read access to other UIDs"
am: 51b48b3877

* commit '51b48b38774b8babe339890e1c888dfd8647ee72':
  system_server: allow /proc read access to other UIDs
2015-11-09 20:28:30 +00:00
Nick Kralevich
51b48b3877 Merge "system_server: allow /proc read access to other UIDs" 2015-11-09 20:05:22 +00:00
Digish Pandya
2e4f67c388 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
2015-11-09 14:22:25 +05:30
Mark Lu
4e59db328d Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100

RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.

Solution:
Let display listener executed in background thread handler

Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
2015-11-09 07:24:48 +00:00
Nick Kralevich
368513fa99 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
2015-11-07 17:04:04 -08: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
749501e88e Merge "Support nested domain-config elements" 2015-11-07 22:11:04 +00:00
Chad Brubaker
ead46ecc84 Merge "Add xml source for network security configuration" 2015-11-07 22:10:50 +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
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
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
Chad Brubaker
825c3f91ed Fix incorrect hstsEnforced lookup
Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018
2015-11-06 18:08:12 -08: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
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
Masaaki Iwaguchi
5b6d99e87a System crash fixed when turn off MagnificationGesture
Symptom:
WindowManagerService throws exception and system crashes.

Root cause:
When the MagnificationGesture is turned off during animation of scale
up/down, WindowManagerService.mAccessibilityController can be null so
exception is thrown.

Solution:
Cancel ongoing animation before turning off MagnificationGesture.

Change-Id: I469d84e024bdd453e3729a69229398233ed2eb61
2015-11-06 12:40:14 +01:00
Svetoslav Ganov
57fb4bd4f7 Merge "Take into account default app for default grants"
am: 7abb36599d

* commit '7abb36599d9537296d9a51f766152025c6ed0491':
  Take into account default app for default grants
2015-11-06 00:40:48 +00:00
Svetoslav Ganov
7abb36599d Merge "Take into account default app for default grants" 2015-11-06 00:34:21 +00:00
Svetoslav
5d05bbea5f Take into account default app for default grants
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
2015-11-05 16:33:05 -08:00
Svetoslav Ganov
0c4ce4474f Merge "Revert "Take into account default app for default grants""
am: 9ae3aeec53

* commit '9ae3aeec532ce5a7908d395049efb61399875360':
  Revert "Take into account default app for default grants"
2015-11-06 00:31:13 +00:00
Svetoslav Ganov
9ae3aeec53 Merge "Revert "Take into account default app for default grants"" 2015-11-06 00:24:59 +00:00
Svetoslav Ganov
d2bbf1bf0a 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
2015-11-06 00:24:47 +00:00
Tenghui Zhu
cca2857ebb 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
2015-11-06 00:00:33 +00:00
Tenghui Zhu
3226c57321 Merge "When the incoming light source is invalid, don't generate any shadow" 2015-11-05 23:56:56 +00:00
Teng-Hui Zhu
83ea5b7b22 When the incoming light source is invalid, don't generate any shadow
b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
2015-11-05 15:48:35 -08: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
Baligh Uddin
69cc50f1e8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:59 +00:00
Baligh Uddin
97bf3b5922 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:31 +00:00
Baligh Uddin
5495ee8a9b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:27 +00:00
Baligh Uddin
57b7fa49ac Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:23 +00:00
Baligh Uddin
6be193d87e Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:19 +00:00
Baligh Uddin
8019f49d08 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:17 +00:00
Dan Albert
c74dd7fcb1 Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 2015-11-05 19:41:33 +00:00
Dan Albert
3061d67f86 Merge "Use std::unique_ptr instead of UniquePtr."
am: 22b7e496c2

* commit '22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
  Use std::unique_ptr instead of UniquePtr.
2015-11-05 19:40:59 +00:00
Baligh Uddin
37a728001d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:41 +00:00
Baligh Uddin
ed472fba42 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:25 +00:00
Baligh Uddin
e1348a7fa9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:15 +00:00
Baligh Uddin
2523c61fb7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:04 +00:00