213213 Commits

Author SHA1 Message Date
Geoff Mendal
adaccf62be Import translations. DO NOT MERGE
am: 984f7fb960  -s ours

* commit '984f7fb9603b55d3031f7df04fa37010513b712c':
  Import translations. DO NOT MERGE
2015-11-11 17:32:10 +00:00
Geoff Mendal
984f7fb960 Import translations. DO NOT MERGE
Change-Id: Ief45ae89cfe3bfd76390f8f70276c2411d0dfc30
Auto-generated-cl: translation import
2015-11-11 18:07:16 +01:00
Calin Juravle
d75fdb6fe3 Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050
am: 61abae774e

* commit '61abae774e7cf3fd298ecab821692ac17417f4c5':
  Parse method-trace properties only in debug builds.
2015-11-11 17:05:42 +00:00
Calin Juravle
61abae774e Merge "Parse method-trace properties only in debug builds."
am: 8fa7e93050

* commit '8fa7e93050f5b3d7ccac8775fee302f1f4394d4f':
  Parse method-trace properties only in debug builds.
2015-11-11 17:00:22 +00:00
Calin Juravle
8fa7e93050 Merge "Parse method-trace properties only in debug builds." 2015-11-11 16:54:52 +00:00
Keith Mok
a1f5631340 Fix memory corruption in SpotShadow
The array list is too small and causing stack corruption

Change-Id: I0e34dad39357fb63977d2ce6f183ced7b6a632be
2015-11-11 08:49:20 -08:00
Calin Juravle
92290b8963 Parse method-trace properties only in debug builds.
Bug: 25612377
Change-Id: Ia1d8e6c5afbdd70486d5aa8c059e70e27b03367d
2015-11-11 10:36:47 +00:00
Sebastien Hertz
000b17b51c 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
2015-11-11 01:20:27 +00:00
Sebastien Hertz
f8c9e499c0 Allow debugging only for apps forked from zygote am: f915991842 -s ours
am: 48fdfa403e

* commit '48fdfa403eef469ea9bbcbf5509d919b7db447c7':
  Allow debugging only for apps forked from zygote
2015-11-11 01:11:33 +00:00
Sebastien Hertz
48fdfa403e Allow debugging only for apps forked from zygote
am: f915991842  -s ours

* commit 'f91599184200e4e5f5b8bb01f9e7274d21a3dc9d':
  Allow debugging only for apps forked from zygote
2015-11-11 01:02:21 +00:00
John Reck
1b85ce17a3 Merge "Fix HWUI Path Cache dangling pointer" am: 37bf3ec9d2
am: 7516d4d866

* commit '7516d4d8667957688433b02b2f4985f1b3ab36ad':
  Fix HWUI Path Cache dangling pointer
2015-11-10 23:31:11 +00:00
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
Sebastien Hertz
f915991842 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)
2015-11-10 23:20:53 +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
16009a6dea Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708
am: 5522efb130

* commit '5522efb1300cfa87a8434bd396093a2ae076fa69':
  Avoid NPE in printspooler when changing language
2015-11-10 01:07:27 +00: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
Jeff Sharkey
ab62877a07 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.
2015-11-09 21:58:49 +00:00
Jeff Sharkey
d9c10d7edd Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2
am: e6538dcc06

* commit 'e6538dcc06c2547ac8a58c265e6b586fc9652ef3':
  Block directory selection in openable modes.
2015-11-09 21:53:02 +00:00
Jeff Sharkey
e6538dcc06 Merge "Block directory selection in openable modes." into mnc-dr-dev
am: 00765ef5a2

* commit '00765ef5a2a0981d18a15f3acaf4119592d42996':
  Block directory selection in openable modes.
2015-11-09 21:46:06 +00:00
Jeff Sharkey
00765ef5a2 Merge "Block directory selection in openable modes." into mnc-dr-dev 2015-11-09 21:40:29 +00:00
Marco Nelissen
b67ae42ad0 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
2015-11-09 21:39:41 +00:00
Marco Nelissen
8fb0121cb6 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
2015-11-09 21:34:14 +00:00
Marco Nelissen
02bf433f90 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
am: 83702ec3ed

* commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff':
  Fix race condition when setting default ringtones
2015-11-09 21:28:32 +00:00
Marco Nelissen
83702ec3ed Merge "Fix race condition when setting default ringtones" into mnc-dr-dev 2015-11-09 21:21:55 +00:00
Nick Kralevich
7907271af1 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
2015-11-09 20:34:02 +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
Geoff Mendal
bd4d7ed031 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
2015-11-09 18:02:10 +00:00
Geoff Mendal
919b74ae35 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: f3b3a2ce2b  -s ours

* commit 'f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
  Import translations. DO NOT MERGE
2015-11-09 17:57:11 +00:00
Geoff Mendal
f3b3a2ce2b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-09 17:51:40 +00:00
Geoff Mendal
016d9e7c4d Import translations. DO NOT MERGE
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
2015-11-09 18:43:57 +01:00
Geoff Mendal
fc2d271539 Import translations. DO NOT MERGE am: 49eeda33dd -s ours am: 0414438abe -s ours
am: 9ab5fb52a0  -s ours

* commit '9ab5fb52a0d2d03b86a3862363f0594356a90bcd':
  Import translations. DO NOT MERGE
2015-11-09 17:39:01 +00:00
Geoff Mendal
9ab5fb52a0 Import translations. DO NOT MERGE am: 49eeda33dd -s ours
am: 0414438abe  -s ours

* commit '0414438abe0718f5007d7b580981d6ba204b655c':
  Import translations. DO NOT MERGE
2015-11-09 17:34:42 +00:00
Geoff Mendal
0414438abe Import translations. DO NOT MERGE
am: 49eeda33dd  -s ours

* commit '49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
  Import translations. DO NOT MERGE
2015-11-09 17:27:25 +00:00
Geoff Mendal
49eeda33dd Import translations. DO NOT MERGE
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
2015-11-09 18:10:12 +01:00
Geoff Mendal
16c692f57f Import translations. DO NOT MERGE am: 210f0afaf9 -s ours
am: a1d0738253  -s ours

* commit 'a1d07382539525a44baf0ca581e04fb445639831':
  Import translations. DO NOT MERGE
2015-11-09 13:37:24 +00:00
Geoff Mendal
a1d0738253 Import translations. DO NOT MERGE
am: 210f0afaf9  -s ours

* commit '210f0afaf9011d044d261f1044a1a7368cb89e7e':
  Import translations. DO NOT MERGE
2015-11-09 13:29:12 +00:00
Geoff Mendal
210f0afaf9 Import translations. DO NOT MERGE
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
2015-11-09 05:11:08 -08: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
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
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