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

120662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
6290c048e1 am 207cffe9: Merge "Frameworks/base: Fix services/jni warnings" 
* commit '207cffe95a868ea21b74dd54e3ef7821162ce870':
  Frameworks/base: Fix services/jni warnings
 2014-09-29 20:43:15 +00:00
Andreas Gampe
207cffe95a Merge "Frameworks/base: Fix services/jni warnings" 2014-09-29 18:10:26 +00:00
Dan Albert
c20a4bd1a4 am d7baaed8: Merge "Allow AOSP to boot." 
* commit 'd7baaed89e498ad3cf7d9c487d6cae967e562ea4':
  Allow AOSP to boot.
 2014-09-25 19:00:34 +00:00
Dan Albert
d7baaed89e Merge "Allow AOSP to boot." 2014-09-25 18:50:18 +00:00
Dan Albert
e08bd64184 Allow AOSP to boot. 
HAVE_OOM_ADJ is really __linux__, and this code should never be run on
another platform.

Bug: 17641445
Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
 2014-09-25 11:48:11 -07:00
Andreas Gampe
26872f4b9e Frameworks/base: Fix services/jni warnings 
Update code for unused variables.

Ignore warnings generated by pulling in Skia.

Change-Id: I5b33c9b003c90bcabcea0761304c4c99cf5e39ec
 2014-09-25 11:45:07 -07:00
Andreas Gampe
dfdabe3728 am 6f954cf2: Merge "Frameworks/base: Early init native bridge" 
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
  Frameworks/base: Early init native bridge
 2014-09-24 22:10:15 +00:00
Andreas Gampe
6f954cf2eb Merge "Frameworks/base: Early init native bridge" 2014-09-24 21:59:51 +00:00
Bill Yi
6471a6faf5 am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE" 
* commit '1829a4b4d16e1bf37650e34ad6bbc54b68145e15':
  Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
 2014-09-24 16:57:52 +00:00
Bill Yi
1829a4b4d1 Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE" 2014-09-24 16:46:41 +00:00
Bill Yi
519c1f6433 Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE 
Change-Id: I30305a3f821b4f75f5037ebf11b74cfb8f2c8bb2
 2014-09-24 09:17:57 -07:00
jgu21
2eacd06bfb Frameworks/base: Early init native bridge 
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
 2014-09-22 16:04:37 -07:00
Marco Nelissen
c840e31d0e am fa436298: Merge "Broadcast an intent to mediascanner after executing screencap" 
* commit 'fa4362982c4e5d07c158c470f957f6ffd2fc7cc9':
  Broadcast an intent to mediascanner after executing screencap
 2014-09-22 14:44:57 +00:00
Marco Nelissen
fa4362982c Merge "Broadcast an intent to mediascanner after executing screencap" 2014-09-22 14:34:03 +00:00
Christopher Ferris
4cbee7d24d am b7442bbc: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b7442bbc8c27b0643b7235076ee151b8257bf28d':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 01:30:36 +00:00
Christopher Ferris
b7442bbc8c Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 01:23:27 +00:00
Christopher Ferris
9244436a05 Remove MALLOC_LEAK_CHECK references. 
Bug: 17378595
Change-Id: Ie7f8af88c7f3b0c3dc2c2e75bbaaa9e6a81269ae
 2014-09-19 18:08:29 -07:00
Christopher Ferris
7d1138298b am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references." 
* commit 'b6f891c42ffdfdd9adc3811adaf09e09e3db7e84':
  Remove MALLOC_LEAK_CHECK references.
 2014-09-20 00:49:35 +00:00
Christopher Ferris
b6f891c42f Merge "Remove MALLOC_LEAK_CHECK references." 2014-09-20 00:42:22 +00:00
Elliott Hughes
4fec1b4887 am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
  Use constants instead of resources for ellipsis.
 2014-09-19 22:14:48 +00:00
Dan Albert
1a4527ce94 am 799812cd: Merge "Clean up makefile cruft." 
* commit '799812cd6f7f9aa4a87d81dafd273d51ac5ba992':
  Clean up makefile cruft.
 2014-09-19 22:14:42 +00:00
Dan Albert
8791ebf0cd am bcaaebb8: Merge "Clean up test makefiles." 
* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af':
  Clean up test makefiles.
 2014-09-19 22:14:38 +00:00
Ian Rogers
ad64befd25 am 296a712e: Merge "Make a field final." 
* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
  Make a field final.
 2014-09-19 22:14:33 +00:00
Elliott Hughes
600ca140e2 Merge "Use constants instead of resources for ellipsis." 2014-09-19 22:02:45 +00:00
Igor Viarheichyk
ed0daa93e4 Use constants instead of resources for ellipsis. 
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
 2014-09-19 22:02:08 +00:00
