205168 Commits

Author SHA1 Message Date
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
Christopher Wiley
96343073d6 am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"
* commit 'dd80a6cf37799b41ae07c60137d312c5ea2db961':
  aidl: Stop using Bionic's test main
2015-09-01 20:01:30 +00:00
Christopher Wiley
dd80a6cf37 Merge "aidl: Stop using Bionic's test main" 2015-09-01 19:46:21 +00:00
Christopher Wiley
1006bfe09d aidl: Stop using Bionic's test main
This allows us to build unittests on Mac, where Bionic's test main
does not build.

Change-Id: I59c805d233498bb67575f2e5f7049341f70ce55c
2015-09-01 12:40:15 -07:00
Christopher Wiley
c8e4af65af am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library"
* commit '722bf5c7dec37265021c17d35b0b078776699f97':
  aidl: Separate aidl logic into its own static library
2015-09-01 18:49:12 +00:00
Christopher Wiley
722bf5c7de Merge "aidl: Separate aidl logic into its own static library" 2015-09-01 18:34:32 +00:00
Christopher Wiley
cf4716473d am 267cb88f: Merge "Set up aidl for gtest"
* commit '267cb88f4d4adb2cdddd9b29eb8fce7104507114':
  Set up aidl for gtest
2015-09-01 18:20:19 +00:00
Christopher Wiley
a25d35106e aidl: Separate aidl logic into its own static library
Compile aidl's logic into a static library that can be
linked against both the unittest binary and the executable. Validate
that this is working by writing a basic unittest against options
parsing.

Provide default values for Options struct members.  These were
previously taking on values according to the the bits in the memory
allocated to hold them for preprocessed inputs.

Bug: 23516947
Change-Id: Ib57cd7f473995f7851d788deac39f9c4d9018e8f
Test: compiles and unittests pass
2015-09-01 11:15:31 -07:00
Christopher Wiley
267cb88f4d Merge "Set up aidl for gtest" 2015-09-01 18:11:41 +00:00
Nick Kralevich
712205bac0 am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"."
* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".
2015-09-01 16:37:59 +00:00
Christopher Wiley
26627d7011 am 4d6cb77a: Merge "Tighten up compiler flags for aidl"
* commit '4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
  Tighten up compiler flags for aidl
2015-09-01 16:37:31 +00:00
Dan Willemsen
13786e281e am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules"
* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules
2015-09-01 16:37:10 +00:00
Christopher Wiley
a6d167256d am a73e0045: Merge "Revert "Tighten up compiler flags for aidl""
* commit 'a73e004516bae61bebe1e308f5b3ee295c1050b2':
  Revert "Tighten up compiler flags for aidl"
2015-09-01 16:37:00 +00:00
Christopher Wiley
f7ea7c7b26 am 1643e97b: Merge "aidl: Pull main() into dedicated file"
* commit '1643e97b330d6c0f47e8643e52b12c6887a89f81':
  aidl: Pull main() into dedicated file
2015-09-01 16:36:52 +00:00
Christopher Wiley
72b1324cb3 am 2b83384f: Merge "Tighten up compiler flags for aidl"
* commit '2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
  Tighten up compiler flags for aidl
2015-09-01 16:36:37 +00:00
Nick Kralevich
9d58692710 Merge "Automatically assign default seinfo labels using the string "default"." 2015-09-01 13:39:10 +00:00
Robert Craig
5e16bc5a14 Automatically assign default seinfo labels using the string "default".
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2015-09-01 05:51:04 -04:00
Christopher Wiley
4d6cb77ad9 Merge "Tighten up compiler flags for aidl" 2015-08-31 20:59:23 +00:00
Christopher Wiley
5b88363ed3 Tighten up compiler flags for aidl
Turn all warnings to errors, with special cases for places where
yacc forces us to be lenient.  Remove one variable with 0 references
elsewhere in the code.

These flags are confined to be clang only because the Windows SDK build
is using an older compiler that does not understand these flags.

Change-Id: I6407bd331c25b8845bde46e9a917bce1d6857bd8
2015-08-31 13:55:46 -07:00