Commit graph

1376 commits

Author SHA1 Message Date
Elliott Hughes
4cf34d5d29 Fix mips64 minadbd_test build.
Looks like the mips64 linker isn't as good as the others at GCing
unused stuff, which means it needs libcutils.

Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702
(cherry picked from commit dbb20c4863)
2015-05-01 22:40:06 -07:00
Elliott Hughes
15931924e1 Move minadb over to new API.
Change-Id: I889bcf2222245c7665287513669cae8831e37081
(cherry picked from commit 4039933c62)
2015-05-01 17:35:06 -07:00
Elliott Hughes
87ec73a264 Fix minadb_test build breakage.
Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03
(cherry picked from commit 3e7d82c621)
2015-05-01 17:26:45 -07:00
Elliott Hughes
2f5feedf1d Check all lseek calls succeed.
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.

Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
(cherry picked from commit 7bad7c4646)
2015-04-29 21:14:56 -07:00
Elliott Hughes
f7466f9f23 Stop using adb_strtok, and check argument validity.
(cherry picked from commit ba45ddf37c)

Change-Id: Iba4f77f7db54ca0184437bd8ea96abfadabc72a3
2015-04-28 10:52:52 -07:00
Andres Morales
5c025ac5c8 am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
* commit '599fc2c0edbeb2ce8f38905fd770dbd7f43e647c':
  DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
2015-04-27 07:18:50 +00:00
Andres Morales
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
Elliott Hughes
774f8f695a am 5a95719b: am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""
* commit '5a95719bd9ac27d573388e6aa4b48715d9aa3d9e':
  Revert "Revert "init re-execs to set its security context now.""
2015-04-24 21:27:22 +00:00
Elliott Hughes
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
Elliott Hughes
6725ebc7b4 Merge "Revert "Revert "init re-execs to set its security context now.""" 2015-04-24 20:29:34 +00:00
Elliott Hughes
6f76dd58f4 Revert "Revert "init re-execs to set its security context now.""
This reverts commit c819dbe95b.

Bug: http://b/19702273
Change-Id: I5c75b148a12e644dd247a4df4f67dc9b4b9ff8cf
2015-04-24 12:42:46 -07:00
Nick Kralevich
daa9391ede am f6c03a80: am c690332c: Merge "Revert "init re-execs to set its security context now.""
* commit 'f6c03a80f08542afc82780f3b7cafe994d7a41e4':
  Revert "init re-execs to set its security context now."
2015-04-24 17:41:57 +00:00
Nick Kralevich
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
Nick Kralevich
c690332c5e Merge "Revert "init re-execs to set its security context now."" 2015-04-24 16:59:11 +00:00
Nick Kralevich
c819dbe95b Revert "init re-execs to set its security context now."
shamu isn't booting now

This reverts commit c57453d537.

Change-Id: I8efbf6260f5fcf983e5056fac6d03916415b944e
2015-04-24 16:58:33 +00:00
Elliott Hughes
352f9b60e5 am 7058b89f: am 38a82cac: Merge "init re-execs to set its security context now."
* commit '7058b89f02bc367bc2cd4e9c3ee70404e71cf48c':
  init re-execs to set its security context now.
2015-04-24 04:07:38 +00:00
Elliott Hughes
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
Elliott Hughes
38a82cace5 Merge "init re-execs to set its security context now." 2015-04-24 03:27:53 +00:00
Elliott Hughes
c57453d537 init re-execs to set its security context now.
Change-Id: I0a014f8dddfe775159903b5d6fa632733fef692c
2015-04-23 20:26:56 -07:00
Sami Tolvanen
5f40ad936f am 0391820c: am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"
* commit '0391820cde1f27515e9fc8f556b72c3922af9d45':
  Don't remove existing explicitly stashed blocks
