Commit Graph

1012 Commits

Author SHA1 Message Date
Narayan Kamath f9ee77ab52 am 9e95c515: Merge "Fix a printf format warning."
* commit '9e95c515dc2e7afa91d4a4c5163ffd5b6eae3b31':
  Fix a printf format warning.
2015-02-24 13:01:00 +00:00
Narayan Kamath 9e95c515dc Merge "Fix a printf format warning." 2015-02-24 12:56:15 +00:00
Narayan Kamath d84b055972 Fix a printf format warning.
warning: format '%lu' expects argument of type 'long unsigned int', but
   argument 3 has type 'unsigned int' [-Wformat] sizeof(RangeSet) + num * sizeof(int));

Change-Id: I4a3c6fc8d40c08ea84f8f5ee13f39350e4264027
2015-02-23 13:39:41 +00:00
Dan Albert 552fceb85c am 2d102225: Merge "Kill of most of the remainder of minadbd."
* commit '2d1022250941873f8748e6a159d4e5bf976e511f':
  Kill of most of the remainder of minadbd.
2015-02-20 00:05:30 +00:00
Dan Albert 2d10222509 Merge "Kill of most of the remainder of minadbd." 2015-02-19 23:47:22 +00:00
Dan Albert f3a5726919 Kill of most of the remainder of minadbd.
I think everything left now is here to stay (services.c might get
massaged in to libadbd if it gets refactored).

Bug: 17626262
Change-Id: I01faf8b277a601a40e3a0f4c3b8206c97f1d2ce6
2015-02-19 15:41:35 -08:00
Bill Yi c2b60b9870 Merge commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828' into HEAD 2015-02-19 14:30:26 -08:00
Dan Albert 4eb6c71e7f Merge "Move adb_main to its own file." 2015-02-19 18:44:28 +00:00
Dan Albert 9a894b7ece Move adb_main to its own file.
Change-Id: Ia5150e1ef8be5a8f2d2da0fdca9383e22218f4ac
2015-02-19 10:40:17 -08:00
Dan Albert 5d22a5b5ec Merge "Remove dead code." 2015-02-19 01:12:29 +00:00
Dan Albert 3efa676fa6 Remove dead code.
This code doesn't exist in the normal adb, so it just makes it harder
to diff the two.

Change-Id: Ibb21b49bb9944c4245199536cbe88e8a107cf00d
2015-02-18 16:44:24 -08:00
Dan Albert 076f5479b5 Merge "Use headers from adb." 2015-02-19 00:17:37 +00:00
Dan Albert 1ddd350504 Use headers from adb.
adb.h has diverged a bit, so that one will be more involved, but these
three are all trivial, unimportant changes.

Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6
2015-02-18 16:14:16 -08:00
Dan Albert bbf627a68e Merge "Remove unused code." 2015-02-18 23:57:00 +00:00
Dan Albert 4db055d66a Merge "Lose USB transport code to libadb." 2015-02-18 23:42:49 +00:00
Dan Albert 2b2a14ff35 Remove unused code.
Change-Id: Ie37734e75bc4d1e284dcb5dee4c0512021663dbd
2015-02-18 15:11:29 -08:00
Dan Albert 8f1bfead3f Lose USB transport code to libadb.
Bug: 17626262
Change-Id: If41031ba20a3a75fa510f155c654a482b47e409d
2015-02-18 15:11:29 -08:00
Dan Albert 37e933a7ce Merge "Add extern "C" to all the headers." 2015-02-18 18:44:36 +00:00
Dan Albert d808d2194f Add extern "C" to all the headers.
Change-Id: Idc249ff1b199b7c455f90092ff2c8a48b539faf4
2015-02-18 10:21:54 -08:00
Elliott Hughes f8dd04e1a5 am ff934d02: Merge "Fix Droid and animation color in recovery mode"
* commit 'ff934d0257909e9c5420815547a6e2ff89455314':
  Fix Droid and animation color in recovery mode
2015-02-12 17:42:11 +00:00
Elliott Hughes ff934d0257 Merge "Fix Droid and animation color in recovery mode" 2015-02-12 06:21:28 +00:00
Tony Kuo fd778e3e40 Fix Droid and animation color in recovery mode
[Problem]
Droid and animation color in recovery mode are incorrect

[Modify]
- Add support for flipping (zero copy) with RECOVERY_ABGR.
- Decodes PNG files to BGRA directly, and other fills, text and alpha blending are also done directly in BGRA (i.e. blits can still bypass conversion)
- Remove the BGRA workaround added previous for single buffer mode (f766396)

Bug:19216535
Change-Id: Ie864419fc6da776ff58b2d02e130f203c194500f
Signed-off-by: Tony Kuo <tony.kuo@mediatek.com>
2015-02-11 21:36:00 -08:00
Elliott Hughes adf71bf71d am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"
* commit '5db3f97877c0aafd4513c3ed846c48b0fc148b0e':
  Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
