Commit graph

11475 commits

Author SHA1 Message Date
Elliott Hughes
2f38122a0f Remove dead file.
Change-Id: I70a37679a624f2ea2c2d6e1610ad8999c09e5262
2014-12-09 19:35:21 -08:00
Elliott Hughes
32e9163b2a resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp
Change-Id: I6efd0d4a0ece0b065d02796916355ad5ae8b4eea
2014-12-09 19:12:21 -08:00
Elliott Hughes
b1d67c1db1 am 7a497e3b: Merge "adb warns on remount when verity is enabled"
* commit '7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2':
  adb warns on remount when verity is enabled
2014-12-10 02:32:02 +00:00
Elliott Hughes
822eee94c3 am e1fb0899: Merge "fastbootd: Use FASTBOOT constants instead of ADB constants"
* commit 'e1fb0899452283255bb52950aefce24c36c95390':
  fastbootd: Use FASTBOOT constants instead of ADB constants
2014-12-10 02:32:01 +00:00
Elliott Hughes
c162dbb2ff am 83b4047b: Merge "adbd & fastbootd: Support for new f_fs descriptor format"
* commit '83b4047bc66729f8cf854c525e2bc8bac7c9587e':
  adbd & fastbootd: Support for new f_fs descriptor format
2014-12-10 02:32:00 +00:00
Elliott Hughes
c71562dd9d am 1dbf33b0: Merge "Fix build on mac."
* commit '1dbf33b0ca240d55fea477ecfb79052d9b006b89':
  Fix build on mac.
2014-12-10 02:31:59 +00:00
Elliott Hughes
d86af4dc5d am 173310a2: Merge "Add more debug information."
* commit '173310a27c1b58034bf47e08e58942137583fea8':
  Add more debug information.
2014-12-10 02:31:57 +00:00
Elliott Hughes
3094c26d1b am 3e16e2d6: Merge "Fix adb/fastboot windows compilations."
* commit '3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c':
  Fix adb/fastboot windows compilations.
2014-12-10 02:31:56 +00:00
Elliott Hughes
2598f0ad55 resolved conflicts for merge of 02ef15f1 to lmp-mr1-dev-plus-aosp
Change-Id: If44376782436b92c2d03a56df57572fc964158a9
2014-12-09 18:28:05 -08:00
Riley Andrews
cbdf4a95aa Merge "Fix some style issues in adb_commandline()." 2014-12-10 02:26:59 +00:00
Riley Andrews
0dc15b3a23 Merge "Refactor the host adb argument parsing loop to remove a goto" 2014-12-10 02:26:51 +00:00
Nick Kralevich
c43ca87406 Merge "Revert "Move property_context label handling to libselinux."" 2014-12-10 02:03:56 +00:00
Nick Kralevich
59f64ec31f Revert "Move property_context label handling to libselinux."
Emulator fails to boot.

This reverts commit 98069027bd.

Bug: 18692152
Change-Id: If362e1311bc3f07e033ba81190c05608ada7c361
2014-12-10 02:02:32 +00:00
Riley Andrews
98f58e83c0 Fix some style issues in adb_commandline().
Change-Id: I8ed7899e7e137405594b3f3cbb0a87eae411dfc9
2014-12-09 17:25:39 -08:00
Riley Andrews
c8514c886e Refactor the host adb argument parsing loop to remove a goto
Change-Id: I3412ac473abc4efa51a6275658e65f7191b5439d
2014-12-09 17:25:39 -08:00
Elliott Hughes
55c38f728a Merge "Fix build" 2014-12-10 01:06:27 +00:00
Paul Lawrence
1d931bca26 Fix build
(cherry-pick of 731136ca36bb7af1490856373d463e3a6c4df1c8.)

Change-Id: I9b493fd5fc5c5f62f02bc5234ccca2a5118380b4
2014-12-09 17:06:00 -08:00
Elliott Hughes
18237c77c8 Merge "Add adb enable-verity" 2014-12-10 01:05:20 +00:00
Paul Lawrence
982089d838 Add adb enable-verity
Note that it is *easy* to break your phone with this feature. It is
not a bug that reenabling verity after changing one byte of the system
partition stops the device booting.

