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

4308 Commits

Author SHA1 Message Date
Chih-hung Hsieh
b8089abb99 am d7266264: am 56090472: Merge "Use standard initializers" 
* commit 'd72662649e9a9b8ef51119fae58a17ab3deeb554':
  Use standard initializers
 2014-11-18 20:21:30 +00:00
Chih-hung Hsieh
d72662649e am 56090472: Merge "Use standard initializers" 
* commit '56090472230dc56acc203589f3efcb65579fb54d':
  Use standard initializers
 2014-11-18 18:13:04 +00:00
Chih-hung Hsieh
5609047223 Merge "Use standard initializers" 2014-11-18 18:04:29 +00:00
Bernhard Rosenkränzer
452efb218e Use standard initializers 
Use standard initializers rather than GNU extension initializers to
prevent clang from spewing warnings about nonstandard code.

BUG: 18193625

Change-Id: I19bf7fe9c401534af82d5a08e68fbd486bec8351
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 23:30:44 +00:00
Chih-hung Hsieh
af71ab2c7f am 804e2937: am 1615731d: Merge "Fix check for PROC_QUOTES mode" 
* commit '804e2937e16943609c46ca3fe0cdbefab29f4210':
  Fix check for PROC_QUOTES mode
 2014-11-17 23:07:25 +00:00
Chih-hung Hsieh
804e2937e1 am 1615731d: Merge "Fix check for PROC_QUOTES mode" 
* commit '1615731d18b042d4c69dad3169166cce7a2a9fcf':
  Fix check for PROC_QUOTES mode
 2014-11-17 22:59:05 +00:00
Chih-hung Hsieh
1615731d18 Merge "Fix check for PROC_QUOTES mode" 2014-11-17 22:38:55 +00:00
Bernhard Rosenkränzer
3b1e22e289 Fix check for PROC_QUOTES mode 
Since != has priority over &, the "if ((mode&PROC_QUOTES != 0))" check
is the same as "if (mode & (PROC_QUOTES!=0))" - not what the code
intends.

Change-Id: I14840a887f26c28f2bd0aee8704c79cf353164ad
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 22:30:56 +01:00
Adam Lesinski
d97237071d am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge 
* commit '11bdd5b10b5f921b657283fa94463263171218d5':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 20:27:32 +00:00
Adam Lesinski
11bdd5b10b Merge commit '06d8b7b8' into manualmerge 
Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
 2014-11-17 12:17:16 -08:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
Ying Wang
753eda5b39 Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" 2014-11-17 19:35:40 +00:00
Ying Wang
41505b56e0 am e77a9066: am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev 
* commit 'e77a906653739c5d0b67bbffa5566956fddd8cc9':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
 2014-11-17 19:32:14 +00:00
Ying Wang
e77a906653 am bb637938: am 7f5fbe9e: Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev 
* commit 'bb637938d476e7927d2eed53255a3be7f5dd2d19':
  Frameworks/base: AndroidRuntime standalone preloaded-classes
 2014-11-17 19:23:25 +00:00
Andreas Gampe
65ff8ee134 Frameworks/base: AndroidRuntime standalone preloaded-classes 
Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.

Bug: 18305157

(cherry picked from commit 995c62d6abd4b7080e52a60d1bffa32ae4a798a3)

Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
 2014-11-17 10:57:57 -08:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
Ying Wang
7f5fbe9e11 Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev 2014-11-17 18:14:25 +00:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00
John Reck
17762bb9c7 am 64b5e00a: am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit '64b5e00aaa53dbca59e8b997184bf479f68915eb':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:31:12 +00:00
John Reck
64b5e00aaa am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'ff5978988abceeb0f2c8324a9ab66b7c958edd34':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:27:43 +00:00
John Reck
b3ec64e100 Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 2014-11-17 15:19:23 +00:00
Andreas Gampe
995c62d6ab Frameworks/base: AndroidRuntime standalone preloaded-classes 
Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.

Bug: 18305157
Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
 2014-11-14 16:15:17 -08:00
Marco Nelissen
dce97407dc Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
 2014-11-14 14:02:09 -08:00
Nick Kralevich
bfd5760da2 Merge "Fix build" 2014-11-14 21:52:18 +00:00
Eric Laurent
4a109798bf am 8c8b9195: am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev automerge: 5ff6057 
* commit '8c8b9195643d33faff186dea535b18af0ee93e09':
  AudioRecorder read buffer overflow
 2014-11-14 21:50:24 +00:00
