OSDN Git Service
Narayan Kamath [Mon, 14 Apr 2014 08:41:42 +0000 (08:41 +0000)]
am
aa19a2f6: Merge "Don\'t compare String8s to NULL."
* commit '
aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
Don't compare String8s to NULL.
Narayan Kamath [Mon, 14 Apr 2014 08:18:24 +0000 (08:18 +0000)]
Merge "Don't compare String8s to NULL."
Narayan Kamath [Sat, 12 Apr 2014 11:25:50 +0000 (12:25 +0100)]
Don't compare String8s to NULL.
Use String8::isEmpty instead. Note that this code path is hit
only if the zygote calls ::exit, and that never happens unless
the VM invocation fails.
Change-Id: I0e7d3a86a79b12b2174ca3bf0dbe1904e33c041a
Narayan Kamath [Fri, 11 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
4f4892d00aab13975a8aed000f84ae0320355fd7':
Workaround 64 bit devices that don't have zygotes yet.
Narayan Kamath [Fri, 11 Apr 2014 18:29:54 +0000 (18:29 +0000)]
Merge "Workaround 64 bit devices that don't have zygotes yet."
Narayan Kamath [Fri, 11 Apr 2014 17:44:31 +0000 (18:44 +0100)]
Workaround 64 bit devices that don't have zygotes yet.
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.
For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.
bug:
13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
Elliott Hughes [Fri, 11 Apr 2014 17:41:44 +0000 (17:41 +0000)]
am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
b093e485bbd790cc4d9678451c8cce4d361c2cf2':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:37:54 +0000 (17:37 +0000)]
Merge "generateProjectThumbnail can fail to close output stream"
Elliott Hughes [Fri, 11 Apr 2014 17:33:15 +0000 (17:33 +0000)]
am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
8cd319b84635454746803b0eed7e2626d7945a09':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:30:09 +0000 (17:30 +0000)]
Merge "Add additional languages to be accepted by the NumberPicker input filter"
Elliott Hughes [Fri, 11 Apr 2014 17:18:14 +0000 (17:18 +0000)]
am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
d2a11d97a94bed18629bded429f118f57f4f7821':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:14:39 +0000 (17:14 +0000)]
Merge "Add explicit close of Scanner input"
Narayan Kamath [Fri, 11 Apr 2014 08:45:47 +0000 (08:45 +0000)]
am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
909a6a0e2b5815332618b2cf731d27824a76d042':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 08:24:52 +0000 (08:24 +0000)]
Merge "Dual zygote cleanup."
Narayan Kamath [Thu, 10 Apr 2014 11:21:33 +0000 (11:21 +0000)]
am
b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '
b827f78e7acee3a604c315615268edf7098dc184':
Removed android.debug.JNITest from preloaded-classes
Narayan Kamath [Thu, 10 Apr 2014 11:18:28 +0000 (11:18 +0000)]
Merge "Removed android.debug.JNITest from preloaded-classes"
Narayan Kamath [Thu, 10 Apr 2014 11:13:06 +0000 (12:13 +0100)]
Dual zygote cleanup.
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
argument must be passed through to the java main class.
Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
Narayan Kamath [Thu, 10 Apr 2014 09:23:33 +0000 (09:23 +0000)]
am
09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '
09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
System services detect and register app CPU ABIs
Narayan Kamath [Thu, 10 Apr 2014 09:23:30 +0000 (09:23 +0000)]
am
80413c9f: Merge "Re-implement native library search and copies."
* commit '
80413c9fe10acf36eaecd139198c7fc17e8af2e6':
Re-implement native library search and copies.
Narayan Kamath [Thu, 10 Apr 2014 09:20:21 +0000 (09:20 +0000)]
Merge "System services detect and register app CPU ABIs"
Narayan Kamath [Thu, 10 Apr 2014 09:19:38 +0000 (09:19 +0000)]
Merge "Re-implement native library search and copies."
Ramin Zaghi [Tue, 1 Apr 2014 14:02:29 +0000 (15:02 +0100)]
System services detect and register app CPU ABIs
This patch uses the NativeLibraryHelper class to
match native libraries in an .apk package with
those listed in 'ro.cpu.abilist' property.
The result is stored in packages.xml and the
ApplicationInfo class.
This information will be used by the ActivityManager
to decide which zygote to use to launch the given
app.
Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
Ramin Zaghi [Fri, 28 Feb 2014 15:03:19 +0000 (15:03 +0000)]
Re-implement native library search and copies.
We now use a two step approach :
- First we look through the list of shared libraries in an
APK, and choose an ABI based on the (priority) list of ABIs
a given device supports.
- Then we look through the list of shared libraries and copy
all shared libraries that match the ABI we've selected.
This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.
The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).
bug: https://code.google.com/p/android/issues/detail?id=65053
bug:
13647418
Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
Mark Salyzyn [Wed, 9 Apr 2014 16:11:04 +0000 (16:11 +0000)]
am
ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '
ecdf9b199ac9659c37c34c0b23084199acea80bf':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 9 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "jni: liblog reading error API incorrect"
Narayan Kamath [Wed, 9 Apr 2014 14:15:16 +0000 (14:15 +0000)]
am
a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '
a6f5e79dd182b05909fa53109e74638afcd7ee12':
Allow connections to multiple zygotes.
Narayan Kamath [Wed, 9 Apr 2014 14:12:22 +0000 (14:12 +0000)]
Merge "Allow connections to multiple zygotes."
Narayan Kamath [Thu, 3 Apr 2014 19:15:15 +0000 (20:15 +0100)]
Allow connections to multiple zygotes.
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.
Both zygotes are assumed to be active at all points.
Change-Id: I460319b4481ff1c1666e8172223691820658a35c
Narayan Kamath [Wed, 9 Apr 2014 13:59:00 +0000 (13:59 +0000)]
am
d4b64409: Merge "Make zygotes aware of their supported ABIs."
* commit '
d4b644092e8d2719d01ad297b080bd50b1fdf60d':
Make zygotes aware of their supported ABIs.
Narayan Kamath [Wed, 9 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
cecfb94f: Merge "Clean up argc / argv processing for runtime args."
* commit '
cecfb94f3f1b2978ba66342d7920e83770c808e3':
Clean up argc / argv processing for runtime args.
Narayan Kamath [Wed, 9 Apr 2014 13:55:55 +0000 (13:55 +0000)]
Merge "Make zygotes aware of their supported ABIs."
Narayan Kamath [Wed, 9 Apr 2014 13:55:54 +0000 (13:55 +0000)]
Merge "Clean up argc / argv processing for runtime args."
Narayan Kamath [Mon, 7 Apr 2014 12:56:15 +0000 (13:56 +0100)]
Make zygotes aware of their supported ABIs.
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.
Also add a new Zygote command that returns this list of
ABIs to peers.
Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
Narayan Kamath [Mon, 7 Apr 2014 11:44:58 +0000 (12:44 +0100)]
Clean up argc / argv processing for runtime args.
- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.
Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
Narayan Kamath [Wed, 9 Apr 2014 09:09:58 +0000 (09:09 +0000)]
am
a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '
a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0':
Don't allow MemoryFiles of negative length.
Narayan Kamath [Wed, 9 Apr 2014 09:07:29 +0000 (09:07 +0000)]
Merge "Don't allow MemoryFiles of negative length."
Mark Salyzyn [Tue, 8 Apr 2014 22:21:50 +0000 (15:21 -0700)]
jni: liblog reading error API incorrect
- return value contains -errno on error.
Bug:
13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
Narayan Kamath [Tue, 8 Apr 2014 15:10:52 +0000 (16:10 +0100)]
Don't allow MemoryFiles of negative length.
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.
Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
Craig Mautner [Mon, 7 Apr 2014 22:14:56 +0000 (22:14 +0000)]
am
3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '
3fb2b7132b64c65163e7c6cd948e45f703e93687':
[ActivityManager] Reduce report ANR on wrong activity.
Craig Mautner [Mon, 7 Apr 2014 22:10:47 +0000 (22:10 +0000)]
Merge "[ActivityManager] Reduce report ANR on wrong activity."
riddle_hsu [Mon, 7 Apr 2014 18:44:03 +0000 (02:44 +0800)]
[ActivityManager] Reduce report ANR on wrong activity.
Symptom: ANR report on wrong activity.
Root Cause:
KK changed resume behavior that will not update focus when only resume,
if the activity blocked, it may report ANR on previous focus.
By original concept, it will try to correct the ANR target,
but the stack of waiting(waitingVisible=true) activity may
different with current top stack.
If it gets key dispatch timeout, mResumedActivity and mPausingActivity
of its stack will be null becuase it is not top stack.
Then it is unable to change ANR target to the real no response activity.
Solution:
Use focused stack to get the real culprit.
Reproduce steps:
1.Launch an Activity X from launcher, press home key.
2.Launch X from launcher again, X blocks(sleeps 15sec) in onResume, press back key in the beginning of blocking duration.
3.ANR dialog shows launcher is no response.
Change-Id: I99416ad91e349096f995990f2240a97616fbaf28
Nick Kralevich [Fri, 4 Apr 2014 23:25:52 +0000 (23:25 +0000)]
am
dc97144b: Merge "Always call super.onCreate(). Always."
* commit '
dc97144b3f83bf6dae90493a6631afc6523dfce2':
Always call super.onCreate(). Always.
Nick Kralevich [Fri, 4 Apr 2014 23:18:45 +0000 (23:18 +0000)]
Merge "Always call super.onCreate(). Always."
Christopher Tate [Wed, 12 Feb 2014 21:14:10 +0000 (13:14 -0800)]
Always call super.onCreate(). Always.
Bug
12991134
(cherrypick of commit
9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a)
Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
Raph Levien [Thu, 3 Apr 2014 15:55:22 +0000 (15:55 +0000)]
am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
c420ce34ba177cd959cbb9432e9597d377e6cee6':
Marquee text RTL improvements
Raph Levien [Thu, 3 Apr 2014 15:50:28 +0000 (15:50 +0000)]
Merge "Marquee text RTL improvements"
Narayan Kamath [Thu, 3 Apr 2014 14:05:28 +0000 (14:05 +0000)]
am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
374db6c3792e9ed56230e09fee4742632ce8159a':
Remove ProcessState::mArgc,mArgV,mArgLen
Narayan Kamath [Thu, 3 Apr 2014 13:59:37 +0000 (13:59 +0000)]
Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
Narayan Kamath [Fri, 28 Mar 2014 13:39:21 +0000 (13:39 +0000)]
Remove ProcessState::mArgc,mArgV,mArgLen
These look like historical oddities, and weren't really being
used for anything useful.
Process:setArgV0 was being called by android.util.Process, but
that functionality can be moved directly into the implementation
of that class.
bug:
13647418
Change-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6
Ben Murdoch [Thu, 3 Apr 2014 09:54:33 +0000 (09:54 +0000)]
am
369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '
369a00574da218975718ce07ffe6abba5c17bf92':
Update ViewRootImpl for 64bit functor type.
Ben Murdoch [Thu, 3 Apr 2014 09:48:43 +0000 (09:48 +0000)]
Merge "Update ViewRootImpl for 64bit functor type."
Ben Cheng [Wed, 2 Apr 2014 20:54:47 +0000 (20:54 +0000)]
am
89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
* commit '
89dddcc948cb3e826bfddeefae73066849aba0fc':
Use default visibility for Snapshot::getLocalClip.
Ben Cheng [Wed, 2 Apr 2014 20:50:59 +0000 (20:50 +0000)]
Merge "Use default visibility for Snapshot::getLocalClip."
Ben Cheng [Wed, 2 Apr 2014 19:45:57 +0000 (12:45 -0700)]
Use default visibility for Snapshot::getLocalClip.
The method is in libhwui.so but used by libandroid_runtime.so
(via android_view_GLES20Canvas.cpp). If the compiler decides not to
inline this method, the linker won't be able to resolve the dependency
when it has hidden visibility.
The problem is found when testing GCC 4.9.
Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
Ben Murdoch [Wed, 2 Apr 2014 13:41:41 +0000 (14:41 +0100)]
Update ViewRootImpl for 64bit functor type.
Change-Id: Ie9020f0276c58ebf0977e4aef725fbc26aaf67b2
Narayan Kamath [Wed, 2 Apr 2014 10:35:38 +0000 (10:35 +0000)]
am
17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit '
17b1b8fe8c0c8f05f2077acc82428881bf591a78':
Move zygote startup logic to the frameworks.
Narayan Kamath [Wed, 2 Apr 2014 10:29:55 +0000 (10:29 +0000)]
Merge "Move zygote startup logic to the frameworks."
Narayan Kamath [Mon, 31 Mar 2014 12:41:26 +0000 (13:41 +0100)]
Move zygote startup logic to the frameworks.
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.
The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
logging.
- We call env->FatalError() instead of using LOG(FATAL)
Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
Jason Sams [Tue, 1 Apr 2014 00:10:55 +0000 (00:10 +0000)]
am
b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
* commit '
b3cafa56205942343930e4fbb0a3d50d6e33a046':
Fix RenderScriptGL setSurfaceTexture problem
Jason Sams [Mon, 31 Mar 2014 23:21:42 +0000 (23:21 +0000)]
Merge "Fix RenderScriptGL setSurfaceTexture problem"
Nick Kralevich [Mon, 31 Mar 2014 20:14:37 +0000 (20:14 +0000)]
am
3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
* commit '
3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
Change when the SELinux relabel of /data/data occurs.
Nick Kralevich [Mon, 31 Mar 2014 20:09:31 +0000 (20:09 +0000)]
Merge "Change when the SELinux relabel of /data/data occurs."
Brian Carlstrom [Mon, 31 Mar 2014 19:55:16 +0000 (19:55 +0000)]
am
e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '
e3434fc4fb164b66e529e675dfc31652a4c69cb5':
Improve detail message for X509TrustManagerExtensions argument validation
Brian Carlstrom [Mon, 31 Mar 2014 19:49:34 +0000 (19:49 +0000)]
Merge "Improve detail message for X509TrustManagerExtensions argument validation"
Brian Carlstrom [Mon, 31 Mar 2014 18:20:51 +0000 (11:20 -0700)]
Improve detail message for X509TrustManagerExtensions argument validation
Bug:
13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
Narayan Kamath [Mon, 31 Mar 2014 12:42:14 +0000 (12:42 +0000)]
am
ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class."
* commit '
ab561f5b4073055c414866ff3dbe8372263474a7':
Don't make isSafeMode a field on the Zygote class.
Narayan Kamath [Mon, 31 Mar 2014 12:32:49 +0000 (12:32 +0000)]
Merge "Don't make isSafeMode a field on the Zygote class."
Narayan Kamath [Fri, 28 Mar 2014 13:10:41 +0000 (13:10 +0000)]
Don't make isSafeMode a field on the Zygote class.
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.
Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
Narayan Kamath [Mon, 31 Mar 2014 09:41:39 +0000 (09:41 +0000)]
am
91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '
91bbb75c75568dee854fb10633f8ce3683265ffd':
Cast CallMethod's size_t parameters to jint
Narayan Kamath [Mon, 31 Mar 2014 09:37:32 +0000 (09:37 +0000)]
Merge "Cast CallMethod's size_t parameters to jint"
Xiaofei Wan [Mon, 31 Mar 2014 06:26:20 +0000 (14:26 +0800)]
Fix RenderScriptGL setSurfaceTexture problem
rsnContextSetSurfaceTexture() has no implementation in rs-jni, use nContextSetSurface() in setSurfaceTexture().
Change-Id: I066432575c9e74f21ea3a3776628b572b6e31377
Signed-off-by: Xiaofei Wan <xiaofei.wan@intel.com>
Wink Saville [Sun, 30 Mar 2014 15:11:27 +0000 (15:11 +0000)]
am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
1e4cad8198056a5e27a7aeb104ceb8ada331eafe':
GlobalActions: Fix Airplane Mode on/off issue
Wink Saville [Sun, 30 Mar 2014 00:15:22 +0000 (00:15 +0000)]
Merge "GlobalActions: Fix Airplane Mode on/off issue"
nagarw [Thu, 20 Feb 2014 11:40:46 +0000 (17:10 +0530)]
GlobalActions: Fix Airplane Mode on/off issue
Issue: Unable to turn off Airplane mode from power button
after phone reboot
Fix: Initialize mHasTelephony before the PhoneStateListener is
registered to the TelephonyManager so that correct value
of mHasTelephony is reflected when onServiceStateChanged
callback is called.
Bug:
13697360
Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
Jeff Hao [Fri, 28 Mar 2014 22:16:41 +0000 (22:16 +0000)]
am
e9b4fd07: Merge "Mark constructor as accessible in LayoutInflater."
* commit '
e9b4fd0718c00a504602453185de676618beed4b':
Mark constructor as accessible in LayoutInflater.
Craig Mautner [Fri, 28 Mar 2014 22:16:38 +0000 (22:16 +0000)]
am
d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '
d511bc17d614b1291f1b85f84180c1db157d2790':
[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
Michael Wright [Fri, 28 Mar 2014 22:16:35 +0000 (22:16 +0000)]
am
e328056d: Merge "Add support for additional international keyboard mappings"
* commit '
e328056ddcba0edd0e49b4697dfcc84f3658cb39':
Add support for additional international keyboard mappings
Craig Mautner [Fri, 28 Mar 2014 22:16:33 +0000 (22:16 +0000)]
am
ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '
ff3362f0d8378d616f39cbcf8b86b6f03e7d30b9':
DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
Jeff Hao [Fri, 28 Mar 2014 21:41:20 +0000 (21:41 +0000)]
Merge "Mark constructor as accessible in LayoutInflater."
Craig Mautner [Fri, 28 Mar 2014 20:27:32 +0000 (20:27 +0000)]
Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
Michael Wright [Fri, 28 Mar 2014 20:26:08 +0000 (20:26 +0000)]
Merge "Add support for additional international keyboard mappings"
Craig Mautner [Fri, 28 Mar 2014 20:23:34 +0000 (20:23 +0000)]
Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
Jeff Hao [Fri, 28 Mar 2014 18:33:53 +0000 (11:33 -0700)]
Mark constructor as accessible in LayoutInflater.
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
Anders Kristensen [Fri, 28 Mar 2014 17:27:18 +0000 (17:27 +0000)]
am
49c06150: Merge "Remove duplicate call disconnect codes."
* commit '
49c061501dbcff0dd6f6621afa76136d0857622a':
Remove duplicate call disconnect codes.
Anders Kristensen [Fri, 28 Mar 2014 17:19:57 +0000 (17:19 +0000)]
Merge "Remove duplicate call disconnect codes."
Robert Craig [Thu, 27 Mar 2014 14:00:58 +0000 (10:00 -0400)]
Change when the SELinux relabel of /data/data occurs.
Perform the relabel of the /data/data/<pkg> directories
when the app is being scanned by the PMS. The impetus
for this change was that the data directories of forward
locked apps were receiving the wrong label during an
OTA. Because the PMS doesn't actually scan forward locked
apps til later in the boot process, the prior restorecon
call was actually applying the default label of
system_data_file for all such apps. By performing a
restorecon on each individual app as they are entered into
the PMS we can handle them correctly. This mechanism also
allows us to pass down the seinfo tag as part of the
restorecon call which drops our need to rely on the contents
of packages.list.
Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Adam Lesinski [Thu, 27 Mar 2014 21:00:08 +0000 (21:00 +0000)]
am
55a65509: Merge "Reduce warning verbosity in aapt"
* commit '
55a655091a30667ba7c091dc22d350c0bb8d8641':
Reduce warning verbosity in aapt
Adam Lesinski [Thu, 27 Mar 2014 20:55:14 +0000 (20:55 +0000)]
Merge "Reduce warning verbosity in aapt"
Craig Mautner [Thu, 27 Mar 2014 20:07:57 +0000 (20:07 +0000)]
am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
a282441038b8a82be1b9b6afc41145e5570ce377':
Do not show Home behind full screen activity
Craig Mautner [Thu, 27 Mar 2014 20:01:11 +0000 (20:01 +0000)]
Merge "Do not show Home behind full screen activity"
Colin Cross [Thu, 27 Mar 2014 17:30:01 +0000 (17:30 +0000)]
am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
f0ffa8a38e90f64912686833dba9823b251fae57':
app_process: use LOCAL_MULTILIB := both
Colin Cross [Thu, 27 Mar 2014 17:26:07 +0000 (17:26 +0000)]
Merge "app_process: use LOCAL_MULTILIB := both"
Colin Cross [Thu, 27 Mar 2014 17:20:29 +0000 (10:20 -0700)]
app_process: use LOCAL_MULTILIB := both
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.
Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.
Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
Olivier Gay [Thu, 27 Mar 2014 16:21:01 +0000 (17:21 +0100)]
Add support for additional international keyboard mappings
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).
Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Narayan Kamath [Thu, 27 Mar 2014 12:36:10 +0000 (12:36 +0000)]
am
cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"
* commit '
cd3f60f30366a34b4499aab5a47b622069ba9cd6':
AArch64: Make frameworks/base code more portable
Narayan Kamath [Thu, 27 Mar 2014 12:30:53 +0000 (12:30 +0000)]
Merge "AArch64: Make frameworks/base code more portable"
Ashok Bhat [Tue, 25 Mar 2014 20:51:35 +0000 (20:51 +0000)]
AArch64: Make frameworks/base code more portable
Changes in this patch include
[x] Use %zu for size_t, %zd for ssize_t
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Yevgen Pronenko [Fri, 14 Mar 2014 10:57:06 +0000 (11:57 +0100)]
Do not show Home behind full screen activity
When ensureActivitiesVisibleLocked goes through foreground activity
stack and reaches non-fullscreen activity, it sets showHomeBehindStack
variable to true.
If there is a fullscreen activity behind, showHomeBehindStack remains
unchanged, which causes Home application to be displayed anyway.
In this case user will see a fullscreen activity and Home activity
simultaneously.
To fix the issue we set showHomeBehindStack to false when we reach
fullscreen activity in the activity stack.
This was made visible by the following commit:
446ef1de8d373c1b017df8d19ebf9a47811fb402
Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
Kenny Root [Wed, 26 Mar 2014 23:59:11 +0000 (23:59 +0000)]
am
57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '
57f2764bf104b0fe7b5cd67ad5b2cae9bc8352ed':
CertificateChainValidator: initialize TrustManagerFactory
Kenny Root [Wed, 26 Mar 2014 22:51:52 +0000 (22:51 +0000)]
Merge "CertificateChainValidator: initialize TrustManagerFactory"