118000 Commits

Author SHA1 Message Date
Colin Cross
40545f32d3 Merge "frameworks/base: fix errors inside ALOGV" 2014-02-10 22:02:50 +00:00
Narayan Kamath
578d4f5f50 am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
  AArch64: Use long for pointers in RS Java/JNI code
2014-02-10 05:37:18 -08:00
Narayan Kamath
56062983f1 Merge "AArch64: Use long for pointers in RS Java/JNI code" 2014-02-10 13:33:26 +00:00
Colin Cross
d06969518b frameworks/base: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
2014-02-09 21:54:01 -08:00
Christopher Tate
379bb6ed4e am ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit 'ff27e6bc44097485abfde24f396399e5eec9ff6d':
  Use canonical path for /vendor/app
2014-02-07 15:33:17 -08:00
Christopher Tate
ff27e6bc44 Merge "Use canonical path for /vendor/app" 2014-02-07 23:30:24 +00:00
John Spurlock
6691bfd646 am cccae25f: Merge "Example controller app for system ui demo mode."
* commit 'cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
  Example controller app for system ui demo mode.
2014-02-07 13:01:42 -08:00
John Spurlock
cccae25fc7 Merge "Example controller app for system ui demo mode." 2014-02-07 20:58:37 +00:00
John Spurlock
c23929c3a3 Example controller app for system ui demo mode.
Demo mode is protected behind a system setting.  To enable:
$ adb shell settings put global sysui_demo_allowed 1

Change-Id: I2248e27a253bf9eac176e8be9153a2b147cefa40
2014-02-07 14:47:47 -05:00
Jean-Luc Brouillet
8067c9ec87 am 11e6cabc: Merge "Fix a typo."
* commit '11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d':
  Fix a typo.
2014-02-07 11:11:28 -08:00
Ashok Bhat
e9bea2a182 Fix TinyHashMap to use generic hash_type instead of hash_t
TinyHashMap used hash_t(key) to generate hashcode. This
would not work for 64-bit pointers as hash_t is declared as
an uint32_t.

Replaced the hash_t(key) call to more generic android::hash_type(key).
This function is a template function declared in TypeHelpers.h and
has a version available for all data types including pointers.

Change-Id: I612cf18b49ca7c30b63f9d6938df68fed7d80d08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-07 19:10:04 +00:00
Jean-Luc Brouillet
11e6cabc66 Merge "Fix a typo." 2014-02-07 19:08:36 +00:00
Jean-Luc Brouillet
d60799ec84 Fix a typo.
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
2014-02-07 11:04:26 -08:00
Ashok Bhat
0d552f7d8b Use long to store pointers in ConsumerIrService
Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-07 18:12:23 +00:00
Ashok Bhat
d2507a2f3c Fix in MediaMuxer's JNI code
android_media_MediaMuxer_native_setup should return jlong. It was
incorrectly returning jint.

Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-07 18:10:22 +00:00
Dan Sandler
6b1f3acdf0 am 6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '6ea720bacb805e88fc3b8634bbd9dc7fa918beaa':
  Make sure to turn off led after pulse()
2014-02-07 08:02:15 -08:00
Dan Sandler
6ea720bacb Merge "Make sure to turn off led after pulse()" 2014-02-07 15:59:08 +00:00
Stephen Smalley
d8fa586099 Convert all selinux_android_restorecon and _setfilecon calls to new API.
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-07 09:36:25 -05:00
Tim Murray
67cc2d033e Add hidden minor version ID for support lib workarounds.
Change-Id: I7940e32c78caaab351fb28d92e5fadbea6292b27
2014-02-06 17:07:05 -08:00
Dave Platt
89d4c897a0 Finish fixing Zygote descriptor leakage problem
In order to prevent Zygote descriptors from leaking into the child
environment, they should be closed by the forked-off child process
before the child switches to the application UID.  These changes close
the descriptors via dup2(), substituting a descriptor open to
/dev/null in their place; this allows the Zygote Java code to close
the FileDescriptor objects cleanly.

This is a multi-project change: dalvik, art, libcore, frameworks/base,
and external/sepolicy are affected.  The CLs need to be approved
together, lest the build break or the software fail to boot.

Round 2: indent change

Bug: 12114500
Change-Id: I090402136a8a8b7d6aad6eb153026e85d7cf6ad3
2014-02-06 13:24:38 -08:00
Ashok Bhat
a3850d8f8f AArch64: Use long for pointers in SurfaceSession class
For storing pointers, long is used in SurfaceSession class,
as native pointers can be 64-bit.

Change-Id: I1535a488dfffaddd20e3beac57e558035d715cbf
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-06 16:57:49 +00:00
Chris Craik
0ec3ca6e08 am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '449273e2d575041ffe1a5d435666d36923de888b':
  Fix for positioning of glyphs within a bitmap
2014-02-05 13:40:22 -08:00
Chris Craik
449273e2d5 Merge "Fix for positioning of glyphs within a bitmap" 2014-02-05 21:36:42 +00:00
Ashok Bhat
0e0c0885ae AArch64: Use long for pointers in RS Java/JNI code
Changes include
[x] Some JNI functions, with return type jlong, casts
    pointer to jint before returning it. This has been fixed.

