OSDN Git Service
Greg Hackmann [Tue, 17 Dec 2013 20:09:09 +0000 (20:09 +0000)]
am
f1bdbdd1: resolved conflicts for merge of
08579921 to klp-modular-dev
* commit '
f1bdbdd1bea9662f6731b7a366de1f602f43e5a9':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 19:56:22 +0000 (11:56 -0800)]
resolved conflicts for merge of
08579921 to klp-modular-dev
Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117
Zhijun He [Tue, 17 Dec 2013 18:38:54 +0000 (18:38 +0000)]
Merge "Camera2: Update metadata java docs"
Zhijun He [Tue, 17 Dec 2013 18:35:40 +0000 (10:35 -0800)]
Camera2: Update metadata java docs
Java docs for below keys are updated:
- android.edge.mode
- android.noiseReduction.mode
Bug:
12135317
Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
Greg Hackmann [Tue, 17 Dec 2013 18:24:40 +0000 (18:24 +0000)]
am
552eba80: am
153ec6ca: am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
552eba80ef8f48204e77129dd99581d8f0ac3831':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:22:24 +0000 (18:22 +0000)]
am
153ec6ca: am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
153ec6cae7db2053c71541af8973244f0dbf6d4a':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:19:04 +0000 (18:19 +0000)]
am
060ae1db: am
eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '
060ae1db7bba39cb8171f4267b5de9538f1ab440':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 18:18:58 +0000 (18:18 +0000)]
am
3545433d: am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
3545433d052769417dcdd70bc59fbf31f9925ba4':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:15:33 +0000 (10:15 -0800)]
am
eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit '
eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
Add timerfd backend to AlarmManagerService
Greg Hackmann [Tue, 17 Dec 2013 18:15:29 +0000 (10:15 -0800)]
am
9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '
9f4e67c50b5c311adeaaf6135ef79214a46d0e26':
Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
Greg Hackmann [Tue, 17 Dec 2013 18:10:49 +0000 (18:10 +0000)]
Merge "Add timerfd backend to AlarmManagerService"
Greg Hackmann [Tue, 17 Dec 2013 18:10:32 +0000 (18:10 +0000)]
Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
Baligh Uddin [Tue, 17 Dec 2013 17:23:42 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Dec 2013 17:23:38 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Dec 2013 17:23:33 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Craig Mautner [Tue, 17 Dec 2013 16:51:58 +0000 (16:51 +0000)]
am
4e09cb9b: am
38bcf6dc: am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
4e09cb9bf6165f68b42549772b74596ceb6198fe':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:48:46 +0000 (16:48 +0000)]
am
38bcf6dc: am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
38bcf6dc8784625eb4b68634450c578719346669':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:45:06 +0000 (16:45 +0000)]
am
422d7003: am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
422d7003db8d26b5fa503aa294348d7b53621db1':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:42:31 +0000 (08:42 -0800)]
am
f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '
f431daa22811fdce9c4ec975d5d33121898b4f9b':
Fix to NullPointerException on move back in ActivityStack.
Craig Mautner [Tue, 17 Dec 2013 16:36:44 +0000 (16:36 +0000)]
Merge "Fix to NullPointerException on move back in ActivityStack."
Daniel 2 Olofsson [Mon, 16 Dec 2013 12:24:25 +0000 (13:24 +0100)]
Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.
TaskRecord task may be set to null when no resumed activity remain.
Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.
The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.
Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.
To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.
Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.
Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
Scott Main [Tue, 17 Dec 2013 02:53:54 +0000 (02:53 +0000)]
am
1ba5915d: am
a759b3d2: am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
1ba5915dd09675485d55536301fdd7d80a305504':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:50:20 +0000 (02:50 +0000)]
am
a759b3d2: am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
a759b3d2b4c822a735a3a023be9b484cc05e0b19':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:47:50 +0000 (02:47 +0000)]
am
3fca61f0: am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
3fca61f073b89136396022d78f444d0a50c1a0d3':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:45:00 +0000 (18:45 -0800)]
am
75b8b3e0: am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
75b8b3e008589c0a02c27d5baa6b3314a020f505':
add new training course for Interaction and Engagement
Alan Viverette [Tue, 17 Dec 2013 02:13:09 +0000 (02:13 +0000)]
Merge "Fix stroke color in GradientState.initializeWithState()"
Scott Main [Tue, 17 Dec 2013 02:06:05 +0000 (02:06 +0000)]
am
ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '
ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
add new training course for Interaction and Engagement
Scott Main [Tue, 17 Dec 2013 02:03:40 +0000 (02:03 +0000)]
Merge "add new training course for Interaction and Engagement" into klp-docs
Alan Viverette [Tue, 17 Dec 2013 01:55:08 +0000 (17:55 -0800)]
Fix stroke color in GradientState.initializeWithState()
BUG:
12175674
Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
Shishir Agrawal [Tue, 17 Dec 2013 01:47:14 +0000 (01:47 +0000)]
Chris Craik [Tue, 17 Dec 2013 01:37:57 +0000 (01:37 +0000)]
Merge "Use vertex assignment instead of manual copy"
Craig Mautner [Tue, 17 Dec 2013 01:35:09 +0000 (01:35 +0000)]
am
3b475fef: Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
* commit '
3b475fefa3b83ce49454936a0be3081753e3e8ad':
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
Shishir Agrawal [Tue, 17 Dec 2013 01:32:56 +0000 (17:32 -0800)]
Fixing build breakage due to:
c4d41755d73ffe85d179d42a4f0c993b49303145
Mismatched @param in javadoc.
Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
Alan Viverette [Tue, 17 Dec 2013 01:20:22 +0000 (01:20 +0000)]
Merge "Replace auto-create in findViewById() with explicit create() API"
Chris Craik [Tue, 17 Dec 2013 01:08:15 +0000 (17:08 -0800)]
Use vertex assignment instead of manual copy
Change-Id: I36c806e3370abca61e5bf5064f0f1a776a9ce487
Zhijun He [Tue, 17 Dec 2013 00:56:35 +0000 (16:56 -0800)]
camera2: update java docs for metadata tag spec update
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode
Bug:
12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Craig Mautner [Tue, 17 Dec 2013 00:50:19 +0000 (00:50 +0000)]
Merge "Fix incorrect setting of TaskRecord.frontOfTask"
Shishir Agrawal [Tue, 17 Dec 2013 00:44:40 +0000 (00:44 +0000)]
Merge "Adding support for SIM communication from Android over logical channels."
Greg Hackmann [Tue, 10 Dec 2013 00:56:53 +0000 (16:56 -0800)]
Add timerfd backend to AlarmManagerService
On devices without /dev/alarm, use a new backend based on timerfd.
timerfd has near-equivalent syscalls for the /dev/alarm ioctls we care
about, with two key differences:
1) /dev/alarm uses one fd for all clocks, while timerfd needs one fd per
clock type.
AlarmManagerService addresses this by replacing the fd (int) with an
opaque pointer (long) to the backend-specific state.
2) When the RTC changes, the /dev/alarm WAIT ioctl always returns, while
timerfd cancels (and signals events) only on specially-flagged RTC
timerfds.
The timerfd backend masks this by creating an extraneous RTC timerfd,
specifically so there's always something to signal on RTC changes.
Change-Id: I5aef867748298610347f6e1479dd8bf569495832
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Chris Craik [Tue, 17 Dec 2013 00:11:28 +0000 (00:11 +0000)]
Merge "Create private properties on GLCanvas for experimentation with 3d"
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask
When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.
Fixes bug
12171535.
Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70
Alan Viverette [Mon, 16 Dec 2013 23:49:35 +0000 (23:49 +0000)]
Merge "Refactor display adjustments into their own utils class"
Alan Viverette [Mon, 16 Dec 2013 23:36:49 +0000 (23:36 +0000)]
Merge "Don't cast FastScroller adapter to BaseAdapter"
Trevor Johns [Mon, 16 Dec 2013 23:27:57 +0000 (23:27 +0000)]
am
b8928b05: am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
b8928b05932f9592cfeeb9c3cdc96c4066de2d55':
Docs: Clean up HCE dev guide
Scott Main [Mon, 16 Dec 2013 23:27:51 +0000 (23:27 +0000)]
Elliott Hughes [Mon, 16 Dec 2013 23:27:39 +0000 (23:27 +0000)]
am
3bfc6e76: am
c0d6028f: am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
3bfc6e76e627d4122a774488f36fb843bb3694fb':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Christopher Tate [Mon, 16 Dec 2013 23:27:30 +0000 (23:27 +0000)]
am
409b7c98: (-s ours) am
4275cae4: am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
409b7c98b47cb7ece2760aa53730233f54946e46':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Trevor Johns [Mon, 16 Dec 2013 23:05:48 +0000 (23:05 +0000)]
am
987ac90d: am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 23:02:44 +0000 (23:02 +0000)]
am
ed8d921a: am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
ed8d921a2e8feae859bb1899356a936eb84fe50f':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:59:19 +0000 (14:59 -0800)]
am
eec66178: am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
eec66178668d22910d3889e62087b3797ebf6dd2':
Docs: Clean up HCE dev guide
Chris Craik [Mon, 16 Dec 2013 01:10:19 +0000 (17:10 -0800)]
Create private properties on GLCanvas for experimentation with 3d
Change-Id: I17772f61efce727cb4c1111f4d97f58c741786b8
Trevor Johns [Mon, 16 Dec 2013 22:56:38 +0000 (22:56 +0000)]
am
73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit '
73c1681b2f557dfba09a2e1a071dec190dd05e36':
Docs: Clean up HCE dev guide
Trevor Johns [Mon, 16 Dec 2013 22:43:47 +0000 (22:43 +0000)]
Merge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Fri, 13 Dec 2013 04:09:14 +0000 (20:09 -0800)]
Docs: Clean up HCE dev guide
Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.
Issue:
11991294
Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
Robert Shih [Mon, 16 Dec 2013 22:35:28 +0000 (22:35 +0000)]
Merge "MediaController does not check for cancelled motions in onTouchEvent, causing nested invocations of WindowManagerGlobal.addView. Sample stack trace below."
Alan Viverette [Mon, 16 Dec 2013 21:45:39 +0000 (13:45 -0800)]
Refactor display adjustments into their own utils class
Change-Id: Iddc413d7841d44b00e06ed1c5a02d54eb60858df
Igor Murashkin [Mon, 16 Dec 2013 21:41:02 +0000 (21:41 +0000)]
Merge "camera2: Add support for embedding images into javadoc"
Scott Main [Mon, 16 Dec 2013 21:38:11 +0000 (21:38 +0000)]
Scott Main [Mon, 16 Dec 2013 21:34:58 +0000 (21:34 +0000)]
Scott Main [Mon, 16 Dec 2013 21:31:45 +0000 (13:31 -0800)]
Scott Main [Mon, 16 Dec 2013 21:29:18 +0000 (21:29 +0000)]
Scott Main [Mon, 16 Dec 2013 21:22:08 +0000 (13:22 -0800)]
fix typo
bug:
12174614
Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
Scott Main [Tue, 10 Dec 2013 02:02:48 +0000 (18:02 -0800)]
add new training course for Interaction and Engagement
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
Elliott Hughes [Mon, 16 Dec 2013 21:07:24 +0000 (21:07 +0000)]
am
c0d6028f: am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Elliott Hughes [Mon, 16 Dec 2013 21:04:50 +0000 (21:04 +0000)]
am
a012fee3: am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
a012fee3c31803799176f3efb75cf2f929eeb062':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Elliott Hughes [Mon, 16 Dec 2013 21:01:19 +0000 (13:01 -0800)]
am
5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
* commit '
5d6332e3744e37ced079e5360f1fa3e0e5681d57':
AArch64: Use long for pointers in MediaDrm and MediaMuxer
Christopher Tate [Mon, 16 Dec 2013 20:58:11 +0000 (20:58 +0000)]
am
4275cae4: am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
4275cae4084cff0e267d9e0d63b968aa0788909a':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Elliott Hughes [Mon, 16 Dec 2013 20:58:01 +0000 (20:58 +0000)]
Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Christopher Tate [Mon, 16 Dec 2013 20:52:13 +0000 (20:52 +0000)]
am
e998b607: am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
e998b6076532daaa9c2c621a09a04d67a75a5ad0':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Christopher Tate [Mon, 16 Dec 2013 20:49:55 +0000 (12:49 -0800)]
am
6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit '
6040bd47f41fd56ee608f6a80a0babe942ea1df3':
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
Christopher Tate [Mon, 16 Dec 2013 20:44:33 +0000 (20:44 +0000)]
Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Igor Murashkin [Wed, 11 Dec 2013 21:31:38 +0000 (13:31 -0800)]
camera2: Add support for embedding images into javadoc
- Also finishes specifying CaptureResult#LENS_SHADING_MAP family
Bug:
12135317
Change-Id: I95ffd61872fefcf2c79cb4f5aa0740162ccc16ad
John Reck [Mon, 16 Dec 2013 18:55:22 +0000 (18:55 +0000)]
Merge "Add drawGlFunctor support to RenderThread"
Andres Morales [Mon, 16 Dec 2013 18:50:23 +0000 (18:50 +0000)]
Merge "Adding accessor for integer tech codes to Tag"
Nick Kralevich [Mon, 16 Dec 2013 18:47:03 +0000 (18:47 +0000)]
am
fc800d40: am
fbd6d5a8: am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
fc800d407d695926ba07299c4e27d1e06284098f':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Andres Morales [Fri, 13 Dec 2013 00:37:09 +0000 (16:37 -0800)]
Adding accessor for integer tech codes to Tag
Change-Id: I02c272acc9744756677afa8a9d1dca7f1e63ca50
Nick Kralevich [Mon, 16 Dec 2013 18:44:04 +0000 (18:44 +0000)]
am
fbd6d5a8: am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Nick Kralevich [Mon, 16 Dec 2013 18:41:03 +0000 (18:41 +0000)]
am
09fdc159: am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
09fdc159552c85032ce9860fc0d63b6eebeca82a':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Baligh Uddin [Mon, 16 Dec 2013 18:40:38 +0000 (10:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I592a031d629ff17b22100ca6a26c19b97c9cbb5e
Auto-generated-cl: translation import
Katie McCormick [Mon, 16 Dec 2013 18:39:25 +0000 (18:39 +0000)]
am
0f3390f8: am
c4927389: am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:36:41 +0000 (18:36 +0000)]
am
c4927389: am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
c49273895ea96da5d88c806fb6acd4a92b963f84':
Doc update: clarify version of flags.
Nick Kralevich [Mon, 16 Dec 2013 18:36:39 +0000 (10:36 -0800)]
am
3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '
3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Baligh Uddin [Mon, 16 Dec 2013 18:34:17 +0000 (10:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic32f2159f154aa071ff855f9ea8b9c9e5c69e2f8
Auto-generated-cl: translation import
Katie McCormick [Mon, 16 Dec 2013 18:33:42 +0000 (18:33 +0000)]
am
1e609ac4: am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
1e609ac45df13fed93df81e805ea6d6485da3aa0':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:29:57 +0000 (10:29 -0800)]
am
4e6c5408: am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
Doc update: clarify version of flags.
Nick Kralevich [Mon, 16 Dec 2013 18:28:42 +0000 (18:28 +0000)]
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Katie McCormick [Mon, 16 Dec 2013 18:28:00 +0000 (18:28 +0000)]
am
c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '
c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
Doc update: clarify version of flags.
Katie McCormick [Mon, 16 Dec 2013 18:25:12 +0000 (18:25 +0000)]
Merge "Doc update: clarify version of flags." into klp-docs
Baligh Uddin [Mon, 16 Dec 2013 18:08:38 +0000 (10:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1dbccd0aee68a031d7259302a3bdf2526b066449
Auto-generated-cl: translation import
ztenghui [Mon, 16 Dec 2013 17:18:12 +0000 (17:18 +0000)]
Merge "Calculate and show Ambient shadow."
Narayan Kamath [Mon, 16 Dec 2013 15:29:39 +0000 (15:29 +0000)]
am
1dfe7990: am
8f90e476: am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
1dfe799027383bb0f2c2f38facca631d4968de8e':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:26:41 +0000 (15:26 +0000)]
am
8f90e476: am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
8f90e47694b441941fdf5f17fcb9927ec23fb50b':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:23:50 +0000 (15:23 +0000)]
am
28635ca3: am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
28635ca3e3815ca01417ef03dd9debd938e34307':
Use StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Mon, 16 Dec 2013 15:20:26 +0000 (07:20 -0800)]
am
44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '
44291d9c2722e0d22dc6f909585f4302abdce205':
Use StrictJarFile instead of JarFile for cert collection.
Robert Craig [Mon, 16 Dec 2013 14:42:51 +0000 (09:42 -0500)]
[bootanimation] Drop user loadable bootanimation.zip abiltiy.
A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.
Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Mårten Kongstad [Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)]
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
In commit
08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
- CONFIG_MCC = 0x0001,
- CONFIG_MNC = 0x0002,
+ CONFIG_MCC = ACONFIGURATION_MCC,
+ CONFIG_MNC = ACONFIGURATION_MCC,
This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.
Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
Narayan Kamath [Mon, 16 Dec 2013 11:29:45 +0000 (11:29 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."
Jesse Hall [Sun, 15 Dec 2013 00:25:52 +0000 (00:25 +0000)]
am
1add7894: am
97b3e43f: am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
1add78943fa4ce3e74103ce9ef60a18f86483fc2':
Fix incorrect name in eglSwapBuffers log wrapper
Jesse Hall [Sun, 15 Dec 2013 00:22:37 +0000 (00:22 +0000)]
am
97b3e43f: am
e2e15d6d: am
a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit '
97b3e43ff108cb4761450732fc02e4b69502b8a0':
Fix incorrect name in eglSwapBuffers log wrapper