Commit graph

11700 commits

Author SHA1 Message Date
The Android Automerger
5af4973e9a merge in ics-release history after reset to master 2011-07-15 06:45:09 -07:00
Michael Ward
6242a8bc9b Support multiple recovery updater extensions.
Change-Id: I787c086223b674050c0a12fc575add9badb471af
2011-07-14 15:12:20 -07:00
The Android Automerger
969fb2fef5 merge in ics-release history after reset to master 2011-07-14 07:07:45 -07:00
Doug Zongker
8918673cf7 Merge "Check pointer for null before dereferencing" 2011-07-13 15:42:09 -07:00
Adam Bliss
b2ceb696d0 Check pointer for null before dereferencing
Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91
2011-07-13 15:24:38 -07:00
The Android Automerger
f6e6a04875 merge in ics-release history after reset to master 2011-07-13 07:46:50 -07:00
Benoit Goby
8d92ae052e Merge "Update usb_connected() to support new gadget driver" 2011-07-12 15:39:11 -07:00
Benoit Goby
7e6067e36c Update usb_connected() to support new gadget driver
Change-Id: Iabe8be5bbfa7d2bf1d13280c8734ff75b62a152f
2011-07-12 12:38:46 -07:00
Jeff Brown
b0462e6ae2 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
2011-07-11 22:11:45 -07:00
The Android Automerger
97670528d8 merge in ics-release history after reset to master 2011-07-08 14:10:39 -07:00
Michael Ward
933487868f Add missing commands to recovery init.rc
Wrote some missing items in recovery, most notably the serial number so that it shows up correctly on adb.

Change-Id: If430c0b78191c8d77f781aa605b5081571451775
2011-07-07 13:29:43 -07:00
The Android Automerger
36c5bcb1cf merge in ics-release history after reset to master 2011-06-30 06:43:59 -07:00
Mike Lockwood
718a2f7872 init.rc: Simplify logic for starting adbd in recovery
Always start adbd if ro.debuggable=1 rather than basing it on user preference
in persistent system properties.

Use new D001 product ID, which I just allocated for "android recovery mode"

Change-Id: I6f1eac5257eaad2e538c0a8dd549ad89219efa3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-29 10:22:04 -04:00
The Android Automerger
57a53ca9b5 merge in ics-release history after reset to master 2011-06-27 06:51:00 -07:00
The Android Automerger
d4103181f3 merge in ics-release history after reset to master 2011-06-24 14:22:50 -07:00
The Android Automerger
04b1640e8c merge in ics-release history after reset to master 2011-06-24 13:30:26 -07:00
Michael Ward
9d2629c1c4 Allow applying an OTA package manually from cache.
Change-Id: I8f78377555c658a992ca95cadf11b67ddc93fed8
2011-06-24 11:53:58 -07:00
Michael Ward
3dbe66b71d Get the correct line_length.
Set the BPP and other fields and write it back, so the line_length comes back correctly.

Change-Id: I85e4e8223c79b9394ae1fb609b3026de62027ab8
2011-06-24 11:06:01 -07:00
Doug Zongker
fb04b87002 fix adb root in recovery
recovery's init.rc was missing lines that made adb root work.

Change-Id: I300e6997e3b5cb9c7b542b2012eed61deb2550f1
2011-06-23 15:30:34 -07:00
The Android Automerger
33cff943e9 merge in ics-release history after reset to master 2011-06-23 06:44:38 -07:00
Michael Ward
9d1bcdf7b8 Graphics can handle stride != xres, and BGRA support.
Change-Id: Ifee94ac08028e62a40241a089ac7c36346fea3a3
2011-06-22 15:04:00 -07:00
The Android Automerger
c726175c3c merge in ics-release history after reset to master 2011-06-21 06:45:23 -07:00
Mike Lockwood
1fe452c437 Fix starting adb in recovery mode
Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-20 13:30:30 -07:00
Mike Lockwood
7e58b65efb Fix starting adb in recovery mode
Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-19 02:52:01 -04:00
Jean-Baptiste Queru
5a4e03d120 am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread
* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':
2011-06-08 14:47:00 -07:00
Jean-Baptiste Queru
7f72ad7934 am a94d9548: am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
* commit 'a94d954862fab26f6159ed7bb836ba6758a569fd':
  Mute unharmful build warning at the top of the build log:
2011-06-08 14:46:59 -07:00
Jean-Baptiste Queru
f84b25243d am 6ebedf00: am 82da01d6: Merge from gingerbread
* commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':
2011-06-07 13:23:26 -07:00
Jean-Baptiste Queru
a94d954862 am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
* commit '1117c69fe40dccfa6090d184094c4a6d407ab8d6':
  Mute unharmful build warning at the top of the build log:
2011-06-07 13:22:51 -07:00
Jean-Baptiste Queru
6ebedf0053 am 82da01d6: Merge from gingerbread
* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':
2011-06-01 14:23:11 -07:00
Jean-Baptiste Queru
82da01d6a3 Merge from gingerbread
Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8
2011-06-01 14:08:15 -07:00
Jean-Baptiste Queru
1117c69fe4 am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
* commit '7172eb7b623f4b30f5a709d639fcd3fb51cd6220':
  Mute unharmful build warning at the top of the build log:
2011-06-01 08:06:14 -07:00
Jean-Baptiste Queru
7172eb7b62 Merge "Mute unharmful build warning at the top of the build log:" into gingerbread 2011-05-31 14:03:36 -07:00
Ying Wang
b7b7b37457 Mute unharmful build warning at the top of the build log:
diff: out/target/product/generic/obj/PACKAGING/updater_extensions_intermediates/register.inc.list:
No such file or directory

Change-Id: I269b1703b6091b343db45b1c5cdd0962c738788b
2011-05-24 16:11:05 -07:00
The Android Open Source Project
28a08efe15 Reconcile with honeycomb-release
Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60
2011-05-20 12:45:51 -07:00
The Android Automerger
e44b41a770 am c2a158db: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit 'c2a158db9588e6ad290dd0f9171a190609900387':
  delay accessing misc partition until its device exists
2011-05-09 10:53:22 -07:00
The Android Automerger
c2a158db95 Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:31:27 -07:00
Doug Zongker
c636b7300b am 90588820: delay accessing misc partition until its device exists
* commit '90588820b7110acf142d17457f0d10cd7cb57a8a':
  delay accessing misc partition until its device exists
2011-05-04 12:46:12 -07:00
Doug Zongker
90588820b7 delay accessing misc partition until its device exists
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device.  Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.

Change-Id: I93256db4b047c76020490e8a3dc76b8ade643291
2011-05-04 11:17:35 -04:00
Doug Zongker
f4bb554ee9 delay accessing misc partition until its device exists
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device.  Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.

Change-Id: I988442d5701394d7152bfab3c571e7548c364f61
2011-05-04 11:07:48 -04:00
Doug Zongker
cfd256a332 delay accessing misc partition until its device exists
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device.  Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.

Change-Id: Ib9bf6c35fa2c28fc43aa7550aaaffb76c9f6e120
2011-04-22 09:33:14 -07:00
Doug Zongker
179b2d9895 make write_raw_image able to take a blob
write_raw_image() can now take either a blob or a filename as the
source.  The blob format eliminates the need for a temp file.

Change-Id: I0c6effec53d47862040efcec75e64b7c951cdcf7
2011-04-12 16:48:49 -07:00
Doug Zongker
469243e536 save a last_install file with the result of the last package install attempt
When installing a package, create /cache/recovery/last_install, which
contains the filename of the package and a 1 or 0 for success or
failure.

Also, don't mount ext4 and vfat filesystems as read-only (on devices
where /cache is ext4, we need it to be read-write).

Change-Id: I0cf2a1921bbd65e06343aa74e2006577fac77c2c
2011-04-12 09:28:10 -07:00
Doug Zongker
3ed8e18721 am 4762633c: log which key a package verified against in recovery
* commit '4762633cf846d17516878303502b056b52353a5d':
  log which key a package verified against in recovery
2011-03-15 13:47:23 -07:00
Doug Zongker
4762633cf8 log which key a package verified against in recovery
Change-Id: I0d91b715d1eb9e45e2fce54bb93ba0abef92727e
2011-03-15 12:11:08 -07:00
Iliyan Malchev
201aa88cba recovery: mount /sdcard read-only
Change-Id: Ieffafe00cf82620057cacd0629cb60b0e6aad817
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-11 16:47:53 -08:00
Ken Sumrall
90415aca67 am 6e4472ab: Have recovery reboot using the new android_reboot() function.
* commit '6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40':
  Have recovery reboot using the new android_reboot() function.
2011-03-10 19:44:38 -08:00
Ken Sumrall
6e4472abbd Have recovery reboot using the new android_reboot() function.
The new android_reboot() function is a nicer way to reboot the
system.  I can optionally sync() and remount read-only writable
filesystems.  This fixes bug 3350709.

Change-Id: Ic4c8676debd642e57bce3107b99dd810d90b6f82
2011-03-10 19:30:13 -08:00
Doug Zongker
f66088d2ce am 6ce4a326: don\'t reboot for inactivity if USB is connected
* commit '6ce4a326efae4abb108e19899f4d7776abc362da':
  don't reboot for inactivity if USB is connected
2011-03-08 23:53:35 -08:00
Doug Zongker
6ce4a326ef don't reboot for inactivity if USB is connected
(Cherry-pick back from master.)

Bug: 4071007
Change-Id: I28355c593770df678968185171bdd19dabe7f062
2011-03-08 17:51:14 -08:00
Doug Zongker
4cc533dd1c don't reboot for inactivity if USB is connected
Change-Id: Icba35da91167d30c446581afb47d0804e49964bf
2011-03-08 12:25:05 -08:00