[x] Minor JNI function prototype changes where
    formal paramter type has been changed to a JNI
    type (int to jint for example).

[x] long is used for ScriptC, Sampler, Font, ProgramStore
    handles as they can be 64-bit.

[x] A new hidden constructor ScriptC(long, RenderScript)
    has been added. This should eventually replace public
    API method ScriptC(int, RenderScript).

[x] Font and FileA3D use getNativeAsset instead of getAssetInt
    to get Asset Handles. The getAssetInt method will be
    deprecated in favor of getNativeAsset, as the former does
    not support 64-bit.

[x] rsnPathCreate method accepts loop as an int. This should
    be long as the underlying RS function assumes this to be
    a pointer.

Change-Id: I919d857e5933febe63966049da83de9f9adee6f5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-05 11:26:38 +00:00
Stephen Hines
eadd69413a am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."
* commit 'bc80e40b160596c262fee0ee4df4b9f15cc14e89':
  Add message to RS docs about application vs. library packaging.
2014-02-04 17:57:11 -08:00
Stephen Hines
bc80e40b16 Merge "Add message to RS docs about application vs. library packaging." 2014-02-05 01:52:32 +00:00
Tim Murray
6ceac9f099 am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit 'f5294ed57cf388973a1db29b062b1577966f90d1':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
2014-02-03 14:41:42 -08:00
Tim Murray
b1bec0d916 am 3fb6feac: Merge "Check that bound allocations are 1D"
* commit '3fb6feacc62e1021c705b53d46e915ecf50582d2':
  Check that bound allocations are 1D
2014-02-03 14:41:39 -08:00
Tim Murray
67d9e0be8e am 0cc37f4c: Merge "Fix debug context."
* commit '0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
  Fix debug context.
2014-02-03 14:41:30 -08:00
Tim Murray
42e4aee598 am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
  Enable asynchronous destruction of BaseObjs.
2014-02-03 14:41:27 -08:00
Tim Murray
42955bab2a am d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit 'd8b4dd9555e987df92206562061080b327598f41':
  Fix most logging macros for context pointers.
2014-02-03 14:41:24 -08:00
Tim Murray
d39e19eb8a am 351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '351879df3aff02987a6f4c4485bf004a96fcb150':
  Fix getBytesSize for YUV allocations.
2014-02-03 14:41:21 -08:00
Tim Murray
16e9362e5f am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
* commit '8fced3174ad45e5d618f28c82d69bd21261f6108':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
2014-02-03 14:41:17 -08:00
Tim Murray
8df3ea6699 am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit 'b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
  Convert Java/JNI to 64-bit, part 2.
2014-02-03 14:41:14 -08:00
Tim Murray
72d637e297 am e22e268e: Merge changes If93a5d78,I1957f7ac
* commit 'e22e268e6d158f37173b1bce37a5614daabcf18c':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
2014-02-03 14:41:11 -08:00
Tim Murray
bccee732b5 am 61eb6b55: Merge "Use Object + type in place of specific array"
* commit '61eb6b55c6b4db14e025240fc754e1314f57bd00':
  Use Object + type in place of specific array
2014-02-03 14:41:08 -08:00
Tim Murray
6991488250 am e559d7ee: Merge "Utility API for creating types."
* commit 'e559d7ee53a69502c9aef8764bb055ed2d1adb64':
  Utility API for creating types.
2014-02-03 14:41:05 -08:00
Tim Murray
271c3b7499 am b1c1518e: Merge "Remove old hidden API."
* commit 'b1c1518ef1e89fb8bc42022b6455a695cacd949c':
  Remove old hidden API.
2014-02-03 14:41:02 -08:00
Tim Murray
9bad32c383 am aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit 'aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
  Remove hidden API setSurfaceTexture.
2014-02-03 14:41:00 -08:00
Tim Murray
f5294ed57c Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 2014-02-03 22:37:13 +00:00
Tim Murray
3fb6feacc6 Merge "Check that bound allocations are 1D" 2014-02-03 22:37:11 +00:00
Tim Murray
0cc37f4cde Merge "Fix debug context." 2014-02-03 22:37:06 +00:00
Tim Murray
0539b7b411 Merge "Enable asynchronous destruction of BaseObjs." 2014-02-03 22:37:00 +00:00
Tim Murray
d8b4dd9555 Merge "Fix most logging macros for context pointers." 2014-02-03 22:36:54 +00:00
Tim Murray
351879df3a Merge "Fix getBytesSize for YUV allocations." 2014-02-03 22:36:53 +00:00
Tim Murray
8fced3174a Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 2014-02-03 22:36:50 +00:00
Tim Murray
b4cf2a2aee Merge "Convert Java/JNI to 64-bit, part 2." 2014-02-03 22:36:45 +00:00
Tim Murray
e22e268e6d Merge changes If93a5d78,I1957f7ac
* changes:
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
2014-02-03 22:36:38 +00:00
Tim Murray
61eb6b55c6 Merge "Use Object + type in place of specific array" 2014-02-03 22:36:36 +00:00
Tim Murray
e559d7ee53 Merge "Utility API for creating types." 2014-02-03 22:36:13 +00:00