159121 Commits

Author SHA1 Message Date
Narayan Kamath
32ed090f5a Merge "Stop using DATE_FORMAT from settings." 2014-11-24 16:14:33 +00:00
Narayan Kamath
1d84709cf4 Merge "Stop reading Settings.System.DATE_FORMAT." 2014-11-24 16:10:02 +00:00
Narayan Kamath
f91f06a599 Stop reading Settings.System.DATE_FORMAT.
Also, move over DateFormat.getInstance(SHORT) instead of
LocaleData.shortDateFormat4 (which forces 4 digit years).
Based on an analysis of git history, there seems to be no
real motiviation for using 4 digit years.

If anyone in the platform complains loudly, we could look at
using a skeleton pattern instead of just replacing 'y' with 'yy'.

If third party apps are affected, we could add a targetSdkversion
based check and revert to the old behaviour for older targetSdks.

bug: 18388178
bug: 18322220
Change-Id: Ieab2b41691958a2e668d382c5a6b3d9aaf741ed2
2014-11-24 16:05:19 +00:00
Dohyun Lee
adc0d9da86 Enable stencil clipping within clearLayerRegions
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2014-11-24 21:08:15 +09:00
Bernhard Rosenkränzer
57f637279a Add -Wno-unused-parameter to LOCAL_CFLAGS
Some JNI functions ignore the JNI environment and class information, but
still take the parameters -- causing a build failure with clang (and gcc
with -Wextra enabled). Ignore this.

Change-Id: I049fcf65991b19d2416fce105699311803b43cfc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 03:02:03 +01:00
raysb.kim
00a2725683 Only one task within the stack should moveToBack
In case of the last stack of application move to back,
ONLY one stack within stack should move to back.
but stack itseft move to back.

Default bahavior of ActivityManager is that the stack will
go back within stack when the last stack of application move
to back. The stack is managed by DisplayContent of WindowManagerService
should be same but taking one more action that move stack itself.

Change-Id: If394ddf16b0fcda2ae3252e8f3b5336322ef6808
Signed-off-by: Seunghyun Lee <seunghyun85.lee@lge.com>
2014-11-24 09:55:11 +09:00
Bernhard Rosenkränzer
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-23 22:24:32 +01:00
Elliott Hughes
ff4dd15cd0 Merge "We HAVE_LITTLE_ENDIAN." 2014-11-22 07:47:27 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN.
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
2014-11-21 23:36:45 -08:00
Olawale Ogunwale
f1058308c6 Merge "Add window to child window list with correct order" 2014-11-22 02:12:49 +00:00
Chih-hung Hsieh
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00:00
John Reck
ad9387974b Merge "Revert "Frameworks/base: Unused parameters in hwui"" 2014-11-22 00:10:45 +00:00
John Reck
8b59a528b5 Revert "Frameworks/base: Unused parameters in hwui"
This reverts commit 42ddc18d108f789705ad4eb697ce9599ad322507.

Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
2014-11-22 00:10:02 +00:00
Andreas Gampe
d2738eadc1 Merge "Frameworks/base: Unused parameters in hwui" 2014-11-21 21:34:46 +00:00
Alan Viverette
0218970afa Merge "Fix error overwriting when restoring error" 2014-11-21 20:40:30 +00:00
Alan Viverette
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
Chih-hung Hsieh
9ebffb40d8 Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
Should be unnecessary after c/115476.
This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d.

Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
2014-11-21 18:54:15 +00:00
Andreas Gampe
42ddc18d10 Frameworks/base: Unused parameters in hwui
Remove Clang cutout for unused parameters. Fix warnings.

Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.

Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7
2014-11-21 10:39:21 -08:00
Andreas Gampe
2c596a5334 Merge "Frameworks/base: Consistency in core/jni" 2014-11-21 18:18:36 +00:00
Andreas Gampe
ed6b9dff56 Frameworks/base: Consistency in core/jni
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
2014-11-21 10:15:08 -08:00
Andreas Gampe
ed368be792 Merge "Frameworks/base: Wall Werror in media/tests" 2014-11-21 17:39:33 +00:00
Andreas Gampe
e042791e75 Merge "Frameworks/base: Remove unused header" 2014-11-21 17:38:07 +00:00
Andreas Gampe
c1b5483a60 Frameworks/base: Remove unused header
android_nfc.h is used nowhere.

