Elliott Hughes
7c4ef052d5
Merge "Fix for CharSequenceCreator test case"
2014-11-12 01:38:58 +00:00
Andreas Gampe
db38706603
Merge "Frameworks/base: Fix FingerprintManager JNI"
2014-11-11 23:47:53 +00:00
Andreas Gampe
316e75fee6
Merge "Frameworks/base: Wall Werror in rs"
2014-11-11 23:47:25 +00:00
Adam Lesinski
8aa93764ea
Merge "Fixing NULL pointer access causing segmentation fault in aapt"
2014-11-11 19:36:20 +00:00
Adam Lesinski
24c16b7e4c
Merge "Frameworks/base: Fix AssetManager JNI"
2014-11-11 19:35:28 +00:00
Andreas Gampe
7c8201b61f
Frameworks/base: Fix FingerprintManager JNI
...
Register the right method.
Change-Id: I0806c2fa8f29ddef75caaf94092f72e644ae6d06
2014-11-11 00:18:55 -08:00
Andreas Gampe
328126190b
Frameworks/base: Fix AssetManager JNI
...
Register the right method.
Change-Id: Ib5f5c531b4c5863eed04fe3b13f8c2662055fa5e
2014-11-11 00:16:00 -08:00
Andreas Gampe
71f83672f2
Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"
2014-11-11 05:02:32 +00:00
Andreas Gampe
ba823cee8b
Frameworks/base: Mask Skia warning in GraphicsJNI
...
Do not allow unused-parameter warnings from Skia includes.
Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
2014-11-10 21:01:06 -08:00
Andreas Gampe
67333928bf
Frameworks/base: Wall Werror in rs
...
Turn on -Wall -Werror in rs/. Fix warnings.
Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
2014-11-10 20:35:59 -08:00
Andreas Gampe
c6e992a1bc
Merge "Frameworks/base: Wall Werror in libs/input"
2014-11-11 02:38:08 +00:00
Andreas Gampe
1d03b816fe
Merge "Frameworks/base: Wall Werror in libs/hwui"
2014-11-11 02:37:46 +00:00
Andreas Gampe
6957369d13
Merge "Frameworks/base: Wall Werror in media/jni"
2014-11-11 02:30:00 +00:00
Andreas Gampe
5a15d0d31b
Frameworks/base: Wall Werror in media/jni
...
Turn on -Wall -Werror in media/jni. Fix warnings.
Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
2014-11-10 18:19:40 -08:00
Andreas Gampe
538b00f6e5
Merge "Frameworks/base: Wall Werror in media/mca"
2014-11-11 02:07:27 +00:00
Andreas Gampe
ce23ecffea
Merge "Frameworks/base: Wall Werror in native/graphics"
2014-11-11 01:56:11 +00:00
Andreas Gampe
827909fca3
Merge "Frameworks/base: Wall Werror in drm"
2014-11-11 01:53:36 +00:00
Andreas Gampe
e736870534
Merge "Frameworks/base: Wall Werror in native/android"
2014-11-11 01:51:29 +00:00
Andreas Gampe
e5160e7e59
Frameworks/base: Wall Werror in media/mca
...
Turn on -Wall -Werror in media/mca. Fix warnings.
Change-Id: I2a43df1d0639babe240b91942a5ea3f8babdef93
2014-11-10 17:49:02 -08:00
Andreas Gampe
318365e869
Frameworks/base: Wall Werror in drm
...
Turn on -Wall -Werror in drm/jni. Fix warnings.
Change-Id: If24fec45fbb737af593ddadfa473548dfa583e0b
2014-11-10 17:23:02 -08:00
Andreas Gampe
cad87d78da
Frameworks/base: Wall Werror in native/graphics
...
Turn on -Wall -Werror in native/graphics. Mask skia warnings.
Change-Id: Ia671e91348296ace84d9a24b3c6c025fa889bead
2014-11-10 17:14:31 -08:00
Yabin Cui
1521303f0e
Merge "kill OS_CASE_SENSITIVE"
2014-11-11 01:09:31 +00:00
Andreas Gampe
d2361f2f1f
Frameworks/base: Wall Werror in native/android
...
Turn on -Wall -Werror in native/android.
Change-Id: I28bab9ebd2fe3f6935878816773a04531e26450f
2014-11-10 16:48:58 -08:00
Yabin Cui
a31318620b
Merge "kill HAVE_INOTIFY"
2014-11-11 00:10:12 +00:00
Yabin Cui
fb8e2b1745
kill OS_CASE_SENSITIVE
...
Bug: 18314594
Change-Id: Ib11b45d2597b2576bc7df2d0167ce1bbd1449523
2014-11-10 16:08:50 -08:00
Yabin Cui
20a9cf4fe4
kill HAVE_INOTIFY
...
Bug: 18314841
Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
2014-11-10 16:01:10 -08:00
Andreas Gampe
1e19674107
Frameworks/base: Wall Werror in libs/hwui
...
Turn on -Wall -Werror in libs/hwui. Fix errors.
Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
2014-11-10 15:58:04 -08:00
Andreas Gampe
6b83b76dd1
Frameworks/base: Wall Werror in libs/input
...
Enable -Wall -Werror in libs/input. Mask warnings from Skia.
Change-Id: I0deeffde07fcf3a09eadec2852e9bf5666b55ee8
2014-11-10 15:55:11 -08:00
Yabin Cui
a9235301ad
Merge "kill HAVE_SCHED_SETSCHEDULER"
2014-11-10 22:12:28 +00:00
Yabin Cui
65b4a68669
kill HAVE_SCHED_SETSCHEDULER
...
Bug: 18300670
Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
2014-11-10 12:21:57 -08:00
Elliott Hughes
c34e63598e
Merge "bionic's struct stat is now POSIX-compliant."
2014-11-10 18:55:30 +00:00
Elliott Hughes
4da9dc5a62
bionic's struct stat is now POSIX-compliant.
...
One less hack needed...
Bug: 18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
2014-11-10 10:48:25 -08:00
Elliott Hughes
5cce4c752e
Merge "Fix memory leak where we close the descriptor instead of the file."
2014-11-10 16:46:44 +00:00
Derek Sollenberger
c793fcb026
Fix memory leak where we close the descriptor instead of the file.
...
(cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.)
bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
2014-11-10 08:44:46 -08:00
Andreas Gampe
189bf05616
Merge "Frameworks/base: Fix more warnings"
2014-11-09 00:37:42 +00:00
Andreas Gampe
25df5fba3a
Frameworks/base: Fix more warnings
...
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.
Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
2014-11-07 22:24:57 -08:00
Andreas Gampe
9ade8c1ad5
Merge "Frameworks/base: Wall Werror in libs/storage"
2014-11-08 01:14:59 +00:00
Andreas Gampe
f89a2fdacb
Merge "Frameworks/base: Fix two warnings in cmds"
2014-11-08 01:10:50 +00:00
Andreas Gampe
ebee1379ea
Frameworks/base: Fix two warnings in cmds
...
Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
2014-11-08 01:04:45 +00:00
Andreas Gampe
487ae9b8dc
Merge "Frameworks/base: Wall Werror in libs/androidfw"
2014-11-07 22:35:42 +00:00
Andreas Gampe
e80c01e8d1
Merge "Frameworks/base: Turn on -Wall -Werror in cmds"
2014-11-07 22:35:32 +00:00
Andreas Gampe
cfedceb8c1
Frameworks/base: Turn on -Wall -Werror in cmds
...
Fix small warnings, turn on -Wall -Werror.
Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
2014-11-07 14:33:51 -08:00
Andreas Gampe
2204f0bf56
Frameworks/base: Wall Werror in libs/androidfw
...
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.
Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
2014-11-07 13:35:05 -08:00
Jörgen Ekström
da44fe0e1f
Fixing NULL pointer access causing segmentation fault in aapt
...
In cases where resource packages are generated which does
not have public resources for all resource types - NULL
pointers sneaks into the mOrderedConfigs vector causing
the aapt tool to crash. The solution in this fix simply
ignores the NULL elements when later processing the sorted
vector.
The NULL elements are inserted during applyPublicEntryOrder
function call
Change-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59
2014-11-07 13:41:06 +00:00
Mattias Petersson
fc2bd335d1
Fix for CharSequenceCreator test case
...
The test case testCharSequenceCreator() in TextUtilsTest fails
because the data position is not reset before calling
createFromParcel().
Change-Id: I6d5cc093ff65019ab0d2191bb0bd9c10ae49612b
2014-11-07 12:27:28 +00:00
Dan Albert
59701b9ba5
resolved conflicts for merge of 97014933 to stage-aosp-master
...
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367
2014-11-05 11:29:34 -08:00
Dan Albert
97014933f0
Merge "Fix a wonderful copy/paste time bomb."
2014-11-05 18:50:10 +00:00
Kenny Root
d00ced983e
am b0cb0734: Merge "Track change to Conscrypt"
...
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
Track change to Conscrypt
2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e
Merge "Track change to Conscrypt"
2014-11-03 18:34:00 +00:00
Narayan Kamath
10ac55ba4f
am 5f8099ed: Merge "Add java.util.List import."
...
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
Add java.util.List import.
2014-11-03 16:00:57 +00:00