2015-02-11 01:55:05 +00:00
Elliott Hughes 5db3f97877 Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined" 2015-02-11 01:37:49 +00:00
Elliott Hughes 98e2c509a6 am 78aa50d3: Merge "recovery: Handle EV_SW events"
* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
  recovery: Handle EV_SW events
2015-02-11 00:33:17 +00:00
Elliott Hughes ee7127cca5 am bf0be350: Merge "recovery: Generate libminui dynamic library"
* commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0':
  recovery: Generate libminui dynamic library
2015-02-11 00:33:16 +00:00
Elliott Hughes 78aa50d349 Merge "recovery: Handle EV_SW events" 2015-02-11 00:28:56 +00:00
Ajay Dudani 07d9627d7c recovery: Handle EV_SW events
Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
2015-02-10 16:28:07 -08:00
Elliott Hughes bf0be350dd Merge "recovery: Generate libminui dynamic library" 2015-02-11 00:26:18 +00:00
Ajay Dudani 9905f3a4ee recovery: Generate libminui dynamic library
Allow factory test images to use minui functionaltiy
by making use of libminui dynamic library.

Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
2015-02-10 16:25:17 -08:00
Elliott Hughes dcbf4fc571 resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp
Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
2015-02-10 16:20:53 -08:00
Elliott Hughes 35efcd275f Merge "recovery: Properly detect userdebug or eng builds" 2015-02-10 23:55:45 +00:00
Elliott Hughes f14af80a14 recovery: Properly detect userdebug or eng builds
The recovery system behaves a little bit differently on userdebug or
eng builds by presenting error reports to the user in the ui.
This is controlled by checking the build fingerprint for the string
:userdebug/ or :eng/. But with AOSP version numbers most AOSP
builds blows the 92 char limit of ro.build.fingerprint and therefore
the property is not set, so this condition will always be evaluated
to false, for most builds.

Instead of depending on the flaky ro.build.fingerprint this change
uses ro.debuggable.

Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
2015-02-10 14:46:14 -08:00
Nick Kralevich ec5c1c1e29 am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"
* commit '99e084ca8012bc7af52ae2fb9e72ab7180177daf':
  Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
2015-02-08 15:20:50 +00:00
Nick Kralevich 99e084ca80 Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 2015-02-08 15:09:00 +00:00
Nanik Tolaram 4e8e93b666 Remove dead/unused code and realign some of the comments
to make it more cleaner and easier to read

Change-Id: If536d482c0ed645368084e76d8ec060f05d89137
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
2015-02-08 22:31:14 +11:00
Elliott Hughes 42b09d255a am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."
* commit '6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05':
  There's no GPL code in 'updater'.
2015-02-07 07:43:35 +00:00
Elliott Hughes 6a0d2fbcaa Merge "There's no GPL code in 'updater'." 2015-02-07 07:34:41 +00:00
Elliott Hughes 8a9014d572 There's no GPL code in 'updater'.
This notice was added for libsyspatch and libxdelta3, but that code
has been removed since.

Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
2015-02-05 14:53:55 -08:00
Elliott Hughes 40862ab59e am aeecac54: Merge "Add missing includes."
* commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e':
  Add missing includes.
2015-01-30 21:16:36 +00:00
Elliott Hughes aeecac5444 Merge "Add missing includes." 2015-01-30 06:24:40 +00:00
Elliott Hughes cd3c55ab40 Add missing includes.
Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
2015-01-29 20:50:08 -08:00
Elliott Hughes 22b8fe9666 am dab56cac: Merge "Add missing includes."
* commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3':
  Add missing includes.
2015-01-28 20:48:30 +00:00
Elliott Hughes dab56cac95 Merge "Add missing includes." 2015-01-28 20:36:40 +00:00
Elliott Hughes 26dbad2b98 Add missing includes.
Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
2015-01-28 12:09:05 -08:00
Dan Albert 88c30fb652 am eaeb55f7: Merge "Start losing code to libadb."
* commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d':
  Start losing code to libadb.
2015-01-27 02:08:45 +00:00
Dan Albert eaeb55f745 Merge "Start losing code to libadb." 2015-01-27 00:51:09 +00:00
Christopher Ferris 2d67a483ed am cdc38d04: Merge "Fix the v2 descriptor handling."
* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
  Fix the v2 descriptor handling.
2015-01-26 21:45:16 +00:00
Christopher Ferris cdc38d0401 Merge "Fix the v2 descriptor handling." 2015-01-26 21:28:21 +00:00
Christopher Ferris efa16af53e am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"
* commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4':
  adbd: Support for new f_fs descriptor format
2015-01-26 21:21:55 +00:00