OSDN Git Service
Mark Renouf [Thu, 1 May 2014 17:32:10 +0000 (17:32 +0000)]
am
41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
* commit '
41615284dfb00595ed642c4e31da6a035ff53224':
SwipeDismiss: limit fade to 50% alpha while swiping
Mark Renouf [Thu, 1 May 2014 17:26:45 +0000 (17:26 +0000)]
Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
Baligh Uddin [Thu, 1 May 2014 16:21:50 +0000 (16:21 +0000)]
am
bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
bf4927ee0d085fd0c7eaf1221f709811f3be6f4f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:18:20 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Robert Ly [Thu, 1 May 2014 16:02:16 +0000 (16:02 +0000)]
am
007fad0d: am
6b7f3936: am
b39ce1b6: docs: fix method name
* commit '
007fad0dbd3f8bd3a8b7323a4587eab954093f27':
docs: fix method name
Robert Ly [Thu, 1 May 2014 15:56:58 +0000 (15:56 +0000)]
am
6b7f3936: am
b39ce1b6: docs: fix method name
* commit '
6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
docs: fix method name
Robert Ly [Thu, 1 May 2014 15:53:03 +0000 (15:53 +0000)]
am
b39ce1b6: docs: fix method name
* commit '
b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
docs: fix method name
Robert Ly [Thu, 1 May 2014 15:47:14 +0000 (08:47 -0700)]
docs: fix method name
Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc
Marco Nelissen [Thu, 1 May 2014 15:32:17 +0000 (15:32 +0000)]
am
ab962b54: am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
ab962b54e3eac4ffadb5ea4e4948df10e6201468':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Marco Nelissen [Thu, 1 May 2014 15:28:14 +0000 (15:28 +0000)]
am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
ab3977d21161815c130bdedf21e2571382d208da':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Marco Nelissen [Thu, 1 May 2014 15:25:13 +0000 (15:25 +0000)]
Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
Narayan Kamath [Thu, 1 May 2014 14:39:20 +0000 (14:39 +0000)]
am
5dca099d: am
1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '
5dca099df7100c531e111b50435605c318f1e6d4':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Thu, 1 May 2014 14:39:16 +0000 (14:39 +0000)]
am
c1f81f90: am
27f2bfc4: Merge "Fix dex file pruning logic."
* commit '
c1f81f9086037dde6e082b8a80c84277cb727726':
Fix dex file pruning logic.
Narayan Kamath [Thu, 1 May 2014 14:39:12 +0000 (14:39 +0000)]
am
51f4367c: am
bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '
51f4367cac606580a5ca10ec1cf2dcab3982aebc':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Thu, 1 May 2014 14:32:20 +0000 (15:32 +0100)]
resolved conflicts for merge of
69da8a12 to klp-modular-dev-plus-aosp
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
Narayan Kamath [Thu, 1 May 2014 14:01:14 +0000 (14:01 +0000)]
am
d85ded89: am
645a920f: Merge "Fix OEM native library path bug."
* commit '
d85ded890d86d454a0571c63911ff911633e3a95':
Fix OEM native library path bug.
Narayan Kamath [Thu, 1 May 2014 14:01:10 +0000 (14:01 +0000)]
am
eb573498: am
986b901a: Merge "Fix native-lib dir assignment & updating"
* commit '
eb5734989b3ef5455359f8807684a860ad04c134':
Fix native-lib dir assignment & updating
Narayan Kamath [Thu, 1 May 2014 14:00:52 +0000 (14:00 +0000)]
am
1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '
1cec7f8539e6465ff80577169d7d07df3c2574b7':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Thu, 1 May 2014 14:00:49 +0000 (14:00 +0000)]
am
27f2bfc4: Merge "Fix dex file pruning logic."
* commit '
27f2bfc406157039c5241f6a4f38f597b2076e2a':
Fix dex file pruning logic.
Narayan Kamath [Thu, 1 May 2014 14:00:46 +0000 (14:00 +0000)]
am
bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '
bcc3b312b0662ae2f8b8444eaedd5f35fc75c411':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Thu, 1 May 2014 14:00:43 +0000 (14:00 +0000)]
am
2a9a0471: Merge "Package manager changes for dual zygote stack."
* commit '
2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
Package manager changes for dual zygote stack.
Narayan Kamath [Thu, 1 May 2014 13:57:21 +0000 (13:57 +0000)]
am
99253c2d: am
fde59428: Merge "Handle /oem and /vendor as well"
* commit '
99253c2da945cbd4725efced6cac2dc40c858d6c':
Handle /oem and /vendor as well
Narayan Kamath [Thu, 1 May 2014 13:57:17 +0000 (13:57 +0000)]
am
a7b465ef: am
d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '
a7b465efc4eede46b8dfc8932c6c30346e8e79de':
Support per-package lib dirs for bundled apps
Narayan Kamath [Thu, 1 May 2014 13:57:13 +0000 (13:57 +0000)]
am
9f34234f: am
b916d8ad: Merge "Implement FileUtils#contains."
* commit '
9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
Implement FileUtils#contains.
Narayan Kamath [Thu, 1 May 2014 13:56:58 +0000 (13:56 +0000)]
Merge "Don't adjust ABI if PackageSetting#pkg is null."
Narayan Kamath [Thu, 1 May 2014 13:56:59 +0000 (13:56 +0000)]
am
645a920f: Merge "Fix OEM native library path bug."
* commit '
645a920fd2c478c545c6bb659f2eab36545fe116':
Fix OEM native library path bug.
Narayan Kamath [Thu, 1 May 2014 13:56:56 +0000 (13:56 +0000)]
am
986b901a: Merge "Fix native-lib dir assignment & updating"
* commit '
986b901ae280928e91193527f7c883b296fc62fc':
Fix native-lib dir assignment & updating
Narayan Kamath [Wed, 30 Apr 2014 12:33:38 +0000 (13:33 +0100)]
Don't adjust ABI if PackageSetting#pkg is null.
If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.
NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.
(cherry picked from commit
6609990e35b11c38f55f6e632160d4f2ff201ea3)
Change-Id: Ibace7849485865054e062d2b979f320bf89ff0f3
Narayan Kamath [Thu, 1 May 2014 13:56:34 +0000 (13:56 +0000)]
Merge "Fix dex file pruning logic."
Narayan Kamath [Tue, 29 Apr 2014 15:49:27 +0000 (16:49 +0100)]
Fix dex file pruning logic.
We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.
(cherry picked from commit
51a6f9253399588eedf77d75c578d9aa23d11529)
Change-Id: I536dfdc48e94155e7be64eb4efd9f7f2a1d2d00a
Narayan Kamath [Thu, 1 May 2014 13:55:48 +0000 (13:55 +0000)]
Merge "Adjust instruction sets for shared UID apps."
Narayan Kamath [Mon, 28 Apr 2014 13:18:34 +0000 (14:18 +0100)]
Adjust instruction sets for shared UID apps.
Since shared UID apps are run in the same process,
we'll need to make sure they're compiled for the same
instruction set.
This change implements the recompilation of apps that
don't have any ABI constraints.
Apps that *do* have ABI constraints are harder to deal
with, since we'll need to rescan them to figure out the
full list of ABIs they support and then re-extract the
native libraries from these apps once we find an ABI we
can use throughout.
(cherry picked from commit
85703d58af1dac692d7d83c03220e45ab2a5aded)
Change-Id: I8311a683468488cc7e30381965487a3d391609ae
Narayan Kamath [Thu, 1 May 2014 13:55:05 +0000 (13:55 +0000)]
Merge "Package manager changes for dual zygote stack."
Narayan Kamath [Thu, 1 May 2014 10:41:20 +0000 (11:41 +0100)]
Package manager changes for dual zygote stack.
- Pass down the app's instruction set to dexopt so that
it can compile the dex file for the right architecture.
- Also pass down the app's instruction set to rmdex, movedex
and getSize so that they can construct the cache file
location properly.
- Temporarily compile "system" jars such as am,wm etc. for
both architectures. A follow up change will ensure that
they're compiled only for one architecture (the same
arch. as the system server).
- Java "shared" libraries are now compiled for the right
architecture when an app requires them.
- Improve the app native library ABI detection to account
for system apps installed in /system/lib{64}/<packagename>
and also handle sdcard and forward locked apps correctly.
(cherry-picked from commit
b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
Narayan Kamath [Thu, 1 May 2014 13:53:08 +0000 (13:53 +0000)]
am
fde59428: Merge "Handle /oem and /vendor as well"
* commit '
fde594288bff0b8f95567e6b27f273f50f0c5f87':
Handle /oem and /vendor as well
Narayan Kamath [Thu, 1 May 2014 13:52:59 +0000 (13:52 +0000)]
am
d91358b2: Merge "Support per-package lib dirs for bundled apps"
* commit '
d91358b2b977ef7c3551a486f51475c0441aba6e':
Support per-package lib dirs for bundled apps
Narayan Kamath [Thu, 1 May 2014 13:52:55 +0000 (13:52 +0000)]
am
b916d8ad: Merge "Implement FileUtils#contains."
* commit '
b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
Implement FileUtils#contains.
Narayan Kamath [Thu, 1 May 2014 13:52:44 +0000 (13:52 +0000)]
Merge "Fix OEM native library path bug."
Jeff Sharkey [Thu, 24 Apr 2014 21:11:08 +0000 (14:11 -0700)]
Fix OEM native library path bug.
Bug:
13340779
(cherry picked from commit
7d3328d14bbbee01a9de1ff5b13b0446c709d835)
Change-Id: I1b4c5d138cafe3651d475ca1e048f495ff6c5f10
Narayan Kamath [Thu, 1 May 2014 13:52:16 +0000 (13:52 +0000)]
Merge "Fix native-lib dir assignment & updating"
Christopher Tate [Wed, 23 Apr 2014 23:55:57 +0000 (16:55 -0700)]
Fix native-lib dir assignment & updating
The per-package /system/lib/* feature introduced bugs in the
native library path handling during app upgrade installs. The
crux of the fix is that when recalulating the desired native
library directory, the basis for the calculation needs to be
the scanned APK's location rather than the extant package
settings entry -- because that entry refers to the pre-upgrade
state of the application, not the new state.
Bug
14233983
(cherry picked from commit
353e39a973dbbadce82fee2f83ad194e04a47449)
Change-Id: I26f17a596ca2cd7f963955c0642548c15138ae26
Narayan Kamath [Thu, 1 May 2014 13:51:44 +0000 (13:51 +0000)]
Merge "Handle /oem and /vendor as well"
Christopher Tate [Fri, 18 Apr 2014 19:24:57 +0000 (12:24 -0700)]
Handle /oem and /vendor as well
Bug
13170859
(cherry-picked from commit
740888f62eae158d5775be716620f0d56d87f587)
Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
Narayan Kamath [Thu, 1 May 2014 13:51:08 +0000 (13:51 +0000)]
Merge "Support per-package lib dirs for bundled apps"
Narayan Kamath [Thu, 1 May 2014 12:35:34 +0000 (13:35 +0100)]
Support per-package lib dirs for bundled apps
Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories. Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.
"apkname" here is the base name of the physical APK that holds the
package's code. For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider
Bug
13170859
(cherry picked from commit
addfbdc09ccf258395db8bfc510989a4c583f7ab)
Change-Id: Id82da78024a6325458b8b134d7d91ad0e5f0785e
Narayan Kamath [Thu, 1 May 2014 13:50:35 +0000 (13:50 +0000)]
Merge "Implement FileUtils#contains."
Narayan Kamath [Thu, 1 May 2014 13:01:44 +0000 (14:01 +0100)]
Implement FileUtils#contains.
Partial cherry-pick of changes
4ca728c0 and
21de56a9, which
can't be cherry-picked due to their large surface area.
Change-Id: Ife46e150d360cd5241dea93863141749233c1805
Narayan Kamath [Thu, 1 May 2014 10:43:23 +0000 (10:43 +0000)]
am
c8a045d4: am
41f40581: Merge "Fix x86 build in app_process."
* commit '
c8a045d451522adab5226b0063f3a15d34542bf7':
Fix x86 build in app_process.
Narayan Kamath [Thu, 1 May 2014 10:43:19 +0000 (10:43 +0000)]
am
ff34f6fa: am
27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit '
ff34f6faaad21f5f72decc0b6a0bbde8dab68e29':
Create arch specific cache dirs during zygote startup.
Narayan Kamath [Thu, 1 May 2014 10:39:55 +0000 (10:39 +0000)]
am
41f40581: Merge "Fix x86 build in app_process."
* commit '
41f40581ee0284660d30be8ef28f6bf721c4ce10':
Fix x86 build in app_process.
Narayan Kamath [Thu, 1 May 2014 10:39:52 +0000 (10:39 +0000)]
am
27b03e62: Merge "Create arch specific cache dirs during zygote startup."
* commit '
27b03e6272479ed82762a4a5d6e4be4f26c1ed58':
Create arch specific cache dirs during zygote startup.
Narayan Kamath [Thu, 1 May 2014 10:36:31 +0000 (10:36 +0000)]
Merge "Fix x86 build in app_process."
Narayan Kamath [Thu, 1 May 2014 10:36:27 +0000 (10:36 +0000)]
Merge "Create arch specific cache dirs during zygote startup."
Narayan Kamath [Wed, 30 Apr 2014 15:45:07 +0000 (16:45 +0100)]
Fix x86 build in app_process.
Look for __i386__ and not __x86__.
(cherry picked from commit
47d526217b3fd0d17ba751c66d25cfaf1c6ed7cd)
Change-Id: I848ba351c378e59ab6744ca1983ae4463ae75ba4
Narayan Kamath [Fri, 25 Apr 2014 10:43:22 +0000 (11:43 +0100)]
Create arch specific cache dirs during zygote startup.
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.
(cherry picked from commit
da738713e4e2120a324e8ab6fd11aa0e54a3c66e)
Change-Id: I7472aa25c16a1cf95791af2bdf80ed0d73123872
Narayan Kamath [Thu, 1 May 2014 10:22:56 +0000 (10:22 +0000)]
am
70344223: am
fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '
703442238200c2f1a35b51e7aadc693322feb69d':
Fix broken logging in Zygote.cpp.
Narayan Kamath [Thu, 1 May 2014 10:18:11 +0000 (10:18 +0000)]
am
fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '
fbb0ab02bed5c49159acb3dba6848a154e524169':
Fix broken logging in Zygote.cpp.
Narayan Kamath [Thu, 1 May 2014 10:15:00 +0000 (10:15 +0000)]
Merge "Fix broken logging in Zygote.cpp."
Narayan Kamath [Mon, 14 Apr 2014 13:46:07 +0000 (14:46 +0100)]
Fix broken logging in Zygote.cpp.
- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
only if the *first* call to waitpid returned ECHILD.
Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
Robert Ly [Thu, 1 May 2014 09:42:08 +0000 (09:42 +0000)]
am
b76f7b35: am
8873025b: am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
b76f7b35db0040591492f026d0dc17678141b6cf':
update wear stack notifications to coincide with devbyte code
Robert Ly [Thu, 1 May 2014 09:37:01 +0000 (09:37 +0000)]
am
8873025b: am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
8873025b2a52ca1ecccfaa9840e82681e17900d4':
update wear stack notifications to coincide with devbyte code
Robert Ly [Thu, 1 May 2014 08:22:05 +0000 (08:22 +0000)]
am
f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
* commit '
f26a71003de069355931eab340433ba8345ba3f7':
update wear stack notifications to coincide with devbyte code
Robert Ly [Thu, 1 May 2014 07:27:22 +0000 (07:27 +0000)]
Merge "update wear stack notifications to coincide with devbyte code" into klp-docs
Robert Ly [Thu, 1 May 2014 07:23:42 +0000 (00:23 -0700)]
update wear stack notifications to coincide with devbyte code
Change-Id: I4ccfc39eb47c938b9c1e9ba9309aaba54319f53b
Mark Renouf [Thu, 1 May 2014 00:50:30 +0000 (20:50 -0400)]
SwipeDismiss: limit fade to 50% alpha while swiping
BUG:
14319825
Change-Id: I3704fab77f2d3660ae374bdf16c767c124dcb8e9
Ricardo Cervera [Wed, 30 Apr 2014 22:40:00 +0000 (22:40 +0000)]
am
8bef5ea7: am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
8bef5ea70161586287ec06e9bd74b30604cd3f2c':
docs: Added release notes for Android Studio 0.5.2
Ricardo Cervera [Wed, 30 Apr 2014 22:03:40 +0000 (22:03 +0000)]
am
27515952: am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
27515952f54a8c98eaec694ce74c3b9d9b152746':
docs: Added release notes for Android Studio 0.5.2
Ricardo Cervera [Wed, 30 Apr 2014 21:59:19 +0000 (21:59 +0000)]
am
ba333f2f: docs: Added release notes for Android Studio 0.5.2
* commit '
ba333f2f4c2ca5325b4df1b131c6c26a18beb877':
docs: Added release notes for Android Studio 0.5.2
Ricardo Cervera [Tue, 29 Apr 2014 00:52:55 +0000 (17:52 -0700)]
docs: Added release notes for Android Studio 0.5.2
Change-Id: Ia364620d0ab14648b4db523890c529a0dc5b940d
Elliott Hughes [Wed, 30 Apr 2014 21:35:45 +0000 (21:35 +0000)]
am
6a6979ad: am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
6a6979ad17dfb492fb85a979e8f8688e4ed973b2':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:33:06 +0000 (21:33 +0000)]
am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
86315c452b955bf0b874f45c1a2e15aedda91a52':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:29:52 +0000 (21:29 +0000)]
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
Deepanshu Gupta [Wed, 30 Apr 2014 20:38:49 +0000 (20:38 +0000)]
am
c046c767: am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c046c76739b210d912dae38bf945d60b8d69ab11':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 20:35:04 +0000 (20:35 +0000)]
am
c0c96012: am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
c0c96012c667d1d91d8f6b763df45e566cae0eaf':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 20:31:35 +0000 (20:31 +0000)]
am
4b5fa4d3: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
4b5fa4d318e7efaffdc678e0cb8953ffc78c2b1e':
Fix class name for OverflowMenuButton [DO NOT MERGE]
Mindy Pereira [Wed, 30 Apr 2014 19:46:07 +0000 (19:46 +0000)]
am
11b715da: Merge "Make touch slop region smaller for watch" into klp-modular-dev
* commit '
11b715da9be818eb4a1c7a3d77b5d0c4ff03e5a2':
Make touch slop region smaller for watch
Mindy Pereira [Wed, 30 Apr 2014 19:43:58 +0000 (19:43 +0000)]
Merge "Make touch slop region smaller for watch" into klp-modular-dev
Michael Wright [Wed, 30 Apr 2014 19:11:05 +0000 (19:11 +0000)]
am
809c3698: am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
809c369892ddbae908dc47e6a1032a768e9004cb':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Elliott Hughes [Wed, 30 Apr 2014 19:07:01 +0000 (19:07 +0000)]
am
91ff3c18: am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
Fix for native leaks in YuvToJpegEncoder.cpp
Michael Wright [Wed, 30 Apr 2014 19:06:40 +0000 (19:06 +0000)]
am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
54c3529b4d3f86488799caa0e62a1f3929a79a39':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Michael Wright [Wed, 30 Apr 2014 19:02:56 +0000 (19:02 +0000)]
Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
Elliott Hughes [Wed, 30 Apr 2014 19:02:53 +0000 (19:02 +0000)]
am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
Fix for native leaks in YuvToJpegEncoder.cpp
Elliott Hughes [Wed, 30 Apr 2014 18:59:54 +0000 (18:59 +0000)]
Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
Igor Viarheichyk [Wed, 30 Apr 2014 18:56:42 +0000 (11:56 -0700)]
Fixes issue causing pseudolocalization of strings
in non-translatable resource files.
Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
Mindy Pereira [Wed, 30 Apr 2014 18:36:59 +0000 (11:36 -0700)]
Make touch slop region smaller for watch
Change-Id: I3ebe8855b13648dea5f9a374ec4daae6271f22db
Baligh Uddin [Wed, 30 Apr 2014 16:48:51 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1ccf4c1b33a7aa11cbf76dd86a2dd13be3f31ab9
Auto-generated-cl: translation import
Narayan Kamath [Wed, 30 Apr 2014 15:37:58 +0000 (15:37 +0000)]
am
414d9405: am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
414d94059f3559b67b4da25a34de6d5312abe06f':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:37:44 +0000 (15:37 +0000)]
am
dbbf431b: am
d0f7f418: Merge "Freeing frame map"
* commit '
dbbf431b289bb7a01b43db3412ecab00abe18362':
Freeing frame map
Narayan Kamath [Wed, 30 Apr 2014 15:13:02 +0000 (15:13 +0000)]
am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:12:58 +0000 (15:12 +0000)]
am
d0f7f418: Merge "Freeing frame map"
* commit '
d0f7f41828493b0679e908f7bb3ed3b8e838c463':
Freeing frame map
Narayan Kamath [Wed, 30 Apr 2014 13:34:04 +0000 (13:34 +0000)]
Merge "Cast CallVoidMethod's size_t parameters to jint"
Narayan Kamath [Wed, 30 Apr 2014 10:58:30 +0000 (10:58 +0000)]
Merge "Freeing frame map"
Mykola Kondratenko [Tue, 15 Apr 2014 07:35:44 +0000 (09:35 +0200)]
Freeing frame map
FileMap memory is never released until application exit
Release it now as the texture is already loaded and the memory
used for the packed resource can be released.
Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
Allen Shen [Tue, 29 Apr 2014 08:16:29 +0000 (16:16 +0800)]
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer
Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
Deepanshu Gupta [Wed, 30 Apr 2014 02:37:01 +0000 (19:37 -0700)]
Fix class name for OverflowMenuButton [DO NOT MERGE]
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
Bill Yi [Wed, 30 Apr 2014 01:55:23 +0000 (01:55 +0000)]
am
9a76e9ba: Fix build error
* commit '
9a76e9ba1adbdf7cc431b1e6fe454cf0c5d900de':
Fix build error
Bill Yi [Wed, 30 Apr 2014 01:52:48 +0000 (18:52 -0700)]
Fix build error
Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
Michael Wright [Wed, 30 Apr 2014 01:24:32 +0000 (01:24 +0000)]
am
263c36a1: am
ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '
263c36a144a66d30dd51abd7ca0120480e449aa5':
NULL previous background bitmap upon changing wallpaper
Michael Wright [Wed, 30 Apr 2014 01:22:05 +0000 (01:22 +0000)]
am
ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '
ade631eed0df228e343f2a00db653058ff588846':
NULL previous background bitmap upon changing wallpaper
Michael Wright [Wed, 30 Apr 2014 01:19:56 +0000 (01:19 +0000)]
am
10884694: am
357c75e7: Merge "Add missing character combinations for international layouts"
* commit '
108846942f4296fa12b09dd70d60a21c69deace2':
Add missing character combinations for international layouts