PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,394 Commits 1 Branch 0 Tags
e7c936812e4ab4e85d66bd35b716b91a5620098b
Commit Graph

1394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao e7c936812e am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp 
* commit '2ab0a57211bbfe62f8730550b8456e17ce59d5cf':
  uncrypt: package on non-data partition should follow the right path
 2015-05-06 23:54:12 +00:00
Tao Bao 2ab0a57211 resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp 
Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c
 2015-05-06 16:39:26 -07:00
Elliott Hughes 45903c33cf am a6fb5418: am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change." 
* commit 'a6fb541857d822939cada24574f566df87dda35d':
  Track adb_thread_create API change.
 2015-05-06 23:10:10 +00:00
Tao Bao 46b31f4420 am d5148f35: am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs" 
* commit 'd5148f35ec2bbbc3365568d1472a2bdc10fecb05':
  Keep multiple kernel logs
 2015-05-06 23:10:09 +00:00
Elliott Hughes a6fb541857 am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change." 
* commit '481508426cb258ebf809a9f46ec4f5689d0459ef':
  Track adb_thread_create API change.
 2015-05-06 22:45:49 +00:00
Tao Bao d5148f35ec am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs" 
* commit '185e8204c6e29e2177721a30c73928fb4e5382fa':
  Keep multiple kernel logs
 2015-05-06 22:45:40 +00:00
Tao Bao 5661897ddd am c017c597: am 3e8d28b5: uncrypt: Switch to C++ 
* commit 'c017c597b266605f23d3de7d956535e486ad76b1':
  uncrypt: Switch to C++
 2015-05-06 19:59:56 +00:00
Tao Bao c017c597b2 am 3e8d28b5: uncrypt: Switch to C++ 
* commit '3e8d28b547cd75af3f77f38a7e2895d0dbd2e232':
  uncrypt: Switch to C++
 2015-05-06 19:43:51 +00:00
Tao Bao 3e8d28b547 uncrypt: Switch to C++ 
Also apply some trivial changes like int -> bool and clean-ups.

Change-Id: I5c6c42d34965305c394f4f2de78487bd1174992a
(cherry picked from commit 381f455cac)
 2015-05-06 12:23:41 -07:00
Tao Bao 2e03e4d913 am 8d312ed6: am 8853cb2f: uncrypt: package on non-data partition should follow the right path 
* commit '8d312ed601d15123a442d8227df901160083f2a7':
  uncrypt: package on non-data partition should follow the right path
 2015-05-06 17:41:01 +00:00
Tao Bao 8d312ed601 am 8853cb2f: uncrypt: package on non-data partition should follow the right path 
* commit '8853cb2f296adfdc57871e9482a8e97b0011b323':
  uncrypt: package on non-data partition should follow the right path
 2015-05-06 01:42:25 +00:00
Tao Bao 550bd340c3 am aeb980bd: Merge "uncrypt: package on non-data partition should follow the right path" 
* commit 'aeb980bd8958e3c6e135835aa7d34b5c4e3a601b':
  uncrypt: package on non-data partition should follow the right path
 2015-05-06 01:30:44 +00:00
Tao Bao 8853cb2f29 uncrypt: package on non-data partition should follow the right path 
Fix the accidental change of behavior in [1]. OTA packages not on /data
partition should still go through the path that has validity checks and
wipe_misc() steps.

[1]: commit eaf33654c1.

Change-Id: I3e86e19f06603bfe6ecc691c9aa66a8a8a79c5fb
(cherry picked from commit fb4ccef1df)
 2015-05-05 18:22:03 -07:00
Tao Bao aeb980bd89 Merge "uncrypt: package on non-data partition should follow the right path" 2015-05-06 01:18:11 +00:00
Tao Bao fb4ccef1df uncrypt: package on non-data partition should follow the right path 
Fix the accidental change of behavior in [1]. OTA packages not on /data
partition should still go through the path that has validity checks and
wipe_misc() steps.

