OSDN Git Service
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: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"
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>
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
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.
Stephen Hines [Wed, 5 Feb 2014 01:52:31 +0000 (01:52 +0000)]
Merge "Add message to RS docs about application vs. library packaging."
Tim Murray [Mon, 3 Feb 2014 22:41:42 +0000 (14:41 -0800)]
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.
Tim Murray [Mon, 3 Feb 2014 22:41:39 +0000 (14:41 -0800)]
am
3fb6feac: Merge "Check that bound allocations are 1D"
* commit '
3fb6feacc62e1021c705b53d46e915ecf50582d2':
Check that bound allocations are 1D
Tim Murray [Mon, 3 Feb 2014 22:41:30 +0000 (14:41 -0800)]
am
0cc37f4c: Merge "Fix debug context."
* commit '
0cc37f4cdeaed95e4f61f1a6e7b78f07e7025e97':
Fix debug context.
Tim Murray [Mon, 3 Feb 2014 22:41:27 +0000 (14:41 -0800)]
am
0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."
* commit '
0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
Enable asynchronous destruction of BaseObjs.
Tim Murray [Mon, 3 Feb 2014 22:41:24 +0000 (14:41 -0800)]
am
d8b4dd95: Merge "Fix most logging macros for context pointers."
* commit '
d8b4dd9555e987df92206562061080b327598f41':
Fix most logging macros for context pointers.
Tim Murray [Mon, 3 Feb 2014 22:41:21 +0000 (14:41 -0800)]
am
351879df: Merge "Fix getBytesSize for YUV allocations."
* commit '
351879df3aff02987a6f4c4485bf004a96fcb150':
Fix getBytesSize for YUV allocations.
Tim Murray [Mon, 3 Feb 2014 22:41:17 +0000 (14:41 -0800)]
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.
Tim Murray [Mon, 3 Feb 2014 22:41:14 +0000 (14:41 -0800)]
am
b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."
* commit '
b4cf2a2aee78b0ed3e75b5a07baaf5479fe708d9':
Convert Java/JNI to 64-bit, part 2.
Tim Murray [Mon, 3 Feb 2014 22:41:11 +0000 (14:41 -0800)]
am
e22e268e: Merge changes If93a5d78,I1957f7ac
* commit '
e22e268e6d158f37173b1bce37a5614daabcf18c':
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:41:08 +0000 (14:41 -0800)]
am
61eb6b55: Merge "Use Object + type in place of specific array"
* commit '
61eb6b55c6b4db14e025240fc754e1314f57bd00':
Use Object + type in place of specific array
Tim Murray [Mon, 3 Feb 2014 22:41:05 +0000 (14:41 -0800)]
am
e559d7ee: Merge "Utility API for creating types."
* commit '
e559d7ee53a69502c9aef8764bb055ed2d1adb64':
Utility API for creating types.
Tim Murray [Mon, 3 Feb 2014 22:41:02 +0000 (14:41 -0800)]
am
b1c1518e: Merge "Remove old hidden API."
* commit '
b1c1518ef1e89fb8bc42022b6455a695cacd949c':
Remove old hidden API.
Tim Murray [Mon, 3 Feb 2014 22:41:00 +0000 (14:41 -0800)]
am
aea3b581: Merge "Remove hidden API setSurfaceTexture."
* commit '
aea3b5816d8461fcbc4a384874a1a073ecdeafcf':
Remove hidden API setSurfaceTexture.
Tim Murray [Mon, 3 Feb 2014 22:37:12 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
Tim Murray [Mon, 3 Feb 2014 22:37:11 +0000 (22:37 +0000)]
Merge "Check that bound allocations are 1D"
Tim Murray [Mon, 3 Feb 2014 22:37:06 +0000 (22:37 +0000)]
Merge "Fix debug context."
Tim Murray [Mon, 3 Feb 2014 22:37:00 +0000 (22:37 +0000)]
Merge "Enable asynchronous destruction of BaseObjs."
Tim Murray [Mon, 3 Feb 2014 22:36:54 +0000 (22:36 +0000)]
Merge "Fix most logging macros for context pointers."
Tim Murray [Mon, 3 Feb 2014 22:36:53 +0000 (22:36 +0000)]
Merge "Fix getBytesSize for YUV allocations."
Tim Murray [Mon, 3 Feb 2014 22:36:50 +0000 (22:36 +0000)]
Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs."
Tim Murray [Mon, 3 Feb 2014 22:36:45 +0000 (22:36 +0000)]
Merge "Convert Java/JNI to 64-bit, part 2."
Tim Murray [Mon, 3 Feb 2014 22:36:37 +0000 (22:36 +0000)]
Merge changes If93a5d78,I1957f7ac
* changes:
Convert Java/JNI to 64-bit, part 1.
Add long/double read support.
Tim Murray [Mon, 3 Feb 2014 22:36:36 +0000 (22:36 +0000)]
Merge "Use Object + type in place of specific array"
Tim Murray [Mon, 3 Feb 2014 22:36:13 +0000 (22:36 +0000)]
Merge "Utility API for creating types."
Tim Murray [Mon, 3 Feb 2014 22:36:05 +0000 (22:36 +0000)]
Merge "Remove old hidden API."
Tim Murray [Mon, 3 Feb 2014 22:35:14 +0000 (22:35 +0000)]
Merge "Remove hidden API setSurfaceTexture."
Mårten Kongstad [Fri, 31 Jan 2014 13:47:44 +0000 (14:47 +0100)]
Runtime resource overlay, iteration 2, test cases
Add automated test cases for runtime resource overlay, iteration 2.
The test cases are a mixture of 'adb shell' commands and regular
instrumentation tests. The device is rebooted between tests to setup
different overlay scenarios for framework-res.apk.
To verify Runtime resoure overlay, iteration 2, run
$ frameworks/base/core/tests/overlaytests/testrunner.py
For a list of supported options, run
$ frameworks/base/core/tests/overlaytests/testrunner.py --help
Change-Id: I692aa1a7ad073efd116b24f9ec7f197dfd65dfef
Mårten Kongstad [Fri, 31 Jan 2014 13:43:27 +0000 (14:43 +0100)]
Runtime resource overlay, iteration 2
Support any number of overlay packages. Support any target package.
UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes
<overlay targetPackage="com.target.package"/>
For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.
THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').
UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.
Zygote initialization
Initial AssetManager object created
+ idmap --scan creates idmaps for overlays targeting 'android', \
stores list of overlays in /data/resource-cache/overlays.list
AssetManager caches framework-res.apk
+ AssetManager caches overlay packages listed in overlays.list
Android boot
New AssetManager's ResTable acquired
AssetManager re-uses cached framework-res.apk
+ AssetManager re-uses cached 'android' overlays (if any)
App boot
ActivityThread prepares AssetManager to load app.apk
+ ActivityThread prepares AssetManager to load app overlays (if any)
New AssetManager's ResTable acquired as per Android boot
SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.
LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.
When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.
Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:
<overlay targetPackage="com.target.package" priority="1234"/>
Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.
Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.
The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.
+------+------+- -+------+------+
| 0x01 | | ... | | 0x7f |
+------+------+- -+------+------+
| |
"android" Target package A
|
Pre-installed overlay B (priority 1)
|
Pre-installed overlay C (priority 2)
Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
Mårten Kongstad [Fri, 31 Jan 2014 13:01:52 +0000 (14:01 +0100)]
New command line tool 'idmap'
Introduce a new tool 'idmap' to handle generation and verification of
idmap files. The tool is modelled on 'dexopt', and is intended to be
used similarly, notably by 'installd'.
See cmds/idmap/idmap.cpp for further documentation on 'idmap'.
Note: this commit is interdependent on a commit in project build/ to add
'idmap' to PRODUCT_PACKAGES.
Note: the changes to androidfw are only stubs. The actual implementation
will be provided in Runtime resource overlay, iteration 2.
Change-Id: I7131b74ece1e46c8a9c0a31d103e686aa07da2bb
Kenny Root [Fri, 31 Jan 2014 22:58:53 +0000 (14:58 -0800)]
am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
c064a1b5d9a68bb5513e6ed64a067ab822e98764':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 22:54:44 +0000 (22:54 +0000)]
Merge "Remove DRLCertFactory"
Kenny Root [Fri, 31 Jan 2014 22:10:01 +0000 (14:10 -0800)]
Remove DRLCertFactory
No longer needed since Conscrypt is the main provider.
Change-Id: Iee741ef376af2de52db79df07e96057438778bc6
Tim Murray [Fri, 31 Jan 2014 20:57:20 +0000 (12:57 -0800)]
DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
Jason Sams [Wed, 15 Jan 2014 00:18:14 +0000 (16:18 -0800)]
Check that bound allocations are 1D
We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.
Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
Tim Murray [Fri, 10 Jan 2014 19:25:52 +0000 (11:25 -0800)]
Fix debug context.
bug
12477551
Change-Id: Icac28abc3dabce31834faa1942b596c2f207f29e
Tim Murray [Tue, 7 Jan 2014 19:13:56 +0000 (11:13 -0800)]
Enable asynchronous destruction of BaseObjs.
Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c
Conflicts:
rs/java/android/renderscript/BaseObj.java
Tim Murray [Tue, 7 Jan 2014 23:36:19 +0000 (15:36 -0800)]
Fix most logging macros for context pointers.
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
Tim Murray [Wed, 18 Dec 2013 01:15:25 +0000 (17:15 -0800)]
Fix getBytesSize for YUV allocations.
bug
12134914
Change-Id: I128e75b756a5bd129077177e254f1db6c94182f1
Tim Murray [Tue, 17 Dec 2013 21:28:17 +0000 (13:28 -0800)]
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
Tim Murray [Tue, 19 Nov 2013 20:45:54 +0000 (12:45 -0800)]
Convert Java/JNI to 64-bit, part 2.
This changes BaseObj to support 64-bit IDs. There are a few caveats:
1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.
bug
11332320
Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
Tim Murray [Fri, 15 Nov 2013 21:08:30 +0000 (13:08 -0800)]
Convert Java/JNI to 64-bit, part 1.
This converts context and device storage to use long instead of int.
bug
11332320
Change-Id: If93a5d78385d3004d5e709762b78bd1d3538088d