Chih-hung Hsieh
0bfb717a37
Merge "Use -Werror in frameworks/base"
...
am: 16fbd3a1d8
2017-10-16 19:24:53 +00:00
Chih-Hung Hsieh
c7edf078f9
Use -Werror in frameworks/base
...
* Fix unused variable and return value warnings.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I890e65a20848d00559ba5a4f9691be1347b456af
2017-10-13 16:25:16 -07:00
Steven Moreland
32bdb1e9b0
Merge "Remove unused variable from screencap."
...
am: 376234fc74
2017-09-19 03:22:42 +00:00
Treehugger Robot
376234fc74
Merge "Remove unused variable from screencap."
2017-09-19 03:12:18 +00:00
Dan Willemsen
c28d591b36
Merge changes I93cf24d4,I32e438ef
...
am: 30798ad13a
2017-09-10 01:44:06 +00:00
Treehugger Robot
30798ad13a
Merge changes I93cf24d4,I32e438ef
...
* changes:
Convert host tools to Android.bp
Rename aapt_defaults to aapt2_defaults
2017-09-10 01:29:21 +00:00
Dan Willemsen
392d4e7f47
Convert libhidcommand_jni to Android.bp
...
See build/soong/README.md for more information.
Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
Merged-In: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
2017-09-09 19:24:21 +00:00
Dan Willemsen
8119ffa299
Convert libhidcommand_jni to Android.bp
...
See build/soong/README.md for more information.
Test: m libhidcommand_jni
Change-Id: Ica144979a2f89e0a9ed8eb4a816024aa318043e6
2017-09-08 23:27:36 -07:00
Dan Willemsen
d3eac266b0
Convert host tools to Android.bp
...
See build/soong/README.md for more information.
Test: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt
Test: mmma frameworks/base
Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests
Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests
Change-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877
2017-09-09 06:18:48 +00:00
Adam Lesinski
a15992086c
Merge "idmap: include idmap version in check for stale file"
...
am: 609887a980
2017-09-06 20:36:28 +00:00
Mårten Kongstad
4f4218a3be
Merge "idmap: suppress print for padded resources"
...
am: 3949701c6f
2017-09-06 20:04:35 +00:00
Mårten Kongstad
42ebcb80b5
idmap: include idmap version in check for stale file
...
Teach is_idmap_stale_fd to include the idmap version in the list of
criteria used to determine if an idmap file is already up to date.
Change-Id: I3e4e2aa502fe76a034c3977bdb055a1df7e665be
2017-09-04 13:16:16 +02:00
Mårten Kongstad
ea2a1b9b27
idmap: suppress print for padded resources
...
Bug: 31052947
Test: manual
Change-Id: I13723bf8b1cdeecfd71750123eb1f949f96b7c3e
2017-09-04 13:16:16 +02:00
Steven Moreland
8b3ed84fc3
Remove unused variable from screencap.
...
Noticed while working on b/65206688.
Test: links
Change-Id: Ia4d67022eb5c500372090c0e025e340989c41643
2017-08-30 17:03:53 -07:00
Steven Moreland
e04a0bf5c7
Merge "ScopedUtfChars: use proper nativehelper headers"
...
am: 75c9e4d594
2017-08-11 21:07:06 +00:00
Steven Moreland
c195af9d0c
ScopedUtfChars: use proper nativehelper headers
...
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug: 63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
2017-08-10 18:08:37 -07:00
Steven Moreland
65e2ca2808
ScopedUtfChars: use proper nativehelper headers
...
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug: 63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
2017-08-10 23:00:10 +00:00
Takashi Furukawa
c6e2c78ee6
Merge "Add null check for Wi-Fi command" am: 43ee2ac140 am: 51e24de109
...
am: a6e588fffc
2017-08-08 18:27:19 +00:00
Takashi Furukawa
51e24de109
Merge "Add null check for Wi-Fi command"
...
am: 43ee2ac140
2017-08-08 18:14:53 +00:00
Treehugger Robot
43ee2ac140
Merge "Add null check for Wi-Fi command"
2017-08-08 18:03:14 +00:00
Martijn Coenen
6513db5b49
Merge "screencap: always exit with _exit()." into oc-dr1-dev
...
am: 4499576db0
2017-08-07 11:01:15 +00:00
Martijn Coenen
48b7408201
screencap: always exit with _exit().
...
Delay starting the threadpool until necessary,
and once started, always exit with _exit().
Bug: 36066697
Bug: 62956201
Test: mma, screencap -p
Merged-In: I0b9ab542f6434f57b498cd7dc41219ef57e36721
Change-Id: I0b9ab542f6434f57b498cd7dc41219ef57e36721
(cherry picked from commit 4d125c1df6
2017-08-04 07:31:09 +00:00
Steven Moreland
f91ca58ec4
com.android.server: use proper nativehelper headers
...
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: com.android.server finds headers
Bug: 63762847
Merged-In: Icb3018f520004f65e8dd565d6e1d563551548eba
Change-Id: Ib36fec53c30760af5dac4097b3eceda6c4c6c7f0
2017-08-02 14:19:20 -07:00
Steven Moreland
795bcc5b75
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944
...
am: 81972a18e4
2017-08-02 15:30:37 +00:00
Steven Moreland
c95dca8ce1
com.android.server: use proper nativehelper headers
...
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: com.android.server finds headers
Bug: 63762847
Change-Id: Icb3018f520004f65e8dd565d6e1d563551548eba
2017-08-01 20:04:50 +00:00
Takashi Furukawa
7ba244d6d8
Add null check for Wi-Fi command
...
When WifiService is not ready during boot phase and Wi-Fi command
is executed on console, NullPointerException happens.
To prevent this, null check is needed.
Test: Manual test
Bug: 64040515
Change-Id: I5684cdc7661b7d93fd6f2ac61863919077d12935
2017-07-27 10:40:01 +09:00
George Burgess IV
10307ebe1f
Merge "app_main: silence static analyzer warnings" am: cf188f664a am: 8a4be2a6ae
...
am: 5987ab35ca
2017-07-12 03:07:46 +00:00
George Burgess IV
8a4be2a6ae
Merge "app_main: silence static analyzer warnings"
...
am: cf188f664a
2017-07-12 02:54:24 +00:00
George Burgess IV
c29844d072
app_main: silence static analyzer warnings
...
This silences two warnings:
frameworks/base/cmds/app_process/app_main.cpp:238:11: warning: Potential
memory leak
frameworks/base/cmds/app_process/app_main.cpp:261:9: warning: Potential
memory leak
As the (existing) comment notes, we nuke argv later in main(), so these
copies are necessary. Since these args need to live for basically the
entire life of the process, it seems pointless to go out of our way to
free them.
Bug: 27101951
Test: mma. Static analyzer warnings are gone.
Change-Id: Icbfabfede9db909f6acb274b697cb6076c3fc11f
2017-07-11 17:28:15 -07:00
Santos Cordon
99eac47966
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
...
am: 67143a8cfc
2017-06-29 21:31:53 +00:00
Santos Cordon
627a68f852
Add ability to turn off VR virtual display functionality.
...
Add flag to enable/disable virtual displays via the existing
setDisplayProperties API. This makes it possible for the VR system
to turn off virtual displays if necessary after we ship.
Bug: 62546364
Test: Run 'adb shell vr enable-virtual-display [true|false] to toggle while 2d in 3d
runs.
Change-Id: Iae029be501d61189fced981dbc554e984fa7ed4b
2017-06-29 19:01:39 +00:00
Narayan Kamath
6da2b86237
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am: 31cf02742e" into oc-dr1-dev
...
am: 04bd18fb30
2017-06-22 17:48:32 +00:00
Narayan Kamath
bc8c0e9c1d
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
...
am: 31cf02742e
2017-06-22 17:34:12 +00:00
Narayan Kamath
8bc86321ff
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
...
am: 31cf02742e
2017-06-22 10:37:47 +00:00
Brian Carlstrom
9377ce67a8
_exit(0) on clean shutdown, not _exit(1)
...
Test: m -j32 checkbuild
Bug: 36066697
Change-Id: Iaed45a86f9603badf26041212dfc5e9399bc0a0c
2017-06-21 22:15:10 -07:00
Josh Gao
5966301234
Merge "Hack around b/36066697." into oc-dev am: e139434e3a
...
am: 17d3fc2e68
2017-06-20 04:36:03 +00:00
Josh Gao
8effb089ed
Merge "Hack around b/36066697." into oc-dev
...
am: e139434e3a
2017-06-20 04:31:40 +00:00
Josh Gao
17d3fc2e68
Merge "Hack around b/36066697." into oc-dev
...
am: e139434e3a
2017-06-20 04:30:07 +00:00
TreeHugger Robot
e139434e3a
Merge "Hack around b/36066697." into oc-dev
2017-06-20 04:24:14 +00:00
Chet Haase
470105042e
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3e7fff
...
am: 972734f592
2017-06-19 23:47:17 +00:00
Chet Haase
972734f592
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
...
am: c36e3e7fff
2017-06-19 23:39:58 +00:00
Chet Haase
97f7dbb004
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
...
am: c36e3e7fff
2017-06-19 23:39:54 +00:00
Josh Gao
909825886c
Hack around b/36066697.
...
Avoid calling libbinder's static destructors by calling _exit instead
of returning in main.
Bug: http://b/36066697
Test: treehugger
Change-Id: I81dd50453f1ea64d97ec97d207fff732b3c62512
2017-06-19 14:10:45 -07:00
Myles Watson
5b6d397e21
Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427
...
am: ffd0a7d95c
2017-06-17 01:47:35 +00:00
Myles Watson
ffd0a7d95c
Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd
...
am: 7ba9270427
2017-06-17 01:41:09 +00:00
Treehugger Robot
b5c4e80ecd
Merge "Simplify NfcCommand and avoid NullPointerExceptions"
2017-06-17 01:25:15 +00:00
Myles Watson
e4f1a15503
Merge "Add a svc command for enabling/disabling Bluetooth" am: 7d136b777a am: c0c6e1243b
...
am: d84e4812ef
2017-06-16 23:55:32 +00:00
Myles Watson
d84e4812ef
Merge "Add a svc command for enabling/disabling Bluetooth" am: 7d136b777a
...
am: c0c6e1243b
2017-06-16 23:47:57 +00:00
Myles Watson
4794e7efdf
Add a svc command for enabling/disabling Bluetooth
...
Bug: 62067926
Test: svc bluetooth disable
svc bluetooth enable
Change-Id: I9a53d7ab1805df98d8cf1292cf1061eacc14655d
2017-06-16 23:10:38 +00:00
Myles Watson
d3375090aa
Simplify NfcCommand and avoid NullPointerExceptions
...
Test: adb root
adb shell
stop
svc nfc enable
start
svc nfc disable
Change-Id: Ie5170f0525f8830d1d80b5607191ce95e78a55ae
2017-06-15 21:12:14 +00:00