[1]: commit eaf33654c1.

Change-Id: Ice9a049f6259cd2368d2fb95a991f8a6a0120bdd
 2015-05-05 17:51:28 -07:00
Tao Bao 42ed4d3dd0 am 38fcdfe0: am 93cec9a0: Keep multiple kernel logs 
* commit '38fcdfe06cb45c1efc816ecc5e8ff82e5442d893':
  Keep multiple kernel logs
 2015-05-05 22:03:14 +00:00
Tao Bao 38fcdfe06c am 93cec9a0: Keep multiple kernel logs 
* commit '93cec9a0c402d6ca5d41e10db738bb5f61b19be2':
  Keep multiple kernel logs
 2015-05-05 21:49:51 +00:00
Elliott Hughes 481508426c am 41c7ef54: Merge "Track adb_thread_create API change." 
* commit '41c7ef5400634508db5127ea45108cf94f8e36ab':
  Track adb_thread_create API change.
 2015-05-05 21:49:39 +00:00
Elliott Hughes 41c7ef5400 Merge "Track adb_thread_create API change." 2015-05-05 21:40:47 +00:00
Elliott Hughes 921431ffc0 Track adb_thread_create API change. 
Change-Id: Ia3f30f3ba85c0246d4b667fb7723cfcdce299d4a
 2015-05-05 14:37:53 -07:00
Tao Bao 185e8204c6 am c7f64fdf: Merge "Keep multiple kernel logs" 
* commit 'c7f64fdf08b254ff94012c1815198b9635f508a7':
  Keep multiple kernel logs
 2015-05-05 21:30:49 +00:00
Tao Bao 93cec9a0c4 Keep multiple kernel logs 
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs.

Bug: http://b/18092237
Change-Id: Ied862b5b70cbbae7775f59c78c32ec62aeeca655
(cherry picked from commit bef39710ff)
 2015-05-05 14:23:41 -07:00
Tao Bao c7f64fdf08 Merge "Keep multiple kernel logs" 2015-05-05 21:20:47 +00:00
Tao Bao bef39710ff Keep multiple kernel logs 
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs.

Bug: http://b/18092237
Change-Id: I1bf5e230de3efd6a48a5b2ae5a34241cb4d9ca90
 2015-05-05 14:09:29 -07:00
Tao Bao 00be513e72 am 6c3b7634: am 6d820f2c: Turn on text display for debuggable builds 
* commit '6c3b76344f3b64fe8150a191217f4a2ebb0d7d49':
  Turn on text display for debuggable builds
 2015-05-04 18:44:55 +00:00
Tao Bao 6c3b76344f am 6d820f2c: Turn on text display for debuggable builds 
* commit '6d820f2c91f6cafcec5b378ae896b7118ca8921d':
  Turn on text display for debuggable builds
 2015-05-04 18:32:21 +00:00
Tao Bao 0f2d721d80 am e9ce252c: am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds" 
* commit 'e9ce252cf0f7b996a2e1977d30928b0812e371ba':
  Turn on text display for debuggable builds
 2015-05-04 17:37:14 +00:00
Tao Bao e9ce252cf0 am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds" 
* commit '0a7b92762a42be7dd01da87b5f67a405f6f07d31':
  Turn on text display for debuggable builds
 2015-05-04 17:24:59 +00:00
Tao Bao 6d820f2c91 Turn on text display for debuggable builds 
For userdebug and eng builds, turn on the text display automatically
if no command is specified.

(cherry-pick of 785d22c88cda46972331c04ebc9df97371a696da.)

Bug: http://b/17489952
Change-Id: I38377c45f2a8e45ca788e5506695aa88c769cbcf
 2015-05-04 10:21:54 -07:00
Tao Bao 0a7b92762a am f8f88321: Merge "Turn on text display for debuggable builds" 
* commit 'f8f8832179003ad0a4e9359ef16e2f49d9f38345':
  Turn on text display for debuggable builds
 2015-05-04 17:11:46 +00:00