Christopher Ferris
8b1dfddf50 Remove MALLOC_LEAK_CHECK references. 
Bug: 17378595
Change-Id: Ib9680ef97dfea6bc20d96f0bed90f4553186315c
 2014-09-19 12:24:59 -07:00
Dan Albert
799812cd6f Merge "Clean up makefile cruft." 2014-09-11 23:26:26 +00:00
Dan Albert
88ba339aef Clean up makefile cruft. 
The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
 2014-09-11 16:21:19 -07:00
Dan Albert
bcaaebb8a8 Merge "Clean up test makefiles." 2014-09-11 23:21:14 +00:00
Dan Albert
715d01aedf Clean up test makefiles. 
The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02
 2014-09-11 15:49:57 -07:00
Ian Rogers
296a712e6b Merge "Make a field final." 2014-09-11 20:01:22 +00:00
Dan Albert
140e58b0f4 am 8bbc5269: Merge "Don\'t check a staticly allocated array for null." 
* commit '8bbc526921a5034ccde19e5ae5ec4d5b0cc180ee':
  Don't check a staticly allocated array for null.
 2014-09-10 17:42:40 +00:00
Dan Albert
8bbc526921 Merge "Don't check a staticly allocated array for null." 2014-09-10 17:31:55 +00:00
Dan Albert
4fb58b0360 Don't check a staticly allocated array for null. 
Change-Id: I5568174f1a9d53078c2169cfd3401e43d88a7643
 2014-09-10 08:17:30 -07:00
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references." 
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
 2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Dan Albert
6c585756b4 am 2ffa4aab: Merge "Use char16_t for char things." 
* commit '2ffa4aabd76353a907ee89a3e0c6f1961237f257':
  Use char16_t for char things.
 2014-09-09 04:37:42 +00:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Dan Albert
de86cf1362 am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." 
* commit '5a6934c07946743e622df52ba1155d97129b37f0':
  Don't pollute the namespace for two uses.
 2014-09-09 04:23:57 +00:00
Dan Albert
5a6934c079 Merge "Don't pollute the namespace for two uses." 2014-09-09 04:15:29 +00:00
Dan Albert
00fe3544f6 am 294ce05e: Merge "Make string literal concatenation play nice with C++11." 
* commit '294ce05e23a96353c8ddf934428bc60d1395b9a5':
  Make string literal concatenation play nice with C++11.
 2014-09-09 04:06:56 +00:00
Dan Albert
294ce05e23 Merge "Make string literal concatenation play nice with C++11." 2014-09-09 03:58:58 +00:00
Dan Albert
1c6c7573e9 Don't pollute the namespace for two uses. 
Clang complains about ambiguity between std::hash and ::hash (locally
defined). There's no need to pull in the whole namespace for two uses of
std::map anyway.

Change-Id: Icbaa7ebbaad05999988784ad34662c721fb12b29
 2014-09-08 18:44:12 -07:00
Dan Albert
be23d47d1c Make string literal concatenation play nice with C++11. 
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.

Change-Id: I24fbe1fda483db4a8c606e80dbe17430ad070dc2
 2014-09-08 18:38:35 -07:00
Dan Albert
a8995adc2b Don't check for null references. 
The address of a reference will never be null in well formed C++ code.
The function returning the value being checked simply returns a
dereferenced pointer (which is just going to segfault if it is null!).

Change-Id: I3a4eb6adfc003c63ebf21b81d46088d52154d99d
 2014-09-08 18:34:29 -07:00
Dan Albert
f348c15ecf Use char16_t for char things. 
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
 2014-09-08 18:30:08 -07:00
Elliott Hughes
2008cff73b am ab94a167: Merge "Small documentation fixes across many files." 
* commit 'ab94a1676e6280f1b6d83e0f8b02849ff62faf4f':
  Small documentation fixes across many files.
 2014-09-08 18:51:22 +00:00
Elliott Hughes
ab94a1676e Merge "Small documentation fixes across many files." 2014-09-08 18:44:14 +00:00
Christopher Ferris
7c931e2e4b am f4eaaadb: Merge "Fix use of %llx for sscanf 64 bit values." 
* commit 'f4eaaadb8cb0e2ff8d1704827883b5a62173311d':
  Fix use of %llx for sscanf 64 bit values.
 2014-09-06 17:02:41 +00:00
Christopher Ferris
f4eaaadb8c Merge "Fix use of %llx for sscanf 64 bit values." 2014-09-06 16:55:50 +00:00