(cherry-pick of 7c442e1700e6312727283db402dec6f666f1b55a.)

Bug: 18529433
Change-Id: I632e91281884471a362960f1ba30312d2669b8ff
2014-12-09 17:04:43 -08:00
Elliott Hughes
b471f5249b Merge "Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""" 2014-12-10 01:03:25 +00:00
Paul Lawrence
ec900bba20 Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
This reverts commit 152d2d4234.

Fixed build error, and also fixed memory leak spotted from warning.

(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
2014-12-09 17:02:17 -08:00
Elliott Hughes
7a497e3b5c Merge "adb warns on remount when verity is enabled" 2014-12-10 00:35:39 +00:00
Paul Lawrence
34637555c2 adb warns on remount when verity is enabled
(cherry-pick of f643beced1d154726dca7115014d2d1fdfcca993.)

Bug: 18119147
Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
2014-12-09 16:32:26 -08:00
Elliott Hughes
e1fb089945 Merge "fastbootd: Use FASTBOOT constants instead of ADB constants" 2014-12-10 00:27:09 +00:00
Badhri Jagan Sridharan
e3c72fd51a fastbootd: Use FASTBOOT constants instead of ADB constants
(cherry-pick of ae17fb8f24c2d4dbb000c8943e2caa428fbf4c9b.)

Change-Id: I4a67e7144b5c4a10e809821feb7f8c16540831cb
2014-12-09 16:26:25 -08:00
Elliott Hughes
83b4047bc6 Merge "adbd & fastbootd: Support for new f_fs descriptor format" 2014-12-10 00:25:51 +00:00
Badhri Jagan Sridharan
ab3446dd34 adbd & fastbootd: Support for new f_fs descriptor format
The patch "[RFC] usb: gadget: f_fs: Add flags
to  descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.

This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.

(cherry-pick of fad60336daa5a7adf82d8140cbddd1c735770e71.)

Bug: 17394972
Change-Id: I05095ccdcc74bf6953cbef847d7583eab137e12e
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
2014-12-09 16:20:15 -08:00
Elliott Hughes
1dbf33b0ca Merge "Fix build on mac." 2014-12-10 00:16:20 +00:00
leozwang
298b6c70a0 Fix build on mac.
On mac require a case.
Also, this code is not portable, will fix it in long run.

(cherry-pick of 0f1fda9ee80ba086e4c8960a7d153798e3cf3285.)

Change-Id: I76194b62cea29bd3d21c7ba6c3da4d549bea4738
2014-12-09 16:12:51 -08:00
Elliott Hughes
173310a27c Merge "Add more debug information." 2014-12-10 00:10:05 +00:00
leozwang
cbf0267f5b Add more debug information.
Re-commit https://googleplex-android-review.googlesource.com/#/c/519430/
Add fix for win_sdk build.

Add socketpair debug log.
Also output thread information in log on host side.

(cherry-pick of adb09fa01a16d8c5c92c2f8d325e1678c531223f.)

Change-Id: I21021bc111a3f7362a91b70593e3738125878118
2014-12-09 16:08:24 -08:00
Elliott Hughes
3e16e2d619 Merge "Fix adb/fastboot windows compilations." 2014-12-10 00:06:31 +00:00
Christopher Ferris
67a7a4ae27 Fix adb/fastboot windows compilations.
Many of the windows files where not including stdlib.h even though they
are using malloc/free calls.

(cherry-pick of ae7bf0959bd3f79afbf365e41f015ed1c304afdc.)

Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
2014-12-09 16:03:29 -08:00
Elliott Hughes
02ef15f1d7 Merge "Introduce "adb keygen"" 2014-12-10 00:01:06 +00:00
dcashman
a5f2da5012 am 3f760827: Merge "Move property_context label handling to libselinux."
* commit '3f7608276b2057641bfcfcc3ab272f050eeb0f4c':
  Move property_context label handling to libselinux.
2014-12-09 17:37:10 +00:00
dcashman
3f7608276b Merge "Move property_context label handling to libselinux." 2014-12-09 17:27:57 +00:00
Elliott Hughes
7da97265e5 am ab0d5425: Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux"
* commit 'ab0d542506b5fdbcc431ba2606248471d22322ba':
  fastboot: Support USB 3.x SuperSpeed devices on Linux
2014-12-09 14:40:58 +00:00
Elliott Hughes
c6e34ed6f9 am dbb7c46d: Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors"
* commit 'dbb7c46d686e55aabd52a8e4c5494768c8955a2f':
  ADB on linux: Handle USB SuperSpeed extra Descriptors
2014-12-09 14:40:57 +00:00
Elliott Hughes
78b98d8807 am a5e9b065: Merge "adb: enable superspeed support"
* commit 'a5e9b065efcd2ee91a7a9bee4a44d85c5d30cf13':
  adb: enable superspeed support
2014-12-09 13:18:46 +00:00
Elliott Hughes
9ebc6c6b60 am 51248395: Merge "Clean up adb/Android.mk"
* commit '51248395626ceb9f54016e78ebb4adee17b290c1':
  Clean up adb/Android.mk
2014-12-09 11:25:32 +00:00
Narayan Kamath
a45020bbcd am 3f5bba53: Merge "Reject zip archives whose entry names are not valid UTF-8."
* commit '3f5bba537ee278212ef29c6b608c87e6bc06da5f':
  Reject zip archives whose entry names are not valid UTF-8.
2014-12-09 11:24:50 +00:00
Elliott Hughes
ab0d542506 Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux" 2014-12-08 23:04:58 +00:00
Elliott Hughes
dbb7c46d68 Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors" 2014-12-08 22:35:41 +00:00
Nick Kralevich
bea3f9c345 Introduce "adb keygen"
Introduce the "adb keygen" command.

  Usage: adb keygen <filename>

This command creates an adb public/private key pair in a user
specified file. This can be used to create new adb keys, or rotate
existing keys.

Modify adb's key generation routines to use the HOSTNAME/LOGNAME
environment variables if available. This allows someone to override
the username/hostname embedded within the adb public key file if
desired. Fallback to the old mechanisms if those environment
variables aren't available.

Bug: 18342715
Change-Id: Ibccee6088d4609aa05ad6687d3a1d8a8689d3e8a

(cherry picked from commit af782b9f2a)

Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
2014-12-08 13:44:39 -08:00
Elliott Hughes
a5e9b065ef Merge "adb: enable superspeed support" 2014-12-08 19:23:30 +00:00
Elliott Hughes
5124839562 Merge "Clean up adb/Android.mk" 2014-12-08 18:02:30 +00:00
Zhuang Jin Can
d6ee9f26a5 adb: enable superspeed support
Change-Id: I5a350bfa5641365d7a0939d89c6f477c335e948a
Signed-off-by: Zhuang Jin Can <jin.can.zhuang@intel.com>
Signed-off-by: Robert Chiras <robert.chiras@intel.com>
2014-12-08 16:31:18 +02:00
Narayan Kamath
3f5bba537e Merge "Reject zip archives whose entry names are not valid UTF-8." 2014-12-08 13:08:34 +00:00
Narayan Kamath
044bc8ee89 Reject zip archives whose entry names are not valid UTF-8.
bug: 18584205
Change-Id: Iaf3e8211dab6a1e3923f7fee6ea7fc693972dba3
2014-12-08 12:25:05 +00:00
Trevor Drake
b79a2d55f7 Clean up adb/Android.mk
Removed redundant LOCAL_C_INCLUDES.
Switch from using libunz to libz

Change-Id: Ic90c582fa56453bbac09561158e73f240dd47503
2014-12-07 15:13:29 +00:00