205186 Commits

Author SHA1 Message Date
Casey Dahlin
f3c2ed13d0 Revert "Grab macros from libbase instead of duplicating"
This reverts commit 2535cae005512494469fc5cea1fe630288ecb083.

Change-Id: I373844b6a0f429e88d6bcc1cdd5ac62325da55b3
2015-09-11 02:47:54 +00:00
Stephen Hines
12f2724bc9 am 3460304c: Merge "Update RS docs for M-related changes."
* commit '3460304c5c656b2cbf2b371720edff4fd662b02d':
  Update RS docs for M-related changes.
2015-09-11 02:47:16 +00:00
Casey Dahlin
449274a774 am 8b25009d: Merge "Revert change to win32 isatty stub"
* commit '8b25009d92626e7f1bb3b8fdf2774df20ec7a769':
  Revert change to win32 isatty stub
2015-09-11 02:41:51 +00:00
Casey Dahlin
3230b2b2b7 am ec4cbf4f: Merge "Grab macros from libbase instead of duplicating"
* commit 'ec4cbf4f93ddb14653c27bfd7a169e010b87286c':
  Grab macros from libbase instead of duplicating
2015-09-11 02:41:43 +00:00
Casey Dahlin
d880e1cb0c am 7e8586fc: Merge "Convert to C++ Bison output"
* commit '7e8586fc1e40e7d860b05757882c3617df968fb8':
  Convert to C++ Bison output
2015-09-11 02:41:35 +00:00
Stephen Hines
3460304c5c Merge "Update RS docs for M-related changes." 2015-09-11 02:34:20 +00:00
Casey Dahlin
8b25009d92 Merge "Revert change to win32 isatty stub" 2015-09-11 02:30:32 +00:00
Casey Dahlin
ec4cbf4f93 Merge "Grab macros from libbase instead of duplicating" 2015-09-11 02:30:15 +00:00
Casey Dahlin
7e8586fc1e Merge "Convert to C++ Bison output" 2015-09-11 02:30:10 +00:00
Casey Dahlin
3e50f04dfa Revert change to win32 isatty stub
This is attempting to fix build breakage caused by redefining the isatty stub
for win32.

Change-Id: I5f854934cb9d2b2981f6349045e85d9ad737aa77
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-09-10 19:13:49 -07:00
Stephen Hines
663c81b4c3 Update docs for RS object API fixes.
Bug: 22926131

This is the documentation update corresponding to our new named
structures for RS object types.

Change-Id: I282ce78192da7c9f68951ce05100819a306694f0
2015-09-10 18:52:40 -07:00
Casey Dahlin
6929b5fab0 am c71fdabd: Merge "First pass on reentrant C++-ish parser"
* commit 'c71fdabdd7dc46ef2914ee6fd3ba541689c91844':
  First pass on reentrant C++-ish parser
2015-09-11 01:47:28 +00:00
Casey Dahlin
2535cae005 Grab macros from libbase instead of duplicating
Change-Id: I1802f60a4dac45ddee8cd5715a73c77e4371d7e8
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-09-10 18:43:04 -07:00
Casey Dahlin
c71fdabdd7 Merge "First pass on reentrant C++-ish parser" 2015-09-11 01:39:07 +00:00
Casey Dahlin
96786829c2 Convert to C++ Bison output
We have to step up to a GLR parser to do this without exceptions (for no
reason other than Bison happens to use exceptions for the LALR(1) template and
not for the GLR one), but this should let us smooth out integration going
forward.

Change-Id: Iff44662914b4a65dfa5612d07c3a1ede07e6e4a9
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-09-10 18:29:09 -07:00
Casey Dahlin
9941dcc7aa First pass on reentrant C++-ish parser
We're flipping Flex/Bison in to reentrant mode, cutting down on global
variables, and exposing a more C++-like interface earlier. This is the first
phase. There's still a couple of weird hacks to deal with the previous code's
reckless disregard for scope sanity, but the outline of things to come is
starting to appear, and this CL really doesn't need to get any bigger.

