drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,195 Commits 1 Branch 0 Tags
Commit Graph

213195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
184cefc2ae Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 am: 0e57a4d021 
am: 7a062ed396

* commit '7a062ed396f6e563766367de70e0d9c6ba615fed':
  Camera: Documentation updates
 2015-11-12 01:31:30 +00:00
Eino-Ville Talvala
7a062ed396 Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 
am: 0e57a4d021

* commit '0e57a4d02199a55db763b10a49f383c395e768c7':
  Camera: Documentation updates
 2015-11-12 01:25:02 +00:00
Eino-Ville Talvala
0e57a4d021 Camera: Documentation updates am: d8407271ff 
am: 37e78cf8f1

* commit '37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
  Camera: Documentation updates
 2015-11-12 01:18:12 +00:00
Eino-Ville Talvala
37e78cf8f1 Camera: Documentation updates 
am: d8407271ff

* commit 'd8407271ffa83d27e9a524f485a0799e422e1fd6':
  Camera: Documentation updates
 2015-11-12 01:10:07 +00:00
Eino-Ville Talvala
d8407271ff Camera: Documentation updates 
- Clarify hardware.camera feature being only for the back camera
 - Clarify what setting a CaptureRequest field to null does
 - Use preCorrectionActiveArray instead of activeArray in list of
   possible raw output sizes
 - Clarify length of GPS processing field for camera1 API

Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
 2015-11-11 23:59:38 +00:00
Daniel Koulomzin
c549b4fbc4 Merge "ActivityView gets its own thread pool." into cw-e-dev am: 1090acc958 
am: 102e66152a

* commit '102e66152a51e28920da23e2991281f51f2439ee':
  ActivityView gets its own thread pool.
 2015-11-11 23:37:13 +00:00
Daniel Koulomzin
102e66152a Merge "ActivityView gets its own thread pool." into cw-e-dev 
am: 1090acc958

* commit '1090acc958add85c1332fc73b66258ea4efba69e':
  ActivityView gets its own thread pool.
 2015-11-11 23:28:10 +00:00
Daniel Koulomzin
1090acc958 Merge "ActivityView gets its own thread pool." into cw-e-dev 2015-11-11 23:23:18 +00:00
Daniel Koulomzin
71c012e001 ActivityView gets its own thread pool. 
Bug: 24316798

Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
 2015-11-11 18:21:57 -05:00
Ian Pedowitz
4ab979e6cc Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6 
am: 44df02fc17

* commit '44df02fc17bb0f3f1c445166c6cbd7f4d92b4eb6':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 22:04:28 +00:00
Ian Pedowitz
44df02fc17 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 
am: 4f22c781b6

* commit '4f22c781b614322fe3790d314a527ac10471a63a':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 21:54:42 +00:00
Ian Pedowitz
4f22c781b6 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev 
am: 88d4cc1001

* commit '88d4cc100175a54be3b7d560a91c38197f59f4bf':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 21:46:06 +00:00
Ian Pedowitz
88d4cc1001 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev 2015-11-11 21:39:11 +00:00
Ian Pedowitz
05ce0c6bb0 Revert "Fix race condition when setting default ringtones" 
This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74.

Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
 2015-11-11 21:38:04 +00:00
Chad Brubaker
70b2eede18 Merge "Add NetworkSecurityConfigProvider" am: d1c469e876 
am: 8c89f4d28c

* commit '8c89f4d28c927ffe81c6e46159d0e5d3a0dd2986':
  Add NetworkSecurityConfigProvider
 2015-11-11 20:39:35 +00:00
Amith Yamasani
f12ffe6d76 Merge "Fix system watchdog timeout when reading too many usage events." am: 10b0bae06f 
am: b3d48f18a9

* commit 'b3d48f18a94c586823462c93fc0f739c83f3db78':
  Fix system watchdog timeout when reading too many usage events.
 2015-11-11 20:38:15 +00:00
