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
a9aa7abad6
am fb849bd4: am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."
...
* commit 'fb849bd46e28bd47a0545cf56d6683d138f5f09d':
Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:38:27 +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
e14c9a4617
am 6d94763b: am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."
...
* commit '6d94763b2fd88a66197927d3233eff91e2b8044a':
Include ADB_HOST only code in #if ADB_HOST.
2014-09-06 00:10:38 +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
Elliott Hughes
317a4df754
am 709569fe: am 0dcc3f65: am 9c814648: Merge "Add USB Vendor ID for Micromax Informatics Ltd."
...
* commit '709569febf97ab2f3c94a28c42cce06ebf56114c':
Add USB Vendor ID for Micromax Informatics Ltd.
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
Badhri Jagan Sridharan
da0500426f
am 37441496: am 97b536f1: init.usb.rc: Change product id to for add only config
...
* commit '374414967a294db75c2706e691ba8b9af9aa1acb':
init.usb.rc: Change product id to for add only config
2014-09-05 23:04:27 +00: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
a24d85a7e8
am c5fc8b1d: am 7fd87c0b: am 1ac35b09: Merge "Fix for parenthesis error"
...
* commit 'c5fc8b1d232e997670b5c798da2c6010396d5765':
Fix for parenthesis error
2014-09-04 23:36:42 +00:00
Andreas Gampe
5cdeff1c42
am 4f65030e: am 8e10bfd9: am 88d1bc0e: Merge "NativeBridge: Refactor for new initialization flow"
...
* commit '4f65030e0c58665dea57c7f5fb4e104ed29fac7e':
NativeBridge: Refactor for new initialization flow
2014-09-04 23:36:42 +00: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
1d958157df
am e6a70155: am 3c8e92ce: Fix for parenthesis error
...
* commit 'e6a701557dbf0f7e428dc7b46a6b685ca8c4977c':
Fix for parenthesis error
2014-09-04 18:53:49 +00: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
92c09a93d9
am a5a5fb46: am cad56b6a: Remove android_... store_barriers and 64-bit atomics.
...
* commit 'a5a5fb46bc36a8b8ceaece54e2bc20f8473be852':
Remove android_... store_barriers and 64-bit atomics.
2014-09-03 17:40:38 +00: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
0ee68eba85
am 1ed30702: am 6a594683: logcat: document help tail from time
...
* commit '1ed30702f5bbdcf63d13bc0035d044c1b1dfe70a':
logcat: document help tail from time
2014-09-03 09:12:24 +00:00
Mark Salyzyn
d971f19b23
am be589211: am 19e8de07: logd: simplification, return NULL instead of threadexit NULL
...
* commit 'be589211b498632001011ca66dbdc83b0644d92a':
logd: simplification, return NULL instead of threadexit NULL
2014-09-03 09:12:23 +00: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
Mark Salyzyn
236a61975f
am 81496031: am 3888a4d0: am 35a76df5: Merge "logcat: document help tail from time"
...
* commit '8149603192215e718c6fa4f08b5fe06ebc500043':
logcat: document help tail from time
2014-09-03 05:04:15 +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
Nick Kralevich
728547f0ac
am 042ece12: am 465fc3b9: am 1cbf4329: Merge "Remove obsolete warning from restorecon_recursive documentation."
...
* commit '042ece12be2e7f89b4181bee51822ed2d3644621':
Remove obsolete warning from restorecon_recursive documentation.
2014-09-02 17:44:40 +00:00
Nick Kralevich
042ece12be
am 465fc3b9: am 1cbf4329: Merge "Remove obsolete warning from restorecon_recursive documentation."
...
* commit '465fc3b974384feea3ea991a5e2f801ce1253e2f':
Remove obsolete warning from restorecon_recursive documentation.
2014-09-02 15:59:17 +00:00
Nick Kralevich
465fc3b974
am 1cbf4329: Merge "Remove obsolete warning from restorecon_recursive documentation."
...
* commit '1cbf432918a2375378e1762f2f329d17ab7ec765':
Remove obsolete warning from restorecon_recursive documentation.
2014-09-02 15:52:11 +00:00
Nick Kralevich
1cbf432918
Merge "Remove obsolete warning from restorecon_recursive documentation."
2014-09-02 15:39:07 +00:00
Stephen Smalley
d9c19b0c15
Remove obsolete warning from restorecon_recursive documentation.
...
We originally included a warning to not invoke restorecon_recursive
with a path leading to a shell-writable or app-writable directory
due to concerns about the potential for mischief with symlinks during
the restorecon_recursive. However, this warning was never necessary for
calling restorecon_recursive during system initialization before an adb
shell or app can run, and we have further prohibited init from
reading/following symlinks that can be created by shell or apps in
policy, so this warning is superfluous. It also contradicts current
usage of restorecon_recursive in rootdir/init.rc, since it is called
there on /data.
Change-Id: I28a635e0b5991ced8adcef93e7a04f9d9e5634fd
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-02 09:34:53 -04:00
Mark Salyzyn
190b7ac9d2
logcat: document help tail from time
...
(cherry picked from commit 6a594683ec )
Bug: 17323719
Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
2014-09-01 11:45:53 -07:00