Nick Kralevich
660538f82a Fix build 
frameworks/base/core/jni/android_text_StaticLayout.cpp:358:43: error: overflow in implicit constant conversion [-Werror=overflow]
                               firstTabIndex = SIZE_MAX;
                                           ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:367:43: error: overflow in implicit constant conversion [-Werror=overflow]
                               firstTabIndex = SIZE_MAX;
                                           ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:391:39: error: overflow in implicit constant conversion [-Werror=overflow]
                           firstTabIndex = SIZE_MAX;
                                       ^
  cc1plus: all warnings being treated as errors
  make: *** [out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1

Change-Id: I2364f697588c8657ba5f2d15cf1d60a174655613
 2014-11-14 13:43:31 -08:00
Eric Laurent
8c8b919564 am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 
automerge: 5ff6057

* commit '5ff6057bd32737c808f978eae6c100ffa24148d1':
  AudioRecorder read buffer overflow
 2014-11-14 21:41:15 +00:00
Nick Kralevich
cf670bc714 fix build 
frameworks/base/core/jni/android_text_StaticLayout.cpp: In member function 'int android::OptimizingLineBreaker::desperateBreak(int, int, float, float*, float*, bool*) const':
  frameworks/base/core/jni/android_text_StaticLayout.cpp:263:19: error: variable 'breakWidth' set but not used [-Werror=unused-but-set-variable]
               float breakWidth, breakPrintedWidth;
                   ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp:263:31: error: variable 'breakPrintedWidth' set but not used [-Werror=unused-but-set-variable]
               float breakWidth, breakPrintedWidth;
                               ^
  frameworks/base/core/jni/android_text_StaticLayout.cpp: In function 'jint android::nComputeLineBreaks(JNIEnv*, jclass, jstring, jcharArray, jfloatArray, jint, jfloat, jint, jfloat, jintArray, jint, jboolean, jobject, jintArray, jfloatArray, jbooleanArray, jint)':
  frameworks/base/core/jni/android_text_StaticLayout.cpp:539:15: error: unused variable 'ret' [-Werror=unused-variable]
       jintArray ret;
               ^
  cc1plus: all warnings being treated as errors
  make: *** [out/target/product/hammerhead/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_text_StaticLayout.o] Error 1
  make: *** Waiting for unfinished jobs....

Change-Id: Id2b4c35bd1bc6747cc3d5cf94e3857d9118f5c21
 2014-11-14 12:41:22 -08:00
Andreas Gampe
6d6f049008 am e64565e0: Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp 
* commit 'e64565e0a503397f0d59fed0e6aaef23807782b4':
  Frameworks/base: Mask pdfium warning
 2014-11-14 19:17:54 +00:00
Andreas Gampe
ed5d5fb434 am 035a7b02: am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '035a7b0235835e856f39623fc571668e2d6048da':
  Frameworks/base: Wall Werror in core/jni
 2014-11-14 19:15:42 +00:00
Andreas Gampe
362c4ba02a am f8eac973: am f0044947: Merge "Frameworks/base: New GL bindings" 
* commit 'f8eac973afec3f2390277ff8c0bcb447addad18f':
  Frameworks/base: New GL bindings
 2014-11-14 00:44:40 +00:00
John Reck
b35c9602cf Wire up surface width/height to lockHardwareCanvas 
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
 2014-11-13 16:15:08 -08:00
Andreas Gampe
f4e341d99c Frameworks/base: Mask pdfium warning 
Mask out warnings from external/.

Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
 2014-11-13 16:07:13 -08:00
Andreas Gampe
035a7b0235 am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni" 
* commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4':
  Frameworks/base: Wall Werror in core/jni
 2014-11-13 23:35:22 +00:00
Andreas Gampe
0f0b491966 Frameworks/base: Wall Werror in core/jni 
Turn on -Wall -Werror in core/jni. Fix warnings.

Clang TODO: For GCC we need to turn off Wunused-but-set-variable in
the GL bindings. However, Clang doesn't have that warning and thus
complains about an unknown pragma. It is necessary to make the
pragma #ifdef-ed on the compiler being GCC.

Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
 2014-11-13 15:20:37 -08:00
Jon Eklund
283a9d9e15 AudioRecorder read buffer overflow 
Since function was changed from byte-native to short-native,
it's no longer necessary to multiply offset by sizeof(short).

Bug 18367580

Change-Id: I669d860334ba40e46c04e534d7008b9e2401d8cd
 2014-11-13 10:15:58 -08:00
Andreas Gampe
f8eac973af am f0044947: Merge "Frameworks/base: New GL bindings" 
* commit 'f0044947a7199278d529c9b0b53cde089851ce23':
  Frameworks/base: New GL bindings
 2014-11-13 17:51:41 +00:00
Rob Tsuk
95e5a82e1d Merge "Add a way to override Xfermode" 2014-11-13 17:17:06 +00:00
Dianne Hackborn
ebb526e976 am 7437ec8e: am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count. 
* commit '7437ec8e1d01de948b1baf33c1f3f73f263a40c7':
  Add reporting of Parcel memory/count.
 2014-11-13 00:00:10 +00:00
Eric Laurent
4a0e59dbd4 am 33fc2370: am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
* commit '33fc23701a081c2086fc5435e7913f775caabdfc':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:59:35 +00:00
Rob Tsuk
c495e611b9 Add a way to override Xfermode 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Bug: 18226391
Change-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c
 2014-11-12 15:49:45 -08:00
Dianne Hackborn
7437ec8e1d am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count. 
* commit 'caf3cddd5bff11a20e72e7df54b826e33d2fe6a9':
  Add reporting of Parcel memory/count.
 2014-11-12 23:49:25 +00:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 23:49:19 +00:00
Eric Laurent
33fc23701a am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
* commit 'ac598888e3efbb6fda910ac8bef3bc92811309ba':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:40:05 +00:00
Andreas Gampe
bfe6333c3c Frameworks/base: New GL bindings 
Generated new bindings after glgen update.

Change-Id: I96f2e3eee99f1e12ad84aa10e8f7826a905e909c
 2014-11-12 14:12:45 -08:00
Dianne Hackborn
fabb70b2ef Add reporting of Parcel memory/count. 
Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
 2014-11-12 21:56:30 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Dan Albert
45670c1dc5 am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
  Move frameworks/base over to libc++.
 2014-11-12 21:31:33 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
 2014-11-12 12:25:24 -08:00