Chad Brubaker
8c89f4d28c Merge "Add NetworkSecurityConfigProvider" 
am: d1c469e876

* commit 'd1c469e8769822c48584034076861331fd792a7c':
  Add NetworkSecurityConfigProvider
 2015-11-11 20:32:03 +00:00
Amith Yamasani
b3d48f18a9 Merge "Fix system watchdog timeout when reading too many usage events." 
am: 10b0bae06f

* commit '10b0bae06ffdeb79494ddd1aff19387b56770960':
  Fix system watchdog timeout when reading too many usage events.
 2015-11-11 20:30:32 +00:00
Chad Brubaker
d1c469e876 Merge "Add NetworkSecurityConfigProvider" 2015-11-11 20:25:04 +00:00
Amith Yamasani
10b0bae06f Merge "Fix system watchdog timeout when reading too many usage events." 2015-11-11 20:24:39 +00:00
Chad Brubaker
3210b8b4da Merge "Add support for debug-overrides configuration" am: f1e813ea33 
am: 467804448d

* commit '467804448d6b13e04b4d9bc20fd195baa1f07e90':
  Add support for debug-overrides configuration
 2015-11-11 19:30:01 +00:00
Chad Brubaker
467804448d Merge "Add support for debug-overrides configuration" 
am: f1e813ea33

* commit 'f1e813ea334c947ae0397bfa3a8e42be4fd4ae8c':
  Add support for debug-overrides configuration
 2015-11-11 19:21:32 +00:00
Chad Brubaker
f1e813ea33 Merge "Add support for debug-overrides configuration" 2015-11-11 19:03:30 +00:00
Chad Brubaker
5a1078f40d Add NetworkSecurityConfigProvider 
Change-Id: I321e3ca94cc2a8d5e0e5d82a83b255ff5b8a71d2
 2015-11-11 10:54:54 -08:00
Geoff Mendal
6035d3d256 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
 2015-11-11 18:12:37 +00:00
John Reck
5bb2fdb425 Merge "Fix memory corruption in SpotShadow" am: 8c85c00b5e 
am: 8c8353a8c3

* commit '8c8353a8c3152bc3ee4b74815d64c65c2c9d1991':
  Fix memory corruption in SpotShadow
 2015-11-11 18:08:15 +00:00
Geoff Mendal
bdc6cd2930 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: efa66ca345  -s ours

* commit 'efa66ca345bc9c82e9f4c88e4e902f935804ab73':
  Import translations. DO NOT MERGE
 2015-11-11 18:03:38 +00:00
John Reck
8c8353a8c3 Merge "Fix memory corruption in SpotShadow" 
am: 8c85c00b5e

* commit '8c85c00b5e8fffb226f4af225a67425b8d0f190b':
  Fix memory corruption in SpotShadow
 2015-11-11 17:59:16 +00:00
Geoff Mendal
efa66ca345 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-11 17:56:56 +00:00
John Reck
8c85c00b5e Merge "Fix memory corruption in SpotShadow" 2015-11-11 17:52:08 +00:00
Geoff Mendal
3c8f7b53da Import translations. DO NOT MERGE am: 984f7fb960 -s ours am: adaccf62be -s ours 
am: d00e9f88d7  -s ours

* commit 'd00e9f88d704c713a313c18a2f5bc37986e7d6e3':
  Import translations. DO NOT MERGE
 2015-11-11 17:49:48 +00:00
Geoff Mendal
d00e9f88d7 Import translations. DO NOT MERGE am: 984f7fb960 -s ours 
am: adaccf62be  -s ours

* commit 'adaccf62be5c8b1f44f5dd0c03bff01a2b314896':
  Import translations. DO NOT MERGE
 2015-11-11 17:41:18 +00:00
Geoff Mendal
ead61cca62 Import translations. DO NOT MERGE 
Change-Id: If1583a01724c6eb81c234b7f2b71c7f276d67a13
Auto-generated-cl: translation import
 2015-11-11 18:41:18 +01:00
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