8a1d4e97ad
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630
...
am: ca45737e27
2016-05-19 23:12:10 +00:00
ca45737e27
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e
...
am: 1f814d7630
2016-05-19 23:08:54 +00:00
1f814d7630
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f
...
am: 36acff7d7e
2016-05-19 23:06:06 +00:00
36acff7d7e
resolve merge conflicts of 86a28d0 to klp-modular-dev
...
am: a5bc59620f
2016-05-19 23:03:35 +00:00
a5bc59620f
resolve merge conflicts of 86a28d0 to klp-modular-dev
...
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
2016-05-19 15:47:25 -04:00
86a28d0aaf
DO NOT MERGE Use updated libpng API
...
am: 839b4e592a
2016-05-19 19:26:12 +00:00
839b4e592a
DO NOT MERGE Use updated libpng API
...
BUG:23265085
Change-Id: Ibc521fae11dad22283d8469329326ef79525b414
2016-05-17 20:28:54 +00:00
f4ee1720f3
Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29
...
am: 877dcba47a
2016-02-23 06:42:07 +00:00
877dcba47a
Fix integer overflows in recovery procedure. am: 1273956e69
...
am: 5978a71d29
2016-02-23 06:35:46 +00:00
5978a71d29
Fix integer overflows in recovery procedure.
...
am: 1273956e69
2016-02-23 06:33:20 +00:00
1273956e69
Fix integer overflows in recovery procedure.
...
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit 4f2df162c6
2016-02-22 17:42:02 -08:00
3c7f655bf0
am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '0e804d542a2c151d254cad0d8581d9709a394a9a':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:48:24 +00:00
0e804d542a
am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:33:14 +00:00
d396b9dbd9
am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '710b6bb9d7d36ce16453850efc3112016a77e9ff':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-12 06:30:01 +00:00
710b6bb9d7
am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 20:55:33 +00:00
ec4b58ad8a
am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 18:26:12 +00:00
ec63d564a8
Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
bug: 22953624
Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
2015-09-09 10:42:10 +00:00
b4b41daa2d
am 0ddfa329: Allow mounting squashfs partitions
...
* commit '0ddfa329acb1e6464fe5d66b58257013abf21116':
Allow mounting squashfs partitions
2015-07-02 00:30:57 +00:00
0ddfa329ac
Allow mounting squashfs partitions
...
Change-Id: Ic023eb7d8a11e2a65172a23ff39fa902ef566183
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-07-01 10:13:16 -07:00
599fc2c0ed
am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
...
* commit 'c94fa0b01b43709531dfbcdb94abb2a1cc23be3d':
DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
2015-04-26 17:37:21 +00:00
5a95719bd9
am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""
...
* commit '6725ebc7b41ae0702adb28d9b40fbd392c6bfb9a':
Revert "Revert "init re-execs to set its security context now.""
2015-04-24 20:39:15 +00:00
6725ebc7b4
Merge "Revert "Revert "init re-execs to set its security context now."""
2015-04-24 20:29:34 +00:00
6f76dd58f4
Revert "Revert "init re-execs to set its security context now.""
...
This reverts commit c819dbe95bhttp://b/19702273
Change-Id: I5c75b148a12e644dd247a4df4f67dc9b4b9ff8cf
2015-04-24 12:42:46 -07:00
f6c03a80f0
am c690332c: Merge "Revert "init re-execs to set its security context now.""
...
* commit 'c690332c5e4008d0f58d7a356311a821ef07d0cf':
Revert "init re-execs to set its security context now."
2015-04-24 17:05:48 +00:00
c690332c5e
Merge "Revert "init re-execs to set its security context now.""
2015-04-24 16:59:11 +00:00
c819dbe95b
Revert "init re-execs to set its security context now."
...
shamu isn't booting now
This reverts commit c57453d537
2015-04-24 16:58:33 +00:00
7058b89f02
am 38a82cac: Merge "init re-execs to set its security context now."
...
* commit '38a82cace581a888c5bc475754a20d8e92992fb2':
init re-execs to set its security context now.
2015-04-24 03:34:40 +00:00
38a82cace5
Merge "init re-execs to set its security context now."
2015-04-24 03:27:53 +00:00
c57453d537
init re-execs to set its security context now.
...
Change-Id: I0a014f8dddfe775159903b5d6fa632733fef692c
2015-04-23 20:26:56 -07:00
0391820cde
am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"
...
* commit '0de2351e6a6be685e1d68661dcf5f4902898cacd':
Don't remove existing explicitly stashed blocks
2015-04-17 17:02:43 +00:00
0de2351e6a
Merge "Don't remove existing explicitly stashed blocks"
2015-04-17 16:54:34 +00:00
43b748f254
Don't remove existing explicitly stashed blocks
...
When automatically stashing overlapping blocks, should the stash
file already exist due to an explicit stash command, it's not safe
to remove the stash file after the command has completed.
Note that it is safe to assume that the stash file will remain in
place during the execution of the next command, so we don't have
take other measures to preserve overlapping blocks.
The stash file itself will be removed by a free command when it's
no longer needed.
Bug: 20297065
Change-Id: I8ff1a798b94086adff183c5aac03260eb947ae2c
2015-04-17 13:07:08 +01:00
51f42b2d20
am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"
...
* commit '4381767aa6410902e07376f62f66bbef83ebf2c4':
imgdiff: Avoid infinite loop if inflate fails
2015-04-16 21:06:00 +00:00
4381767aa6
Merge "imgdiff: Avoid infinite loop if inflate fails"
2015-04-16 20:55:38 +00:00
0a557b6bc2
am 7176a617: Merge "Don\'t use typedefs that hide *s."
...
* commit '7176a61718e7b45a8fde3a25eada0c9425d1dece':
Don't use typedefs that hide *s.
2015-04-15 18:36:32 +00:00
7176a61718
Merge "Don't use typedefs that hide *s."
2015-04-15 18:26:37 +00:00
0a5cb0c7cd
Don't use typedefs that hide *s.
...
gr_surface was causing confusion for no good reason.
Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
2015-04-15 10:58:56 -07:00
98bfb6f797
am 6e435abf: Merge "Move the menu header out of the menu."
...
* commit '6e435abfeb7256b5ea82ca37166acf36e3f98085':
Move the menu header out of the menu.
2015-04-15 17:15:53 +00:00
6e435abfeb
Merge "Move the menu header out of the menu."
2015-04-15 17:05:35 +00:00
c68bd34dc8
imgdiff: Avoid infinite loop if inflate fails
...
Break out of the loop if inflate returns an error
and print some details.
Change-Id: Ie157cf943291b1a26f4523b17691dfcefbc881dc
2015-04-15 13:09:54 +02:00
8fd86d77f1
Move the menu header out of the menu.
...
This makes it easier for us to deal with arbitrary information at the
top, and means that headers added by specific commands don't overwrite
the default ones.
Add the fingerprint back, but broken up so it fits even on sprout's
display.
Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c
2015-04-13 15:46:15 -07:00
cbdc7e844a
am 17b032e1: Merge "Add missing \n after "Mounting /system." message."
...
* commit '17b032e159779886f0151641a9aad5003debdce2':
Add missing \n after "Mounting /system." message.
2015-04-13 20:50:56 +00:00
17b032e159
Merge "Add missing \n after "Mounting /system." message."
2015-04-13 20:40:52 +00:00
e46066f269
Add missing \n after "Mounting /system." message.
...
Change-Id: I280a478526f033f5c0041d7e8a818fce6177d732
2015-04-13 13:29:38 -07:00
d7823c5dfe
am eab12de7: Merge "Remove unnecessary globals."
...
* commit 'eab12de70efb649ab33f7971e948251895d613fe':
Remove unnecessary globals.
2015-04-13 20:24:42 +00:00
507630e99c
am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
...
* commit 'b68c4fc42617acb97dde89f501caf8558a348b51':
Treat KEY_ENTER the same as KEY_POWER in the pager.
2015-04-13 20:24:41 +00:00
eab12de70e
Merge "Remove unnecessary globals."
2015-04-13 20:18:57 +00:00
b68c4fc426
Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
2015-04-13 20:17:12 +00:00
985022a623
Remove unnecessary globals.
...
Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
2015-04-13 13:04:32 -07:00
300ed089b3
Treat KEY_ENTER the same as KEY_POWER in the pager.
...
Our long-press UI sends KEY_ENTER for long presses, which the long-press
UI treats as equivalent to KEY_POWER in the regular UI. So anywhere we accept
KEY_POWER we should accept KEY_ENTER too.
Change-Id: I99d376c961887043cf02037c26d000c8ba4d66f9
2015-04-13 10:47:59 -07:00
Matt Sarett
Yabin Cui
Narayan Kamath
Mohamad Ayyash
Andres Morales
Elliott Hughes
Nick Kralevich
Sami Tolvanen
Tao Bao
Johan Redestig