Elliott Hughes
6608a46c59
am c4ff0389
: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
...
* commit 'c4ff03899dd6259299c90e9b9e344ec737cd77e4':
adb: Add USB vendor ID for Alco Digital Devices Limited
2014-09-10 18:20:43 +00:00
Elliott Hughes
c4ff03899d
Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
2014-09-10 18:13:07 +00:00
Chih-Hung Hsieh
aed0769eef
am 04929638
: am da3510b2
: Merge "Avoid partial initialization warning."
...
* commit '049296382d3604868378c957e999ae63cf3a1f5f':
Avoid partial initialization warning.
2014-09-10 17:21:11 +00:00
Chih-Hung Hsieh
049296382d
am da3510b2
: Merge "Avoid partial initialization warning."
...
* commit 'da3510b27246de1ab3eda38a14a80839e2f39c64':
Avoid partial initialization warning.
2014-09-10 17:09:51 +00:00
Chih-Hung Hsieh
da3510b272
Merge "Avoid partial initialization warning."
2014-09-10 16:32:53 +00:00
Andreas Gampe
dc0e2389c5
am 4d1365b4
: Merge "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen" into lmp-dev
...
* commit '4d1365b4d3a1b3f904eb5900be8b5269a8807511':
DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen
2014-09-10 07:20:32 +00:00
DanielMo
553630e423
adb: Add USB vendor ID for Alco Digital Devices Limited
...
Change-Id: I50d343d583e688e9f8a72d1c61618b384e310fe1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-09-10 13:58:32 +08:00
Andreas Gampe
4d1365b4d3
Merge "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen" into lmp-dev
2014-09-10 05:09:59 +00:00
Andreas Gampe
f00de413ed
DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen
...
Bug: 17440362
Change-Id: Ifceeecd39d4ffd948f62212ebb5280ebec9bf6ff
2014-09-10 05:09:21 +00:00
Sreeram Ramachandran
18d5aa4d5a
am 69052994
: Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
...
* commit '69052994fd21f2b594295f62e2f867e911e8468d':
Support resetting connections tied to any nonexistent address.
2014-09-10 00:51:22 +00:00
Sreeram Ramachandran
69052994fd
Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
2014-09-09 23:24:45 +00:00
Jeff Sharkey
84e533d7b0
am 228f8261
: Merge "delete_file() should force removal." into lmp-dev
...
* commit '228f8261fd778e1c03184b5f79f979d1a25abf50':
delete_file() should force removal.
2014-09-09 21:56:14 +00:00
Jeff Sharkey
228f8261fd
Merge "delete_file() should force removal." into lmp-dev
2014-09-09 20:29:57 +00:00
Jeff Sharkey
41b3cfa296
delete_file() should force removal.
...
It's a shell command with a pty, but it's not really interactive,
so force the removal to avoid giving users dead-end prompts.
Bug: 17339227
Change-Id: Iaf5d95c49f032066aa741a711a2c45557d93c598
2014-09-09 12:38:30 -07:00
Sreeram Ramachandran
17622d09d5
Support resetting connections tied to any nonexistent address.
...
Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
2014-09-08 23:35:52 -07:00
Andreas Gampe
eda13fca2e
am 41df668c
: NativeBridge: Refactor for new initialization flow
...
* commit '41df668c7be461f461b3d70951dee7634ded868f':
NativeBridge: Refactor for new initialization flow
2014-09-09 05:13:33 +00:00
Andreas Gampe
41df668c7b
NativeBridge: Refactor for new initialization flow
...
Setup becomes Load, have explicit Initialize and Unload.
(cherry picked from commit 035bd7541e
)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 11:12:13 -07:00
Chih-Hung Hsieh
e32b8952a6
Avoid partial initialization warning.
...
Clang compiler is picky about partial initialization and
here we only need to initialize the 'len' field.
BUG: 17410010
Change-Id: I718582cef96d5f4076b5ff1c7b8162327e7809b6
2014-09-08 14:41:28 +00:00
Christopher Ferris
fb849bd46e
am fc8e16bf
: am 2c805883
: Merge "Add -Wno-deprecated-declarations to makefiles."
...
* commit 'fc8e16bfc59fcebaf554e266aae808eed5f2d078':
Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:25:48 +00:00
Christopher Ferris
fc8e16bfc5
am 2c805883
: Merge "Add -Wno-deprecated-declarations to makefiles."
...
* commit '2c805883408339823d3f3ca23aceb08a1783ebbd':
Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:02:42 +00:00
Christopher Ferris
2c80588340
Merge "Add -Wno-deprecated-declarations to makefiles."
2014-09-06 16:56:46 +00:00
Chih-Hung Hsieh
6d94763b2f
am 379ca94d
: am 299a32c8
: Merge "Include ADB_HOST only code in #if ADB_HOST."
...
* commit '379ca94d00cab91a77ad8991cc92e2b4d4236d56':
Include ADB_HOST only code in #if ADB_HOST.
2014-09-05 23:58:09 +00:00
Chih-Hung Hsieh
379ca94d00
am 299a32c8
: Merge "Include ADB_HOST only code in #if ADB_HOST."
...
* commit '299a32c8038d4152b302948e5b961f2fcc04f6b2':
Include ADB_HOST only code in #if ADB_HOST.
2014-09-05 23:44:27 +00:00
Chih-Hung Hsieh
299a32c803
Merge "Include ADB_HOST only code in #if ADB_HOST."
2014-09-05 23:38:07 +00:00
Chih-Hung Hsieh
f787b381b6
Include ADB_HOST only code in #if ADB_HOST.
...
BUG: 17409892
Change-Id: Ic1199dd745191aba718fdb18343e87c0ccbe530b
2014-09-05 16:34:02 -07:00
Elliott Hughes
709569febf
am 0dcc3f65
: am 9c814648
: Merge "Add USB Vendor ID for Micromax Informatics Ltd."
...
* commit '0dcc3f65b1ff5fa771618436ee4bfdd44cd2f672':
Add USB Vendor ID for Micromax Informatics Ltd.
2014-09-05 23:31:15 +00:00
Elliott Hughes
0dcc3f65b1
am 9c814648
: Merge "Add USB Vendor ID for Micromax Informatics Ltd."
...
* commit '9c814648aefb7fe2ef30a62cf3b6d9e506a9b301':
Add USB Vendor ID for Micromax Informatics Ltd.
2014-09-05 23:13:58 +00:00
Elliott Hughes
9c814648ae
Merge "Add USB Vendor ID for Micromax Informatics Ltd."
2014-09-05 23:07:08 +00:00
Abhishek Karmakar
4d10523be8
Add USB Vendor ID for Micromax Informatics Ltd.
...
Signed-off-by: Abhishek Karmakar <abhishek.karmakar@micromaxinfo.com>
Change-Id: I63462eb15575cc953ac0246ee5d4c883d3678c08
2014-09-05 16:06:25 -07:00
Adam Langley
179d9d6587
Switch from using base64 BIOs to encoding funcs.
...
The OpenSSL base64 BIO is going away in BoringSSL. This change switches
to using the explicit base64 functions which are availible in both
OpenSSL and BoringSSL. The BoringSSL helper functions (i.e. for
calculating the size of the base64 encoding) are wrapped in #ifdefs so
that this change isn't coupled with the switch to BoringSSL. Once that
switch is complete, the #ifdefs can be removed.
Bug: 17409664
Change-Id: I42bac3bc93a1fb39feed39a8917d8e38d97629d3
Signed-off-by: Adam Langley <agl@google.com>
2014-09-05 15:54:30 -07:00
Badhri Jagan Sridharan
374414967a
am 97b536f1
: init.usb.rc: Change product id to for add only config
...
* commit '97b536f1fbfd1fa711833b7dc92aed902dea4bdf':
init.usb.rc: Change product id to for add only config
2014-09-05 22:51:41 +00:00
Badhri Jagan Sridharan
97b536f1fb
init.usb.rc: Change product id to for add only config
...
Change product id from D002 to 4EE7 when adb is the
only supported function
Change-Id: I8f6bcb9a1dc5ea6da0493a2dd730f9ac1f0bed24
2014-09-05 12:33:46 -07:00
Mark Salyzyn
c5fc8b1d23
am 7fd87c0b
: am 1ac35b09
: Merge "Fix for parenthesis error"
...
* commit '7fd87c0bf125c4f1a18116cdebbe2c065be8574e':
Fix for parenthesis error
2014-09-04 23:22:50 +00:00
Andreas Gampe
4f65030e0c
am 8e10bfd9
: am 88d1bc0e
: Merge "NativeBridge: Refactor for new initialization flow"
...
* commit '8e10bfd9cc543fdec8fec26c320f649f72b15e3b':
NativeBridge: Refactor for new initialization flow
2014-09-04 23:22:29 +00:00
Christopher Ferris
51448eb39e
Add -Wno-deprecated-declarations to makefiles.
...
This is in preparation for an update to the uapi v3.16.1
kernel headers that marks the structure usb_functionfs_descs_head
as deprecated.
Change-Id: I25d2f32ce8e95e038e6df201ce2f8126f5a8b6fa
2014-09-04 16:13:42 -07:00
Mark Salyzyn
7fd87c0bf1
am 1ac35b09
: Merge "Fix for parenthesis error"
...
* commit '1ac35b099636399eab8f16d94b6210ec366f9c99':
Fix for parenthesis error
2014-09-04 22:54:59 +00:00
Mark Salyzyn
1ac35b0996
Merge "Fix for parenthesis error"
2014-09-04 22:45:49 +00:00
Andreas Gampe
8e10bfd9cc
am 88d1bc0e
: Merge "NativeBridge: Refactor for new initialization flow"
...
* commit '88d1bc0ebd7a02c36e64a1e46ad5678d521b955d':
NativeBridge: Refactor for new initialization flow
2014-09-04 21:59:44 +00:00
Andreas Gampe
88d1bc0ebd
Merge "NativeBridge: Refactor for new initialization flow"
2014-09-04 21:47:30 +00:00
Andreas Gampe
035bd7541e
NativeBridge: Refactor for new initialization flow
...
Setup becomes Load, have explicit Initialize and Unload.
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-04 12:57:54 -07:00
Arseniy Antonov
e6a701557d
am 3c8e92ce
: Fix for parenthesis error
...
* commit '3c8e92cebe9f5246f502d9e82d16f9621ac0bed7':
Fix for parenthesis error
2014-09-04 18:40:28 +00:00
Arseniy Antonov
3c8e92cebe
Fix for parenthesis error
...
Added parentheses as it was suggested by compiler.
error: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' [-Werror=parentheses]
(Cherry picked from commit c3ce224c62
)
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
Change-Id: Ic3746d9804488411d10d460ddfda11f1fad8efef
2014-09-04 11:17:40 -07:00
Hans Boehm
a5a5fb46bc
am cad56b6a
: Remove android_... store_barriers and 64-bit atomics.
...
* commit 'cad56b6ad3ba24d76e073c024aae78d2282058f3':
Remove android_... store_barriers and 64-bit atomics.
2014-09-03 14:34:18 +00:00
Arseniy Antonov
c3ce224c62
Fix for parenthesis error
...
Added parentheses as it was suggested by compiler.
error: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' [-Werror=parentheses]
Change-Id: Ic3746d9804488411d10d460ddfda11f1fad8efef
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
2014-09-03 17:29:20 +04:00
Mark Salyzyn
1ed30702f5
am 6a594683
: logcat: document help tail from time
...
* commit '6a594683ec8aa2c8cee98a95f502772db515e60e':
logcat: document help tail from time
2014-09-03 05:07:38 +00:00
Mark Salyzyn
be589211b4
am 19e8de07
: logd: simplification, return NULL instead of threadexit NULL
...
* commit '19e8de0742e84355a63feb48b7e1fc6ffbcfbae1':
logd: simplification, return NULL instead of threadexit NULL
2014-09-03 05:07:38 +00:00
Hans Boehm
cad56b6ad3
Remove android_... store_barriers and 64-bit atomics.
...
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses. All users should move
to C11 or C++11 atomics.
(Resolved conflicts in atomic-...64.h with uniprocessor support
removal as in AOSP.)
Bug:16880454
Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
(cherry picked from commit 9959ed9530
)
2014-09-02 17:08:38 -07:00
Mark Salyzyn
8149603192
am 3888a4d0
: am 35a76df5
: Merge "logcat: document help tail from time"
...
* commit '3888a4d07f7341c103c618f331fb04d93d9c532b':
logcat: document help tail from time
2014-09-02 22:02:52 +00:00
Mark Salyzyn
3888a4d07f
am 35a76df5
: Merge "logcat: document help tail from time"
...
* commit '35a76df583a07524bec5ccaae8082a00e0c06867':
logcat: document help tail from time
2014-09-02 21:45:15 +00:00
Mark Salyzyn
35a76df583
Merge "logcat: document help tail from time"
2014-09-02 21:35:15 +00:00