Bill Yi
c2b60b9870
Merge commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828' into HEAD
2015-02-19 14:30:26 -08:00
Dan Albert
1212762a6e
am 9613bd32
: am 4eb6c71e
: Merge "Move adb_main to its own file."
...
* commit '9613bd32f5d19476063e4c546ad806385eed203c':
Move adb_main to its own file.
2015-02-19 20:53:36 +00:00
Dan Albert
5748a029de
am 91f68a47
: am 5d22a5b5
: Merge "Remove dead code."
...
* commit '91f68a4735e7ca9facaf0bad45a97e7ea25213c4':
Remove dead code.
2015-02-19 20:26:14 +00:00
Dan Albert
9613bd32f5
am 4eb6c71e
: Merge "Move adb_main to its own file."
...
* commit '4eb6c71e7f013e684828ae6216f61b83be552282':
Move adb_main to its own file.
2015-02-19 18:56:50 +00: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
91f68a4735
am 5d22a5b5
: Merge "Remove dead code."
...
* commit '5d22a5b5ecfd9fce5084915e65e114c8541c084c':
Remove dead code.
2015-02-19 01:25:13 +00: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
d5b9f7c858
am 43162fe5
: am 076f5479
: Merge "Use headers from adb."
...
* commit '43162fe50cb2e2e7861df97380fad815a54dac2e':
Use headers from adb.
2015-02-19 00:33:02 +00:00
Dan Albert
43162fe50c
am 076f5479
: Merge "Use headers from adb."
...
* commit '076f5479b592fc02f2f3e5436cad06b0a35d0521':
Use headers from adb.
2015-02-19 00:28:51 +00:00
Dan Albert
076f5479b5
Merge "Use headers from adb."
2015-02-19 00:17:37 +00:00
Dan Albert
bc5e0e8504
am 61398da2
: am bbf627a6
: Merge "Remove unused code."
...
* commit '61398da24b7abe657fad0a0db2a47cf940f4e58b':
Remove unused code.
2015-02-19 00:15:45 +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
61398da24b
am bbf627a6
: Merge "Remove unused code."
...
* commit 'bbf627a68e47319b1fcacb1487ab1d1618c3a82d':
Remove unused code.
2015-02-19 00:10:20 +00:00
Dan Albert
91ebcb3811
am bf1476de
: am 4db055d6
: Merge "Lose USB transport code to libadb."
...
* commit 'bf1476defee29ebb3f2b794ce82f2614ba59ce4f':
Lose USB transport code to libadb.
2015-02-19 00:03:45 +00:00
Dan Albert
bf1476defe
am 4db055d6
: Merge "Lose USB transport code to libadb."
...
* commit '4db055d66a3d4d8be9f61beb5ee4d25f6346191a':
Lose USB transport code to libadb.
2015-02-18 23:57:04 +00: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
e1119d5e92
am ecb0ad25
: am 37e933a7
: Merge "Add extern "C" to all the headers."
...
* commit 'ecb0ad25c6be87570f31b652c24ff7f17a93813f':
Add extern "C" to all the headers.
2015-02-18 23:04:29 +00:00
Dan Albert
ecb0ad25c6
am 37e933a7
: Merge "Add extern "C" to all the headers."
...
* commit '37e933a7cef7f2df1693ff02d34042bc2f039301':
Add extern "C" to all the headers.
2015-02-18 22:57:06 +00: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
Jesse Zhao
1df64d3278
Initialize stashbase even stash_max_blocks = 0
...
Change-Id: I480c02ffedd811f4dda9940ef979a05ff54f1435
Bug: 19410117
2015-02-17 17:09:29 -08:00
Elliott Hughes
2622ee3efb
am f8dd04e1
: am ff934d02
: Merge "Fix Droid and animation color in recovery mode"
...
* commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828':
Fix Droid and animation color in recovery mode
2015-02-12 19:30:32 +00: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
779da64446
am adf71bf7
: am 5db3f978
: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"
...
* commit 'adf71bf71d0c3ecb68375c44fc8646860217024c':
Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
2015-02-11 03:11:09 +00:00
Elliott Hughes
91f40d9bf5
am 98e2c509
: am 78aa50d3
: Merge "recovery: Handle EV_SW events"
...
* commit '98e2c509a636db7c4d9a89c086e8d4ac03a6970b':
recovery: Handle EV_SW events
2015-02-11 02:55:28 +00:00
Elliott Hughes
547236785c
am ee7127cc
: am bf0be350
: Merge "recovery: Generate libminui dynamic library"
...
* commit 'ee7127cca575967a90f3ede92cd05552000ccb14':
recovery: Generate libminui dynamic library
2015-02-11 02:55:27 +00:00
Elliott Hughes
e999d0071d
am dcbf4fc5
: resolved conflicts for merge of 35efcd27
to lmp-mr1-dev-plus-aosp
...
* commit 'dcbf4fc571236bf5aa5286294b3c727be725db70':
recovery: Properly detect userdebug or eng builds
2015-02-11 02:55:26 +00: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
54b373c044
am ec5c1c1e
: am 99e084ca
: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read"
...
* commit 'ec5c1c1e291062576925b80b532d36df118103f5':
Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
2015-02-09 04:15:24 +00:00
Elliott Hughes
2fd48fcca5
am 42b09d25
: am 6a0d2fbc
: Merge "There\'s no GPL code in \'updater\'."
...
* commit '42b09d255afdb47bc0546183cbc68e86147baaab':
There's no GPL code in 'updater'.
2015-02-09 04:15:14 +00: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