Change-Id: I3009b3eb122674d3fe7ddb201bac18368b78bc02
2014-11-20 16:11:57 -08:00
Chih-hung Hsieh
f926d71b8e Merge "Fix format strings mismatching the parameters passed to them" 2014-11-20 23:50:04 +00:00
Bernhard Rosenkränzer
09993f768b Fix format strings mismatching the parameters passed to them
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-20 15:24:46 -08:00
Dan Albert
8e357bf541 Merge "Fix clang warnings in core/jni." 2014-11-20 22:58:47 +00:00
Dan Albert
0c437fd3a7 Merge "Add appropriate casts for char16_t." 2014-11-20 22:19:38 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
2014-11-20 11:47:40 -08:00
Dan Albert
46d8444631 Fix clang warnings in core/jni.
There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(

Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
2014-11-20 11:47:00 -08:00
Yohann Roussel
79b4ee8e97 Add tests about annotations and enum.
For reproduction of https://code.google.com/p/android/issues/detail?id=78144

Bug: 18385117

Change-Id: I23be53a0ae481a501d13adc8abf518ac664a772f
2014-11-20 15:17:43 +01:00
Narayan Kamath
9f285bd60b Merge "Tell installd when boot completes." 2014-11-20 10:47:17 +00:00
tiger_huang
e2a98a7492 Add window to child window list with correct order
The original logic of comparing with mBaseLayer of two child windows
of the same parent was wrong, because the mBaseLayer is always the
same.

After adding two child windows with the same positive sublayer, the
one added later should have greater z-order. The order should be
consistent with WindowManagerService.addAttachedWindowToListLocked()

Change-Id: I789179aee61d141fad86bd24262fabfb1e517e66
2014-11-20 12:00:41 +08:00
Elliott Hughes
ea8ff82212 Merge "Fix and be more explicit about plurals best practices." 2014-11-20 00:19:45 +00:00
Elliott Hughes
1fe7d496db Fix and be more explicit about plurals best practices.
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".

Bug: 18429565
Change-Id: I09eb39ea6986850c3af28cca3052d319e3c97705
2014-11-19 16:18:45 -08:00
Mathieu Chartier
36c7f4b673 Merge "Add zygote space to Dalvik Heap" 2014-11-19 21:58:17 +00:00
Mathieu Chartier
99f628286f Add zygote space to Dalvik Heap
Broken by
https://android-review.googlesource.com/#/c/115446/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

(cherry picked from commit 7fc9176c8a2102fb5be3668404bd15feb6878c89)

Change-Id: I9293e5d3f55ccfb2c93c6aacbf6abc164eacb10b
2014-11-19 13:54:00 -08:00
Ignacio Solla
1228e58e88 Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)" 2014-11-19 21:53:43 +00:00
Ignacio Solla
e7cf27b664 [WebView] Interface to access hidden APIs. (DO NOT MERGE)
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0cf0387df20c2c602857ada1e5abfdd6
 and 53f256948724b8d4009d8a8a47da96a06402f9a2)
2014-11-19 21:47:13 +00:00
Andreas Gampe
c3507d1098 Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni" 2014-11-19 18:16:19 +00:00
Chih-hung Hsieh
b1e4e89b86 Merge "Fix incorrect usage of bool" 2014-11-19 18:01:20 +00:00
Jeff Sharkey
4060217905 Merge "Default icon is shown after uninstalling updated priv-app" 2014-11-19 17:40:02 +00:00
Andreas Gampe
987f79f60b Frameworks/base: Replace LOG_FATAL_IF in core/jni
Do not use LOG_FATAL_IF in JNI setup. This is one-time on startup
and important enough to always check.

Add a header with common helper definitions. Move to inlined functions
instead of macros to clean up the code.

Change-Id: Ib12d0eed61b110c45d748e80ec36c563e9dec7e5
2014-11-19 09:21:12 -08:00
Narayan Kamath
343f478241 Tell installd when boot completes.
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

(cherry picked from commit 76a748e62f354c799342044f724e1f4b80121837)

Change-Id: I2364c05837ac04d428b5a34ab1802964a11d2df4
2014-11-19 14:41:08 +00:00
tiger_huang
c58d756f87 Prevent wrong system ui visibility callback after the user swipe
If we return vis without clearing clearable flags, it will be set to
IStatusBarService in updateSystemUiVisibilityLw(), and then be
callbacked to WMS via statusBarVisibilityChanged(), and then be
dispatched to the client; which is wrong because WMS should dispatch
the new value to the client, not the old one.

https://code.google.com/p/android/issues/detail?id=79991

Change-Id: I2a06d1fbe66e854e639d86a39784f8c6a3303674
2014-11-19 11:53:39 +00:00
Akira Numata
e50bc6fd29 Default icon is shown after uninstalling updated priv-app
If updated pre-installed app is moved from "/system/app" to
"/system/priv-app" at FOTA, PackageManager does not update its
resource path correctly. This patch fixes it.

Change-Id: Iac793bcb8fd7c5bfbafd1876640b534c6da5dddf
2014-11-19 09:57:19 +09:00
Adam Powell
d843564331 Merge "PopupWindow: fix typo in doc comment" 2014-11-18 23:32:57 +00:00
Andreas Gampe
12c172a801 Merge "Frameworks/base: Compiled-classes support" 2014-11-18 22:49:13 +00:00
Andreas Gampe
f59fb28cb8 Frameworks/base: Compiled-classes support
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571

(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)

Change-Id: I2510316381f2661166af24d7e14b013f4e045556
2014-11-18 14:48:31 -08:00
Andreas Gampe
8462913d0c Merge "Frameworks/base: Ignore unknown pragmas in core/jni" 2014-11-18 22:39:30 +00:00
Andreas Gampe
26109fd328 Frameworks/base: Ignore unknown pragmas in core/jni
Preparation for a switch to Clang.

Change-Id: Iabe1d79474a617bec66dd4bf58002b1a372f6d23
2014-11-18 14:38:00 -08:00