Tao Bao f8f8832179 Merge "Turn on text display for debuggable builds" 2015-05-04 17:05:20 +00:00
Tao Bao 785d22c88c Turn on text display for debuggable builds 
For userdebug and eng builds, turn on the text display automatically
if no command is specified.

Bug: http://b/17489952
Change-Id: I3d42ba2848b968da12164ddfda915ca69dcecba1
 2015-05-04 09:59:29 -07:00
Elliott Hughes 60ec0d9ff1 am 759febda: am 4cf34d5d: Fix mips64 minadbd_test build. 
* commit '759febdabcf76ea5908f506e2e5c2ef77854111d':
  Fix mips64 minadbd_test build.
 2015-05-02 06:09:44 +00:00
Elliott Hughes 6ec91303a2 am 007a7141: am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build." 
* commit '007a71416b5f824fe7c77e53e2992a164003f37b':
  Fix mips64 minadbd_test build.
 2015-05-02 06:09:44 +00:00
Elliott Hughes 759febdabc am 4cf34d5d: Fix mips64 minadbd_test build. 
* commit '4cf34d5d297db4f7130a7f1472c394e38ea0e642':
  Fix mips64 minadbd_test build.
 2015-05-02 05:59:39 +00:00
Elliott Hughes 007a71416b am 4b3004a6: am 59e1e3e7: Merge "Fix mips64 minadbd_test build." 
* commit '4b3004a6c93481e659647e7b40beb572f140683b':
  Fix mips64 minadbd_test build.
 2015-05-02 05:58:07 +00:00
Elliott Hughes 4b3004a6c9 am 59e1e3e7: Merge "Fix mips64 minadbd_test build." 
* commit '59e1e3e78f53438cb5843d7e151dddb0d782328c':
  Fix mips64 minadbd_test build.
 2015-05-02 05:47:12 +00:00
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 59e1e3e78f Merge "Fix mips64 minadbd_test build." 2015-05-02 05:39:07 +00:00
Elliott Hughes dbb20c4863 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
 2015-05-01 22:29:01 -07:00
Elliott Hughes c1ad59a28e am 227dcf8a: am 15931924: Move minadb over to new API. 
* commit '227dcf8af14faaef239f8d28ba46bc6b4ef229cf':
  Move minadb over to new API.
 2015-05-02 01:12:39 +00:00
Elliott Hughes 4d83d9e174 am 0cd8f5b4: am 87ec73a2: Fix minadb_test build breakage. 
* commit '0cd8f5b429e15b89ec77bd26d3994b3508d3aebf':
  Fix minadb_test build breakage.
 2015-05-02 01:12:38 +00:00
Elliott Hughes ddc79a9537 am 41e4f5ae: am c0537d68: am 6bc2d538: Merge "Move minadb over to new API." 
* commit '41e4f5ae1ce47b475881ffded632d07e91f1ce19':
  Move minadb over to new API.
 2015-05-02 01:12:37 +00:00
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 227dcf8af1 am 15931924: Move minadb over to new API. 
* commit '15931924e1820d4c2bc9f9c0c7734c43c92b866b':
  Move minadb over to new API.
 2015-05-02 00:56:15 +00:00
Elliott Hughes 0cd8f5b429 am 87ec73a2: Fix minadb_test build breakage. 
* commit '87ec73a264530f5fa19cde2598d5e65c4c67a686':
  Fix minadb_test build breakage.
 2015-05-02 00:56:14 +00:00
Elliott Hughes 41e4f5ae1c am c0537d68: am 6bc2d538: Merge "Move minadb over to new API." 
* commit 'c0537d688529bd38e691ead93815ece29ad15b7b':
  Move minadb over to new API.
 2015-05-02 00:56:11 +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 c0537d6885 am 6bc2d538: Merge "Move minadb over to new API." 
* commit '6bc2d538ae304edbd6bf514cb61444844313032d':
  Move minadb over to new API.
 2015-05-02 00:39:16 +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