Change-Id: Ife2d70db026d7ab1319bdf6c586959315666d0bb
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-09-10 16:55:18 -07:00
Shawn Willden
b63b8fb40a Update KeymasterDefs
Change-Id: Iea788eb81c24dcaceeea35a6b004416caa1cf9c6
2015-09-10 14:00:34 -06:00
Stephen Hines
5f785909f3 Update RS docs for M-related changes.
This includes FP16 and the rs_kernel_context object.

Change-Id: If5574bba85060e2bfe6c4d8f2b3cc1b49827a05a
2015-09-10 11:08:29 -07:00
Alan Viverette
1ebac03cbe am a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView"
* commit 'a5ec056b8331b2560f5c6f9543471884894914f1':
  CalendarView: use theme attribute instead of style on MonthName TextView
2015-09-10 12:19:40 +00:00
Alan Viverette
a5ec056b83 Merge "CalendarView: use theme attribute instead of style on MonthName TextView" 2015-09-10 12:13:28 +00:00
Young-Ho Cha
a3843cfb96 CalendarView: use theme attribute instead of style on MonthName TextView
Change-Id: I0d891ab08e61df7422fb0aea50a4c31196792189
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
2015-09-10 15:11:42 +09:00
Hans Boehm
58c27e3e53 am c0ce6c42: Merge "Reduce risk of memory corruption due to finalization."
* commit 'c0ce6c422cfe089e7a8e209ac924e37bed3ca770':
  Reduce risk of memory corruption due to finalization.
2015-09-09 22:41:42 +00:00
Hans Boehm
c0ce6c422c Merge "Reduce risk of memory corruption due to finalization." 2015-09-09 22:28:42 +00:00
Hans Boehm
ffa84e008c Reduce risk of memory corruption due to finalization.
Many classes in graphics/java and elsewhere deallocate native memory
in a finalizer on the assumption that instance methods can no longer
be called once the finalizer has been called.  This is incorrect if
the object can be used, possibly indirectly, from another finalizer,
possibly one in the application.

This is the initial installment of a patch to cause such post-finalization
uses to at least see a null pointer rather than causing memory corruption
by accessing deallocated native memory. This should make it possible to
identify and fix such finalization ordering issues.

There are more graphics classes that need this treatment, and probably
many more in other subsystems.

This solution is < 100% effective if finalizers can be invoked
concurrently.  We currently promise that they aren't.

(In my opinion, the real cause here is a language spec bug.  But that ship
has sailed.)

Bug: 18178237
Change-Id: I844cf1e0fbb190407389c4f8e8f072752cca6198
2015-09-08 18:27:36 -07:00
Dan Willemsen
03c26b274a am 596fd38a: Merge "Whitelist windows module"
* commit '596fd38af207727d508a63fca39506c90ba29c44':
  Whitelist windows module
2015-09-04 21:48:35 +00:00
Dan Willemsen
596fd38af2 Merge "Whitelist windows module" 2015-09-04 21:36:50 +00:00
Dan Willemsen
8d6f9bf3c8 Whitelist windows module
Bug: 23566667
Change-Id: I030733ffd2b43a0ea74b0fd5f34a0d13ef8dcf7c
2015-09-04 14:22:17 -07:00
Alan Viverette
bc635a2574 am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"
* commit '3d6325460ec19c89c40d2083e8ca89fe53d5575b':
  Update mFillPaint color on GradientDrawable inflation
2015-09-04 12:31:46 +00:00
Alan Viverette
3d6325460e Merge "Update mFillPaint color on GradientDrawable inflation" 2015-09-04 11:51:02 +00:00
Snild Dolkow
a72f59a858 Update mFillPaint color on GradientDrawable inflation
When a GradientDrawable is loaded from scratch, initializeWithState()
is called with mColors == null. This sets mFillPaint's color to
0x00000000 -- transparent. mColors is then properly set in inflate(),
but mFillPaint is not updated there. It will be updated eventually
through a mutate() or ensureValidRect() call, but that's sometimes too
late.

In our case, a wrapping StateListDrawable called getOpacity(), and
since it caches the result, it never got updated.

