OSDN Git Service
Ben Cheng [Wed, 2 Apr 2014 20:59:47 +0000 (20:59 +0000)]
am
b386bfd7: am
89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
* commit '
b386bfd791d77e24bcfe3261420f82b0a9d3851d':
Use default visibility for Snapshot::getLocalClip.
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."
Michael Wright [Wed, 2 Apr 2014 20:30:29 +0000 (20:30 +0000)]
am
4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
* commit '
4932a355f1594990173e0d9cd1fa38b8491c4a29':
Misc. buttons aren't gamepad keys.
Michael Wright [Wed, 2 Apr 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev
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
Narayan Kamath [Wed, 2 Apr 2014 10:41:24 +0000 (10:41 +0000)]
am
ea9e5eca: am
17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit '
ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
Move zygote startup logic to the frameworks.
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
Ricardo Cervera [Wed, 2 Apr 2014 00:20:22 +0000 (00:20 +0000)]
am
c013eaad: am
5a218b18: am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
c013eaad574bcb40152d90105d6fbc82293cbb11':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:15:31 +0000 (00:15 +0000)]
am
5a218b18: am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
5a218b186735534925d7fedb63f1c78a3a3ff543':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:08:11 +0000 (00:08 +0000)]
am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
8e183798d573ad4777a5f01fd6db8f86ca0e120f':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:03:00 +0000 (00:03 +0000)]
Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
Michael Kolb [Tue, 1 Apr 2014 22:54:30 +0000 (22:54 +0000)]
am
875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
* commit '
875eff832f9f496740ceba2f12de6f5423225274':
Add circular anti-aliasing mask to circular display
Michael Kolb [Tue, 1 Apr 2014 22:48:27 +0000 (22:48 +0000)]
Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
Michael Wright [Tue, 1 Apr 2014 22:43:43 +0000 (15:43 -0700)]
Misc. buttons aren't gamepad keys.
BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices. As such, we shouldn't treat them
as belonging to gamepads at all.
Bug:
13432364
Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4
Michael Kolb [Wed, 26 Mar 2014 23:24:17 +0000 (16:24 -0700)]
Add circular anti-aliasing mask to circular display
Bug:
13635645
Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService
Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
Jeff Tinker [Tue, 1 Apr 2014 22:00:49 +0000 (22:00 +0000)]
am
433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '
433a063309ba9ff9cdce4f9688e027c642a79505':
Support CAST V2 Authentication in MediaDrm
Craig Mautner [Tue, 1 Apr 2014 21:56:55 +0000 (21:56 +0000)]
am
2b6fe299: am
c70f15fe: am
2fc798a2: resolved conflicts for merge of
8c6e6e73 to klp-dev
* commit '
2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
Fix FLAG_DISMISS_KEYGUARD not working
Jeff Tinker [Tue, 1 Apr 2014 21:54:29 +0000 (21:54 +0000)]
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
Craig Mautner [Tue, 1 Apr 2014 21:48:04 +0000 (21:48 +0000)]
am
c70f15fe: am
2fc798a2: resolved conflicts for merge of
8c6e6e73 to klp-dev
* commit '
c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 21:41:15 +0000 (21:41 +0000)]
am
2fc798a2: resolved conflicts for merge of
8c6e6e73 to klp-dev
* commit '
2fc798a2270cda98366776af489d45c1043e831d':
Fix FLAG_DISMISS_KEYGUARD not working
Jeff Tinker [Tue, 4 Mar 2014 21:17:11 +0000 (13:17 -0800)]
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug:
12702350
Craig Mautner [Tue, 1 Apr 2014 20:57:37 +0000 (13:57 -0700)]
resolved conflicts for merge of
8c6e6e73 to klp-dev
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
Michael Kolb [Tue, 1 Apr 2014 20:46:38 +0000 (20:46 +0000)]
am
17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev
* commit '
17bbd976c0971f25447b2ce66117f08029dc2fa9':
Add outset to decor view measuring
Michael Kolb [Tue, 1 Apr 2014 20:40:34 +0000 (20:40 +0000)]
Merge "Add outset to decor view measuring" into klp-modular-dev
Craig Mautner [Tue, 1 Apr 2014 20:01:32 +0000 (20:01 +0000)]
am
13b75939: am
d4d2aa51: am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
13b75939596eec63c096fe9e85643b8c42a40b12':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:54:59 +0000 (19:54 +0000)]
am
d4d2aa51: am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
d4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:49:36 +0000 (19:49 +0000)]
am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:43:41 +0000 (19:43 +0000)]
am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
d1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:36:48 +0000 (19:36 +0000)]
am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
1cb3c1d381c389c7ef903c1a871ff695cd406da4':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:30:41 +0000 (19:30 +0000)]
am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
Fix FLAG_DISMISS_KEYGUARD not working
quddusc [Tue, 1 Apr 2014 19:29:52 +0000 (19:29 +0000)]
am
f425e5ea: am
c7f403f4: am
5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug:
13742301" into klp-docs
* commit '
f425e5ea05bf445ab97176fe4a79e54f976d22b8':
docs: Fixed outdated link to Google Analytics docs. Bug:
13742301
Scott Main [Tue, 1 Apr 2014 19:29:45 +0000 (19:29 +0000)]
am
c3796073: am
c8b6feb2: am
35682006: Merge "laptop image with redacted" into klp-docs
* commit '
c37960733aebed4ef4d64d72f7658534f9fd5698':
laptop image with redacted
Scott Main [Tue, 1 Apr 2014 19:29:41 +0000 (19:29 +0000)]
am
3bd0a44b: am
a7afd38f: am
1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
* commit '
3bd0a44bbf8de4dc1d190fffe91a10b8f1e2243f':
dashbaord update for 4/1/14
Ricardo Cervera [Tue, 1 Apr 2014 19:29:38 +0000 (19:29 +0000)]
am
bb755da9: am
c192cdd3: am
cf96f815: docs: Renamed the document on building with Android Studio
* commit '
bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
docs: Renamed the document on building with Android Studio
Craig Mautner [Tue, 1 Apr 2014 19:24:23 +0000 (19:24 +0000)]
am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
7bd0b65233d0ef34114ecb93d734dfe4351f470d':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:18:36 +0000 (19:18 +0000)]
am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
4bdab6bb4c55661d4915518b1190e30c4633c6a5':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:05:11 +0000 (12:05 -0700)]
Fix FLAG_DISMISS_KEYGUARD not working
Fixes bug
13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
quddusc [Tue, 1 Apr 2014 18:30:33 +0000 (18:30 +0000)]
am
c7f403f4: am
5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug:
13742301" into klp-docs
* commit '
c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
docs: Fixed outdated link to Google Analytics docs. Bug:
13742301
quddusc [Tue, 1 Apr 2014 18:24:38 +0000 (18:24 +0000)]
am
5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug:
13742301" into klp-docs
* commit '
5321e9bd48db680c618a490fb38c060c3c05beba':
docs: Fixed outdated link to Google Analytics docs. Bug:
13742301
quddusc [Tue, 1 Apr 2014 18:12:06 +0000 (18:12 +0000)]
Merge "docs: Fixed outdated link to Google Analytics docs. Bug:
13742301" into klp-docs
Scott Main [Tue, 1 Apr 2014 17:59:12 +0000 (17:59 +0000)]
am
c8b6feb2: am
35682006: Merge "laptop image with redacted" into klp-docs
* commit '
c8b6feb2007259cdc4053a9774e31847ee60d592':
laptop image with redacted
Scott Main [Tue, 1 Apr 2014 17:59:08 +0000 (17:59 +0000)]
am
a7afd38f: am
1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
* commit '
a7afd38f3021a15e0bd22674409c2cd6d83095c3':
dashbaord update for 4/1/14
quddusc [Tue, 1 Apr 2014 17:49:23 +0000 (10:49 -0700)]
docs: Fixed outdated link to Google Analytics docs.
Bug:
13742301
Change-Id: Idb439a38299be808cd1cd1d317d67efe78f785cc
Scott Main [Tue, 1 Apr 2014 17:52:36 +0000 (17:52 +0000)]
am
35682006: Merge "laptop image with redacted" into klp-docs
* commit '
356820063afa85c78dd7f7b9bce2b62169e490bc':
laptop image with redacted
Scott Main [Tue, 1 Apr 2014 17:52:33 +0000 (17:52 +0000)]
am
1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
* commit '
1afdbb93446cdc9238bf327155646950ae80dbe4':
dashbaord update for 4/1/14
Ricardo Cervera [Tue, 1 Apr 2014 17:49:40 +0000 (17:49 +0000)]
am
c192cdd3: am
cf96f815: docs: Renamed the document on building with Android Studio
* commit '
c192cdd3c4ad8696d5d77949984cf7e06445e051':
docs: Renamed the document on building with Android Studio
Scott Main [Tue, 1 Apr 2014 17:47:03 +0000 (17:47 +0000)]
Merge "laptop image with redacted" into klp-docs
Scott Main [Tue, 1 Apr 2014 17:46:37 +0000 (17:46 +0000)]
Merge "dashbaord update for 4/1/14" into klp-docs
Ricardo Cervera [Tue, 1 Apr 2014 17:46:16 +0000 (10:46 -0700)]
docs: Added notes to use the last SDK version to the Build your First App class.
Change-Id: I35820ff887b3d0f4ccc0ce7720576e3e692109b5
Ricardo Cervera [Tue, 1 Apr 2014 17:43:32 +0000 (17:43 +0000)]
am
cf96f815: docs: Renamed the document on building with Android Studio
* commit '
cf96f815854b87f8a2304fbaf5030d574671e6e0':
docs: Renamed the document on building with Android Studio
Scott Main [Tue, 1 Apr 2014 17:31:19 +0000 (10:31 -0700)]
dashbaord update for 4/1/14
Change-Id: Id38d8a448dc86afecc2e80dc6a5f4fdb26d7cc93
Ricardo Cervera [Tue, 1 Apr 2014 17:16:45 +0000 (10:16 -0700)]
docs: Renamed the document on building with Android Studio
Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
Scott Main [Tue, 1 Apr 2014 03:40:34 +0000 (20:40 -0700)]
laptop image with redacted
Change-Id: I89e6b37840757a53c38686a2cf69297e558ef6d0
Baligh Uddin [Tue, 1 Apr 2014 00:21:37 +0000 (00:21 +0000)]
am
8c3d3e82: (-s ours) am
53b3d44f: (-s ours) am
dc5e02bd: (-s ours) Import translations. DO NOT MERGE
* commit '
8c3d3e826932da75f5399baaf5bcbc3b1f3a9372':
Import translations. DO NOT MERGE
Katie McCormick [Tue, 1 Apr 2014 00:21:34 +0000 (00:21 +0000)]
am
905a5b14: am
87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '
905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
Doc Update: revert PendingIntent fix.
Baligh Uddin [Tue, 1 Apr 2014 00:15:57 +0000 (00:15 +0000)]
am
53b3d44f: (-s ours) am
dc5e02bd: (-s ours) Import translations. DO NOT MERGE
* commit '
53b3d44f524c162a18ca91034c90ac9f7e62e561':
Import translations. DO NOT MERGE
Katie McCormick [Tue, 1 Apr 2014 00:15:52 +0000 (00:15 +0000)]
am
87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '
87d9d1a0405e6cdbcd7c87cfebee04b622100753':
Doc Update: revert PendingIntent fix.
Jason Sams [Tue, 1 Apr 2014 00:15:26 +0000 (00:15 +0000)]
am
095ece10: am
b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
* commit '
095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
Fix RenderScriptGL setSurfaceTexture problem
Scott Main [Tue, 1 Apr 2014 00:12:56 +0000 (00:12 +0000)]
am
adcb288e: am
b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs
* commit '
adcb288e3890381c9961ee32a79df8e9d805a6ad':
update common intents guide to add calendar and alarms.
Baligh Uddin [Tue, 1 Apr 2014 00:12:47 +0000 (00:12 +0000)]
am
ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ee800b04d9ed625db93b1531eec0595838228e2f':
Import translations. DO NOT MERGE
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
Baligh Uddin [Tue, 1 Apr 2014 00:09:22 +0000 (00:09 +0000)]
am
dc5e02bd: (-s ours) Import translations. DO NOT MERGE
* commit '
dc5e02bdccbbc60ede21ae706f06c696b6983812':
Import translations. DO NOT MERGE
Scott Main [Tue, 1 Apr 2014 00:03:18 +0000 (00:03 +0000)]
am
b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs
* commit '
b1088bfe8d321f299d92736102b573963315dc26':
update common intents guide to add calendar and alarms.
Michael Kolb [Mon, 24 Mar 2014 23:18:52 +0000 (16:18 -0700)]
Add outset to decor view measuring
Change-Id: Ib0e68311ff8ed1fccf9219b28c42ee43c5952050
Jason Sams [Mon, 31 Mar 2014 23:21:42 +0000 (23:21 +0000)]
Merge "Fix RenderScriptGL setSurfaceTexture problem"
Katie McCormick [Mon, 31 Mar 2014 23:16:32 +0000 (16:16 -0700)]
Doc Update: revert PendingIntent fix.
Original fix was in error. Reverting. See:
b/
10641568
Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
Baligh Uddin [Mon, 31 Mar 2014 22:11:32 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Scott Main [Mon, 31 Mar 2014 21:47:45 +0000 (21:47 +0000)]
Merge "update common intents guide to add calendar and alarms." into klp-docs
Zhihai Xu [Mon, 31 Mar 2014 21:28:47 +0000 (21:28 +0000)]
am
ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
* commit '
ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
LE: Add API to configure MTU for a given connection (3/4)
Zhihai Xu [Mon, 31 Mar 2014 21:21:54 +0000 (21:21 +0000)]
Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
Nick Kralevich [Mon, 31 Mar 2014 20:20:41 +0000 (20:20 +0000)]
am
e531e2ec: am
3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
* commit '
e531e2ec6b311c35b077cc228e832b3f1530dffa':
Change when the SELinux relabel of /data/data occurs.
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:59:31 +0000 (19:59 +0000)]
am
b11952d6: am
e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit '
b11952d6f6851dbd1da447da967f6e07984942fe':
Improve detail message for X509TrustManagerExtensions argument validation
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"
Craig Stout [Mon, 31 Mar 2014 19:08:24 +0000 (19:08 +0000)]
am
ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
* commit '
ecaea7e60c0992ac295163f55c1f986a46eef008':
Force refresh of stateful when a child drawable is changed.
Craig Stout [Mon, 31 Mar 2014 19:02:25 +0000 (19:02 +0000)]
Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev
Baligh Uddin [Mon, 31 Mar 2014 18:37:11 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 18:34:59 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cd18ee1d77495f7294bdb4e836def0bb394d8f4
Auto-generated-cl: translation import
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:54:30 +0000 (13:54 +0100)]
resolved conflicts for merge of
439145f0 to klp-modular-dev-plus-aosp
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.
Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
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:48:27 +0000 (09:48 +0000)]
am
0e3f3c70: am
91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '
0e3f3c70226640759d5d705233fbe59f525355bb':
Cast CallMethod's size_t parameters to jint
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>
Jinsuk Kim [Mon, 31 Mar 2014 01:44:51 +0000 (01:44 +0000)]
am
41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
* commit '
41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
Replace individual methods with a consolidated CEC nativeSendmessage
Jinsuk Kim [Mon, 31 Mar 2014 01:40:30 +0000 (01:40 +0000)]
Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
Wink Saville [Sun, 30 Mar 2014 15:17:38 +0000 (15:17 +0000)]
am
44b43a51: am
1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"
* commit '
44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58':
GlobalActions: Fix Airplane Mode on/off issue
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"
Wei Wang [Sat, 29 Mar 2014 01:57:31 +0000 (01:57 +0000)]
am
4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '
4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
Wei Wang [Sat, 29 Mar 2014 01:53:33 +0000 (01:53 +0000)]
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
Wei Wang [Sat, 29 Mar 2014 01:40:29 +0000 (18:40 -0700)]
Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
OSDN Git Service
