158947 Commits

Author SHA1 Message Date
Alan Viverette
e442e904ae am 47172f53: Merge "Use parseColor instead of getHTMLColor"
* commit '47172f53659e4e98988dab99a4155653b638b1e5':
  Use parseColor instead of getHTMLColor
2014-11-21 20:45:09 +00:00
Alan Viverette
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
Andreas Gampe
3fc5e3cabf am 2c596a53: Merge "Frameworks/base: Consistency in core/jni"
* commit '2c596a533488320444e28bbe37b7032589a0c5dd':
  Frameworks/base: Consistency in core/jni
2014-11-21 18:22:36 +00: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
09910723c5 am ed368be7: Merge "Frameworks/base: Wall Werror in media/tests"
* commit 'ed368be79248d8e0a71c383b2ed6eb93b451810e':
  Frameworks/base: Wall Werror in media/tests
2014-11-21 17:41:31 +00:00
Andreas Gampe
0da1cbaaab am e042791e: Merge "Frameworks/base: Remove unused header"
* commit 'e042791e753d35d7fd60f0a9a2b5764dc8d9afac':
  Frameworks/base: Remove unused header
2014-11-21 17:41:25 +00: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
43b8643e86 am f926d71b: Merge "Fix format strings mismatching the parameters passed to them"
* commit 'f926d71b8ef2790da067550144860705c1a61fe5':
  Fix format strings mismatching the parameters passed to them
2014-11-20 23:53:33 +00: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
8e0cfe7c9e am 8e357bf5: Merge "Fix clang warnings in core/jni."
* commit '8e357bf54173c3f83584c10983392f0d87e0b2b3':
  Fix clang warnings in core/jni.
2014-11-20 23:02:29 +00:00
Dan Albert
8e357bf541 Merge "Fix clang warnings in core/jni." 2014-11-20 22:58:47 +00:00
Ignacio Solla
57ad825546 [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-20 22:29:33 +00:00
Dan Albert
d8c169fedf am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit '0c437fd3a79ba5f9118ec10940a3398665690587':
  Add appropriate casts for char16_t.
2014-11-20 22:25:07 +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
Narayan Kamath
bcb86374dc am 9f285bd6: Merge "Tell installd when boot completes."
* commit '9f285bd60b219b562bc55c7c2a9fae23eae554e5':
  Tell installd when boot completes.
2014-11-20 10:51:26 +00:00
Narayan Kamath
9f285bd60b Merge "Tell installd when boot completes." 2014-11-20 10:47:17 +00:00
Elliott Hughes
ec2d8d0bb8 am ea8ff822: Merge "Fix and be more explicit about plurals best practices."
* commit 'ea8ff822121cde16344ba2db194a5f17283fa740':
  Fix and be more explicit about plurals best practices.
2014-11-20 00:22:37 +00: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
1073f2023e am 36c7f4b6: Merge "Add zygote space to Dalvik Heap"
* commit '36c7f4b67326bad547f16aa6e72140bd839ab28d':
  Add zygote space to Dalvik Heap
2014-11-19 22:04:28 +00:00
Ignacio Solla
c48a7bb12d am 1228e58e: (-s ours) Merge "[WebView] Interface to access hidden APIs. (DO NOT MERGE)"
* commit '1228e58e88ac0ae2abb698ed3f933ac44a8851ee':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
2014-11-19 21:59:37 +00: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
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
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
a58336f6c8 Merge "Use fabsf() rather than abs()" 2014-11-17 22:41:11 +00:00
Chih-hung Hsieh
1615731d18 Merge "Fix check for PROC_QUOTES mode" 2014-11-17 22:38:55 +00:00
Bernhard Rosenkränzer
c44958c786 Use fabsf() rather than abs()
abs() operates on integers -- to check floats accurately, fabsf
should be used.

Change-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-17 23:12:18 +01: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
Bernhard Rosenkränzer
92ddfcfff5 Fix incorrect usage of bool
A bool can't be < 0

Change-Id: Ie94ffadcb38c95214d1105c02610e59b4b2872b2
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-17 22:01:27 +01:00
Ying Wang
753eda5b39 Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" 2014-11-17 19:35:40 +00:00