2015-04-17 17:32:21 +00:00
Sami Tolvanen
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
Sami Tolvanen
0de2351e6a Merge "Don't remove existing explicitly stashed blocks" 2015-04-17 16:54:34 +00:00
Sami Tolvanen
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
Tao Bao
9ac3dffe18 am 51f42b2d: am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"
* commit '51f42b2d20349490c62b9187bde317f25765e9b3':
  imgdiff: Avoid infinite loop if inflate fails
2015-04-16 21:39:52 +00:00
Tao Bao
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
Tao Bao
4381767aa6 Merge "imgdiff: Avoid infinite loop if inflate fails" 2015-04-16 20:55:38 +00:00
Elliott Hughes
a441133871 am 0a557b6b: am 7176a617: Merge "Don\'t use typedefs that hide *s."
* commit '0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce':
  Don't use typedefs that hide *s.
2015-04-15 19:22:52 +00:00
Elliott Hughes
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
Elliott Hughes
7176a61718 Merge "Don't use typedefs that hide *s." 2015-04-15 18:26:37 +00:00
Elliott Hughes
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
Elliott Hughes
d5cc7099c8 am 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu."
* commit '98bfb6f797220818a4018ef5f3aa65fc074c8fc4':
  Move the menu header out of the menu.
2015-04-15 17:49:26 +00:00
Elliott Hughes
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
Elliott Hughes
6e435abfeb Merge "Move the menu header out of the menu." 2015-04-15 17:05:35 +00:00
Johan Redestig
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
Elliott Hughes
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
Elliott Hughes
a5446f5b98 am cbdc7e84: am 17b032e1: Merge "Add missing \n after "Mounting /system." message."
* commit 'cbdc7e844a8dafbada50ca8bae9319b7bd7980f2':
  Add missing \n after "Mounting /system." message.
2015-04-13 21:18:32 +00:00
Elliott Hughes
6564544e1e am d7823c5d: am eab12de7: Merge "Remove unnecessary globals."
* commit 'd7823c5dfed67b1e8b0e175e588fb2dc643ebc65':
  Remove unnecessary globals.
2015-04-13 20:52:10 +00:00
Elliott Hughes
dd35c9898c am 507630e9: am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
* commit '507630e99cecddca3c22425a76634c8461faf46e':
  Treat KEY_ENTER the same as KEY_POWER in the pager.
2015-04-13 20:52:09 +00:00
Elliott Hughes
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
Elliott Hughes
17b032e159 Merge "Add missing \n after "Mounting /system." message." 2015-04-13 20:40:52 +00:00
Elliott Hughes
e46066f269 Add missing \n after "Mounting /system." message.
Change-Id: I280a478526f033f5c0041d7e8a818fce6177d732
2015-04-13 13:29:38 -07:00
Elliott Hughes
d7823c5dfe am eab12de7: Merge "Remove unnecessary globals."
* commit 'eab12de70efb649ab33f7971e948251895d613fe':
  Remove unnecessary globals.
2015-04-13 20:24:42 +00:00
Elliott Hughes
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
Elliott Hughes
eab12de70e Merge "Remove unnecessary globals." 2015-04-13 20:18:57 +00:00
Elliott Hughes
b68c4fc426 Merge "Treat KEY_ENTER the same as KEY_POWER in the pager." 2015-04-13 20:17:12 +00:00
Elliott Hughes
985022a623 Remove unnecessary globals.
Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
2015-04-13 13:04:32 -07:00
Elliott Hughes
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
Elliott Hughes
f59062b7ea am d56e0f37: am 0e3781ef: Merge "Rewritten file pager."
* commit 'd56e0f377eab630b1fbedcf291954489fd4fa5e3':
  Rewritten file pager.
2015-04-11 21:09:01 +00:00
Elliott Hughes
d56e0f377e am 0e3781ef: Merge "Rewritten file pager."
* commit '0e3781ef9af2df648f54eb2a7765bef7b6b5b22e':
  Rewritten file pager.
2015-04-11 20:39:04 +00:00
Elliott Hughes
0e3781ef9a Merge "Rewritten file pager." 2015-04-11 20:29:47 +00:00