OSDN Git Service
Craig Mautner [Wed, 19 Feb 2014 16:26:15 +0000 (08:26 -0800)]
am
16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
* commit '
16ea3e6a5b37dc436d1089996004bcae12f5e3b0':
A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
Narayan Kamath [Wed, 19 Feb 2014 16:26:07 +0000 (08:26 -0800)]
am
7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
* commit '
7c710936c5129664f8b23bf4592c12eca975d229':
Remove java.io.tmpdir assignment in AndroidRuntime.
Craig Mautner [Wed, 19 Feb 2014 15:36:00 +0000 (15:36 +0000)]
Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
Narayan Kamath [Wed, 19 Feb 2014 14:24:47 +0000 (14:24 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
Calin Juravle [Wed, 19 Feb 2014 11:18:06 +0000 (03:18 -0800)]
am
f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit '
f11cc165f4d6e18d79ce013fa2f74fb43e002ac1':
Fixed a possible infinite loop in JsonReader#skipValue()
Calin Juravle [Wed, 19 Feb 2014 11:15:00 +0000 (11:15 +0000)]
Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
Junu Kim [Wed, 19 Feb 2014 07:25:21 +0000 (16:25 +0900)]
A background started service is removed from mStartingBackground when timeout.
Fix is to make sure mStartingBackground is updated to remove one.
Change-Id: I0e42beb550d33e6e400349b85bbb89848e18d520
Calin Juravle [Tue, 18 Feb 2014 19:08:39 +0000 (19:08 +0000)]
Fixed a possible infinite loop in JsonReader#skipValue()
Bug: https://code.google.com/p/android/issues/detail?id=65846
Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
Jeff Sharkey [Tue, 18 Feb 2014 17:16:31 +0000 (09:16 -0800)]
am
60097a9c: Merge "Structure device not freed in error case"
* commit '
60097a9c5a7214cb73d0bc966adef767743f8798':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:13:00 +0000 (09:13 -0800)]
am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
02a64daefece8ccdc40935c7bc865a8966249c44':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:12:57 +0000 (09:12 -0800)]
am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
234b0b037ee1f8dc50c846279216a8e4d779ff56':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:12:14 +0000 (17:12 +0000)]
Merge "Structure device not freed in error case"
Jeff Sharkey [Tue, 18 Feb 2014 17:11:09 +0000 (17:11 +0000)]
Merge "Tethering: Skip link local addresses when enabling NAT"
Jeff Sharkey [Tue, 18 Feb 2014 17:10:02 +0000 (17:10 +0000)]
Merge "Fix, MountService now only sends one onShutDownComplete"
Narayan Kamath [Mon, 17 Feb 2014 18:23:56 +0000 (10:23 -0800)]
am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
a14d9c318a1d358902a76aff733303c5509bb5fc':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:20:33 +0000 (18:20 +0000)]
Merge "Move Json{Reader,Writer} test to cts."
Narayan Kamath [Mon, 17 Feb 2014 17:51:43 +0000 (17:51 +0000)]
Move Json{Reader,Writer} test to cts.
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.
Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
Narayan Kamath [Mon, 17 Feb 2014 11:03:49 +0000 (03:03 -0800)]
am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
be57fca41a731217010d9f92554cf48708b06ecf':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:03:46 +0000 (03:03 -0800)]
am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
49024bacf63db39467e7f318c682ad771ec0de22':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:00:29 +0000 (11:00 +0000)]
Merge "Extended locales in AAPT / AssetManager."
Narayan Kamath [Mon, 17 Feb 2014 11:00:14 +0000 (11:00 +0000)]
Merge "AssetManager support for 3 letter lang/country codes."
Tim Murray [Fri, 14 Feb 2014 23:53:59 +0000 (15:53 -0800)]
am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
7d1a6c5cac16795e5953d2b4d34671e34e907632':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:50:08 +0000 (23:50 +0000)]
Merge "Fix destruction issues relating to AllocationAdapter."
Tim Murray [Wed, 12 Feb 2014 19:16:17 +0000 (11:16 -0800)]
Fix destruction issues relating to AllocationAdapter.
bug
12971201
Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
Ben Gruver [Fri, 14 Feb 2014 21:57:24 +0000 (13:57 -0800)]
am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
Check the return value of listFiles on the ifw directory
Ben Gruver [Fri, 14 Feb 2014 21:15:49 +0000 (21:15 +0000)]
Merge "Check the return value of listFiles on the ifw directory"
Ben Gruver [Tue, 1 Oct 2013 00:03:34 +0000 (17:03 -0700)]
Check the return value of listFiles on the ifw directory
listFiles can return null if the directory doesn't exist
Bug:
10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
Tim Murray [Fri, 14 Feb 2014 20:51:32 +0000 (12:51 -0800)]
am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
d7043f0084237200b6aab5d101c8ab6d3ab495c6':
Add hidden minor version ID for support lib workarounds.
Tim Murray [Fri, 14 Feb 2014 20:47:33 +0000 (20:47 +0000)]
Merge "Add hidden minor version ID for support lib workarounds."
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.
Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
Narayan Kamath [Tue, 21 Jan 2014 15:32:36 +0000 (15:32 +0000)]
Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.
This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.
This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.
Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.
(cherry-picked from commit
91447d88f2bdf9c2bf8d1a53570efef6172fba74)
Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
Narayan Kamath [Mon, 20 Jan 2014 13:57:11 +0000 (13:57 +0000)]
AssetManager support for 3 letter lang/country codes.
- 3 letter codes are packed into the existing 32 bit locale
field in ResTable_config
- We introduce new fields for script / variant information.
Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.
(cherry picked from commit
378c6775a62d9c461cde51f06c1b14bb014c78fd)
Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
Narayan Kamath [Fri, 14 Feb 2014 13:14:07 +0000 (05:14 -0800)]
am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:10:43 +0000 (13:10 +0000)]
Merge "AArch64: Use long for pointers in SurfaceSession class"
Dianne Hackborn [Fri, 14 Feb 2014 01:50:53 +0000 (17:50 -0800)]
am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
24d8fa739b7ca0791174af260ed95cdc139e0903':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:50:51 +0000 (17:50 -0800)]
am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
bbba8211f9eca938d5d482583fd6e047615b4334':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:45:12 +0000 (01:45 +0000)]
Merge "frameworks/base: move idmap from frameworks/native"
Wink Saville [Thu, 13 Feb 2014 23:37:03 +0000 (23:37 +0000)]
Merge "Telephony: Handle DATA_CALL_LIST in DCC."
Wink Saville [Thu, 13 Feb 2014 04:29:01 +0000 (20:29 -0800)]
am
bba3a694: Merge "Telephony API extension v2"
* commit '
bba3a694b8400fd340c0400bf42ef3d79a4285b1':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 04:26:33 +0000 (04:26 +0000)]
Merge "Telephony API extension v2"
Nick Kralevich [Wed, 12 Feb 2014 23:12:08 +0000 (15:12 -0800)]
am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Nick Kralevich [Wed, 12 Feb 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Dave Platt [Wed, 12 Feb 2014 23:07:07 +0000 (15:07 -0800)]
am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
Finish fixing Zygote descriptor leakage problem
Dave Platt [Wed, 12 Feb 2014 23:03:48 +0000 (23:03 +0000)]
Merge "Finish fixing Zygote descriptor leakage problem"
Narayan Kamath [Wed, 12 Feb 2014 17:29:55 +0000 (09:29 -0800)]
Narayan Kamath [Wed, 12 Feb 2014 17:26:57 +0000 (17:26 +0000)]
Merge "Fix build."
Paul Duffin [Wed, 12 Feb 2014 10:29:41 +0000 (02:29 -0800)]
am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
d562a9b5160b491a9cc884f72651e46d786bdc0a':
Improve Parcel's handling of non-primitive arrays
Paul Duffin [Wed, 12 Feb 2014 10:27:13 +0000 (10:27 +0000)]
Merge "Improve Parcel's handling of non-primitive arrays"
Dianne Hackborn [Tue, 11 Feb 2014 21:56:21 +0000 (13:56 -0800)]
Fix build.
At least part of what is broken. Other stuff still seems to be.
(cherry picked from
32bb5fae353b5bb6275e75952e89c514c7369cee)
Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
Narayan Kamath [Wed, 12 Feb 2014 09:40:24 +0000 (01:40 -0800)]
am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
f991771f81953f5d355eb905d05a784ed7287016':
Use size_t* in AssetManager::createIdmap
Narayan Kamath [Wed, 12 Feb 2014 09:32:16 +0000 (09:32 +0000)]
Merge "Use size_t* in AssetManager::createIdmap"
Colin Cross [Wed, 12 Feb 2014 02:04:44 +0000 (18:04 -0800)]
frameworks/base: move idmap from frameworks/native
idmap depends on libandroidfw, so it should go in frameworks/base.
Change-Id: I3c1db3baa355f53d6b523d60f4377e63eff00c30
Colin Cross [Wed, 12 Feb 2014 02:02:06 +0000 (18:02 -0800)]
Use size_t* in AssetManager::createIdmap
ResTable::createIdmap takes a size_t*, and the idmap command is
passing in a size_t*, make AssetManager::createIdmap take a
size_t*. Should fix the mac build.
Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
Dianne Hackborn [Tue, 11 Feb 2014 21:34:49 +0000 (13:34 -0800)]
am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
89492190b39e301d8203d0a9a9f6b11120c16ecb':
Runtime resource overlay, iteration 2, test cases
Dianne Hackborn [Tue, 11 Feb 2014 21:34:46 +0000 (13:34 -0800)]
am
67754d93: Merge "Runtime resource overlay, iteration 2"
* commit '
67754d93c4bfb2da1831b1dd2b40c12a838b1028':
Runtime resource overlay, iteration 2
Dianne Hackborn [Tue, 11 Feb 2014 21:30:08 +0000 (21:30 +0000)]
Merge "Runtime resource overlay, iteration 2, test cases"
Dianne Hackborn [Tue, 11 Feb 2014 21:29:58 +0000 (21:29 +0000)]
Merge "Runtime resource overlay, iteration 2"
Dianne Hackborn [Tue, 11 Feb 2014 20:32:17 +0000 (12:32 -0800)]
am
578087e3: Merge "New command line tool \'idmap\'"
* commit '
578087e39845a0c9a728ba18963f498d1f69b279':
New command line tool 'idmap'
Dianne Hackborn [Tue, 11 Feb 2014 20:30:07 +0000 (20:30 +0000)]
Merge "New command line tool 'idmap'"
Paul Duffin [Mon, 3 Feb 2014 15:02:17 +0000 (15:02 +0000)]
Improve Parcel's handling of non-primitive arrays
Treat arrays other than actual Object arrays (i.e. those whose component type
is actually Object) and the primitive arrays already handled specially by
Parcel as Serializable's.
Issue: 64583
Change-Id: I3ff797f3262e77e4de27f35709bceee5410d1ed4
Narayan Kamath [Tue, 11 Feb 2014 16:30:28 +0000 (08:30 -0800)]
am
3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"
* commit '
3aeb629d8251699237e3d067be4fb44ba206626c':
Use long to store pointers in GLES_JNI/EGL classes
Narayan Kamath [Tue, 11 Feb 2014 16:30:25 +0000 (08:30 -0800)]
am
7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '
7b7726b7982063034667c6a6076cc0b390ede8ce':
Fix in MediaMuxer's JNI code
Narayan Kamath [Tue, 11 Feb 2014 16:30:20 +0000 (08:30 -0800)]
am
b823bd45: Merge "Use long to store pointers in ConsumerIrService"
* commit '
b823bd45600fc339ae2e618d5fe506ace74ada4a':
Use long to store pointers in ConsumerIrService
Narayan Kamath [Tue, 11 Feb 2014 16:30:06 +0000 (08:30 -0800)]
am
f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit '
f44a3f1e00e38b09f70efed3eaf771871435e478':
Use long for pointers in EmojiFactory and PdfDocument
Narayan Kamath [Tue, 11 Feb 2014 15:39:04 +0000 (15:39 +0000)]
Merge "Use long to store pointers in GLES_JNI/EGL classes"
Narayan Kamath [Tue, 11 Feb 2014 14:33:38 +0000 (14:33 +0000)]
Merge "Fix in MediaMuxer's JNI code"
Narayan Kamath [Tue, 11 Feb 2014 14:29:09 +0000 (14:29 +0000)]
Merge "Use long to store pointers in ConsumerIrService"
Narayan Kamath [Tue, 11 Feb 2014 14:07:16 +0000 (14:07 +0000)]
Merge "Use long for pointers in EmojiFactory and PdfDocument"
Narayan Kamath [Tue, 11 Feb 2014 13:44:37 +0000 (05:44 -0800)]
am
6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
* commit '
6d8b21a84c92904a966d77f3c6c0282e92c2b077':
Fix TinyHashMap to use generic hash_type instead of hash_t
Narayan Kamath [Tue, 11 Feb 2014 13:40:37 +0000 (13:40 +0000)]
Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
Tim Murray [Mon, 10 Feb 2014 23:29:55 +0000 (15:29 -0800)]
am
38d799fc: Merge "Generic object based data copy."
* commit '
38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c':
Generic object based data copy.
Tim Murray [Mon, 10 Feb 2014 23:27:05 +0000 (23:27 +0000)]
Merge "Generic object based data copy."
Jason Sams [Tue, 26 Nov 2013 02:28:33 +0000 (18:28 -0800)]
Generic object based data copy.
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present. This adds support for long/double and reduces
the amount of code present. We could also support arrays of vectors
or objects in the future with this mechanism.
Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
Colin Cross [Mon, 10 Feb 2014 22:06:09 +0000 (14:06 -0800)]
am
40545f32: Merge "frameworks/base: fix errors inside ALOGV"
* commit '
40545f32d3364604dac0c21a0310c26f7596e3a8':
frameworks/base: fix errors inside ALOGV
Colin Cross [Mon, 10 Feb 2014 22:02:50 +0000 (22:02 +0000)]
Merge "frameworks/base: fix errors inside ALOGV"
Rickard Helldin [Fri, 7 Feb 2014 08:35:04 +0000 (09:35 +0100)]
Fix, MountService now only sends one onShutDownComplete
The event onShutDownComplete are sent only when all
volumes are shutdown. (Not one for every volume.)
Change-Id: I6af521ee8285ca581efac7d3c5f013dfbff3ee30
Narayan Kamath [Mon, 10 Feb 2014 13:37:18 +0000 (05:37 -0800)]
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
Narayan Kamath [Mon, 10 Feb 2014 13:33:26 +0000 (13:33 +0000)]
Merge "AArch64: Use long for pointers in RS Java/JNI code"
Colin Cross [Fri, 7 Feb 2014 04:17:48 +0000 (20:17 -0800)]
frameworks/base: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
Christopher Tate [Fri, 7 Feb 2014 23:33:17 +0000 (15:33 -0800)]
am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
ff27e6bc44097485abfde24f396399e5eec9ff6d':
Use canonical path for /vendor/app
Christopher Tate [Fri, 7 Feb 2014 23:30:23 +0000 (23:30 +0000)]
Merge "Use canonical path for /vendor/app"
John Spurlock [Fri, 7 Feb 2014 21:01:42 +0000 (13:01 -0800)]
am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
Example controller app for system ui demo mode.
John Spurlock [Fri, 7 Feb 2014 20:58:36 +0000 (20:58 +0000)]
Merge "Example controller app for system ui demo mode."
John Spurlock [Fri, 7 Feb 2014 19:47:47 +0000 (14:47 -0500)]
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
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:11:28 +0000 (11:11 -0800)]
am
11e6cabc: Merge "Fix a typo."
* commit '
11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d':
Fix a typo.
Ashok Bhat [Fri, 7 Feb 2014 16:31:41 +0000 (16:31 +0000)]
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>
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:08:36 +0000 (19:08 +0000)]
Merge "Fix a typo."
Jean-Luc Brouillet [Fri, 7 Feb 2014 19:04:26 +0000 (11:04 -0800)]
Fix a typo.
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
Ashok Bhat [Fri, 7 Feb 2014 12:26:17 +0000 (12:26 +0000)]
Use long to store pointers in ConsumerIrService
Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Fri, 7 Feb 2014 12:22:50 +0000 (12:22 +0000)]
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>
Dan Sandler [Fri, 7 Feb 2014 16:02:15 +0000 (08:02 -0800)]
am
6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '
6ea720bacb805e88fc3b8634bbd9dc7fa918beaa':
Make sure to turn off led after pulse()
Dan Sandler [Fri, 7 Feb 2014 15:59:08 +0000 (15:59 +0000)]
Merge "Make sure to turn off led after pulse()"
Stephen Smalley [Fri, 7 Feb 2014 14:16:12 +0000 (09:16 -0500)]
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>
Tim Murray [Fri, 7 Feb 2014 00:39:38 +0000 (16:39 -0800)]
Add hidden minor version ID for support lib workarounds.
Change-Id: I7940e32c78caaab351fb28d92e5fadbea6292b27
Dave Platt [Thu, 6 Feb 2014 01:06:42 +0000 (17:06 -0800)]
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
Ashok Bhat [Wed, 8 Jan 2014 15:34:15 +0000 (15:34 +0000)]
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>
Chris Craik [Wed, 5 Feb 2014 21:40:22 +0000 (13:40 -0800)]
am
449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '
449273e2d575041ffe1a5d435666d36923de888b':
Fix for positioning of glyphs within a bitmap
Chris Craik [Wed, 5 Feb 2014 21:36:42 +0000 (21:36 +0000)]
Merge "Fix for positioning of glyphs within a bitmap"
Ashok Bhat [Tue, 4 Feb 2014 14:57:58 +0000 (14:57 +0000)]
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>
Stephen Hines [Wed, 5 Feb 2014 01:57:11 +0000 (17:57 -0800)]
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.