This doesn't cause any problems on preloaded GradientDrawables, since
the new GradientDrawable created when fetching a preload will call
initializeWithState() in its constructor, fixing the GradientState.

Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79
2015-09-04 10:08:46 +02:00
Yasuhiro Matsuda
10191dd9d2 am 53f1a815: Merge "Remove unnecessary finally blocks for tracing."
* commit '53f1a815b4401f10cd833217143da44ab0408dcc':
  Remove unnecessary finally blocks for tracing.
2015-09-04 02:34:58 +00:00
Yasuhiro Matsuda
53f1a815b4 Merge "Remove unnecessary finally blocks for tracing." 2015-09-04 02:23:31 +00:00
Yasuhiro Matsuda
25878b2888 Remove unnecessary finally blocks for tracing.
BUG: 22207144
Change-Id: I2b15bb7c4055a1ad589b433d4f253868813ab311
2015-09-03 16:27:13 +09:00
Christopher Wiley
80a679c459 am b1db04f3: Merge "aidl: Add end to end test"
* commit 'b1db04f371963cb61bc5df21142a59f77515a62f':
  aidl: Add end to end test
2015-09-03 00:31:52 +00:00
Christopher Wiley
a3b4fb6851 am b14e7b84: Merge "aidl: Remove example test"
* commit 'b14e7b84290fa40221e3f315862dd1f79bf21871':
  aidl: Remove example test
2015-09-03 00:31:45 +00:00
Casey Dahlin
b15623cf1c resolved conflicts for merge of 9483748a to stage-aosp-master
Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d
2015-09-02 14:33:41 -07:00
Casey Dahlin
bad130eed3 am 02bc5488: Merge "Remove RPC interface Type"
* commit '02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
  Remove RPC interface Type
2015-09-02 21:18:46 +00:00
Christopher Wiley
b1db04f371 Merge "aidl: Add end to end test" 2015-09-02 21:10:30 +00:00
Christopher Wiley
b14e7b8429 Merge "aidl: Remove example test" 2015-09-02 21:10:09 +00:00
Casey Dahlin
9483748aea Merge "Delete outdated options tests" 2015-09-02 21:02:02 +00:00
Casey Dahlin
02bc5488c1 Merge "Remove RPC interface Type" 2015-09-02 21:01:33 +00:00
Casey Dahlin
d6b6b80cdb Delete outdated options tests
Bug: 23718807
Test: Re-ran make. Confirmed code was not linked.
Change-Id: If065b9287ed70b9e380281cae42f89bd5f1ffb06
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-09-02 13:34:26 -07:00
Casey Dahlin
ca4543cdba Remove RPC interface Type
AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.

Bug: 23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-09-02 13:34:26 -07:00
Christopher Wiley
5ed76073a4 aidl: Add end to end test
This test sets up an artificial hierarchy of .aidl files, then
checks that the generated code contains a substring that we
know to be correct.  This isn't a very good unittest, but it does
validate that the whole flow works start to finish.

Bug: 23516947
Test: compiles, unit tests pass.

Change-Id: I931b7659731b05440040623e12596669604cef3a
2015-09-02 13:00:09 -07:00
Christopher Wiley
6d57207f37 aidl: Remove example test
We have enough tests demonstrating how to write them.

Bug: 23516947
Change-Id: I966cb6bb2d754db389be8f9b90957ac33cf66639
Test: Unittests pass.
2015-09-02 12:55:07 -07:00
Christopher Wiley
d494b8c0cf am f37947cb: Merge "aidl: Don\'t link librt on Mac"
* commit 'f37947cb1a452b81f7b25cf961763c2ec3db5632':
  aidl: Don't link librt on Mac
2015-09-02 16:34:40 +00:00
Christopher Wiley
f37947cb1a Merge "aidl: Don't link librt on Mac" 2015-09-02 16:23:01 +00:00
Christopher Wiley
1ab54c12e3 aidl: Don't link librt on Mac
This fixes unittest build on Mac.

Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355
2015-09-02 08:59:30 -07:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00