Commit Graph

1343 Commits

Author SHA1 Message Date
Elliott Hughes 75ae70cb7c am ea874f8f: am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."
* commit 'ea874f8fb70e98f5595ab2d582c31e9d79f300f7':
  Fix minadb_test build breakage.
2015-05-02 01:12:37 +00:00
Elliott Hughes ea874f8fb7 am c67e89ad: am 30cea3dc: Merge "Fix minadb_test build breakage."
* commit 'c67e89ada5b8f549e8844e0b722d3310398bf4e8':
  Fix minadb_test build breakage.
2015-05-02 00:56:10 +00:00
Elliott Hughes c67e89ada5 am 30cea3dc: Merge "Fix minadb_test build breakage."
* commit '30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9':
  Fix minadb_test build breakage.
2015-05-02 00:39:15 +00:00
Elliott Hughes 30cea3dcaf Merge "Fix minadb_test build breakage." 2015-05-02 00:26:00 +00:00
Elliott Hughes 3e7d82c621 Fix minadb_test build breakage.
Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03
2015-05-01 17:25:24 -07:00
Elliott Hughes 0420dcba49 am 073e3381: am 2f5feedf: Check all lseek calls succeed.
* commit '073e3381a2755c08e9e108640ff576f18cdff118':
  Check all lseek calls succeed.
2015-04-30 04:44:21 +00:00
Elliott Hughes b2007b70ca am f6c7af28: am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed."
* commit 'f6c7af289c2990bd16d422ae689317a938f77fdc':
  Check all lseek calls succeed.
2015-04-30 04:44:20 +00:00
Elliott Hughes 073e3381a2 am 2f5feedf: Check all lseek calls succeed.
* commit '2f5feedf1d705b53e5bf90c8b5207dd91f4522f1':
  Check all lseek calls succeed.
2015-04-30 04:37:47 +00:00
Elliott Hughes f6c7af289c am 34d3a3d0: am 34c7731a: Merge "Check all lseek calls succeed."
* commit '34d3a3d074e977cace29797c428795e1de5b3223':
  Check all lseek calls succeed.
2015-04-30 04:33:57 +00:00
Elliott Hughes 34d3a3d074 am 34c7731a: Merge "Check all lseek calls succeed."
* commit '34c7731a0bb296a1289b85a83f53026117aa3677':
  Check all lseek calls succeed.
2015-04-30 04:19:33 +00: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 34c7731a0b Merge "Check all lseek calls succeed." 2015-04-30 04:11:41 +00:00
Elliott Hughes 7bad7c4646 Check all lseek calls succeed.
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.

Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
2015-04-29 17:46:43 -07:00
Elliott Hughes 1945a951a1 am 15a2e46b: am f7466f9f: Stop using adb_strtok, and check argument validity.
* commit '15a2e46bdc9674d114a0f22a0471f3c3c8bcf8b5':
  Stop using adb_strtok, and check argument validity.
2015-04-28 18:39:20 +00:00
Elliott Hughes 49e650dfee am b1195d1c: am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."
* commit 'b1195d1c77fa8b5d49fc32ce0daca26f40af767d':
  Stop using adb_strtok, and check argument validity.
2015-04-28 18:39:18 +00:00
Elliott Hughes 15a2e46bdc am f7466f9f: Stop using adb_strtok, and check argument validity.
* commit 'f7466f9f2334b0e9025e1c7ecf65b4d04a246b20':
  Stop using adb_strtok, and check argument validity.
2015-04-28 18:19:42 +00:00
Elliott Hughes b1195d1c77 am bc4e69fc: am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."
* commit 'bc4e69fc2827d7b8648a30d3b29eca3cb886fc9a':
  Stop using adb_strtok, and check argument validity.
2015-04-28 18:17:11 +00:00
Elliott Hughes bc4e69fc28 am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."
* commit '8c389e9c769c8632cf16c0794f1e84f49996077c':
  Stop using adb_strtok, and check argument validity.
2015-04-28 18:03:22 +00: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
Elliott Hughes 8c389e9c76 Merge "Stop using adb_strtok, and check argument validity." 2015-04-28 17:52:17 +00:00
Elliott Hughes ba45ddf37c Stop using adb_strtok, and check argument validity.
Change-Id: I323ffda71b82cc939aed446f9c9fb86ca78df153
2015-04-28 09:40:19 -07:00
Andres Morales 8f697ed15f am 5c025ac5: (-s ours) am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
* commit '5c025ac5c84c19e4eac6ca6e9f5c2f51e09add54':
  DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
2015-04-27 15:33:42 +00: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