2099 Commits

Author SHA1 Message Date
Jerry Zhang
7ca5d3a334 DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager
Cherry-pick from 30b9adfad1c5055044f0b585782b10f764e0ddf9

The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.

Also added svc command for this so it can be
used and tested while the UI is worked on.

Bug: 62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern

Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
2018-01-12 15:35:43 +00:00
gaoshang
65a885c3ac input cmds: fix keyevent not support sources parameter
reused args.length repalce length.

https://issuetracker.google.com/issues/70654695
Test: input cmds

Change-Id: Ifd8600d66d1647ae677add6b9d95b1d6831d6edb
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
2017-12-14 10:09:05 +00:00
Chih-hung Hsieh
267a2a8c8a Merge "Use -Werror in frameworks/base"
am: a29836ad04

Change-Id: Ie76322acc3b471da60a033cfa2474c1039d70339
2017-11-20 21:33:00 +00:00
Chih-Hung Hsieh
8bb58ed00e Use -Werror in frameworks/base
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ibfe36a62d9a91b7df813b42e18dafaa58dc8b60d
2017-11-20 11:13:48 -08:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
George Burgess IV
6c1688850e cmds: add #!s
Without this, exec()ing these fails.

Found with `grep -L bin/sh $(grep -Rl Script)`

Bug: None
Test: exec()ed each of these scripts; I no longer get "exec format
error" for any of them.
Change-Id: I47db5007e5cc14ab91eb846b7bffecb925d37874
2017-11-05 01:07:30 -07:00
Chih-hung Hsieh
decc397b26 Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8 am: 0bfb717a37
am: 9f004b1752

Change-Id: I6517ee1689b0247caf830a6c3528bfa9bcf91f75
2017-10-16 19:50:38 +00:00
Chih-hung Hsieh
0bfb717a37 Merge "Use -Werror in frameworks/base"
am: 16fbd3a1d8

Change-Id: Iab69cf4f99cf4bedd12eb7764c773a893bfe5343
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
2aea4cae01 Merge "Remove unused variable from screencap." am: 376234fc74 am: 32bdb1e9b0
am: 0fcb7719e0

Change-Id: I6aebd6df0bf9734e1567db31d31bfe85609cbb48
2017-09-19 03:35:00 +00:00
Steven Moreland
32bdb1e9b0 Merge "Remove unused variable from screencap."
am: 376234fc74

Change-Id: I5afb38c24ab6924925ab2852c5fe0ef29a91a2ff
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
Bernardo Rufino
0ede3a0a9b Merge "Add logs to IOExceptions during adb backup" into oc-mr1-dev
am: 786354a53f

Change-Id: I21dc3f5523632306f69e9f8d0f99072f52742f85
2017-09-14 15:28:59 +00:00
Bernardo Rufino
628fee52b1 Add logs to IOExceptions during adb backup
Test: Run adb backup
Bug: 65435587
Change-Id: I744cb2878654b716858d7c9bedeb12fb9978df6b
2017-09-13 13:58:38 +00:00
Dan Willemsen
2e9ec5f0de Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36
am: 59225490b8

Change-Id: I6cf57e951900b3df816070feee0d3bf92a6a5a7d
2017-09-10 02:05:05 +00:00
Dan Willemsen
c28d591b36 Merge changes I93cf24d4,I32e438ef
am: 30798ad13a

Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4
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
f1ae466af8 Merge "Convert libhidcommand_jni to Android.bp" into stage-aosp-master am: a97f4d4ac3
am: 21d5fdbbce

Change-Id: I7d2ca2f6c9b9c8522510d4e7ac1d9ded0167b38b
2017-09-09 19:43:54 +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
d0a60f9406 Merge "idmap: include idmap version in check for stale file" am: 609887a980 am: a15992086c
am: d7f3a7b095

Change-Id: I7f580393d3eb044f69b9017c7528dd4e19a35aba
2017-09-06 21:08:35 +00:00
Mårten Kongstad
22720ffb5f Merge "idmap: suppress print for padded resources" am: 3949701c6f am: 4f4218a3be
am: aed3472304

Change-Id: Ie98121efacb6327e173b9de55aabe80120948864
2017-09-06 20:37:29 +00:00
Adam Lesinski
a15992086c Merge "idmap: include idmap version in check for stale file"
am: 609887a980

Change-Id: I4779cd92041fe33a95c0034c539c48989ca8e6df
2017-09-06 20:36:28 +00:00
Mårten Kongstad
4f4218a3be Merge "idmap: suppress print for padded resources"
am: 3949701c6f

Change-Id: I5d92bdc11172159ea8ad95614e2b4d4535a48e45
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
Siarhei Vishniakou
235b6fb59c Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev
am: d7d9b8939e

Change-Id: I4bb5e08e8019527bd5a3847ae32798187e0a4b0a
2017-08-26 11:33:16 +00:00
TreeHugger Robot
d7d9b8939e Merge "DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel" into oc-mr1-dev 2017-08-26 11:26:42 +00:00
Siarhei Vishniakou
388ca7feb0 DO NOT MERGE Use CREATE instead of CREATE2 for 3.10 kernel
CREATE2 structs were introduced after kernel 3.18,
so cannot compile user code with uapi headers from
newer 3.18+ kernels. If using CREATE structs then
compatibility is preserved.

Bug: 64981084
Test: bit
Change-Id: I97c7725918b09a817a51c13384ac2d55a6cfab25
CtsHardwareTestCases:android.hardware.input.cts.tests.GamepadTestCase
2017-08-26 05:05:19 +00:00
Chavi Weingarten
9003586396 Merge "Add get-disabled shell command to locksettings" into oc-mr1-dev
am: f9c0f06526

Change-Id: I5e683ce2a92b195804b883cce425200180130815
2017-08-25 16:40:02 +00:00
chaviw
ff58ed11f2 Add get-disabled shell command to locksettings
Added shell command that outputs whether the lock screen is disabled.

Test: Ran "adb shell locksettings get-disabled" while phone had lock
screen and when it did not.
Merged-In: I3532e41e2ee4770bd0801dd431fdbc884c2bafa4
Fixes: 64848695

Change-Id: I3532e41e2ee4770bd0801dd431fdbc884c2bafa4
2017-08-24 14:27:36 -07:00
Steven Moreland
e04a0bf5c7 Merge "ScopedUtfChars: use proper nativehelper headers"
am: 75c9e4d594

Change-Id: I170b5846981683eacee1081587c7149bab454d91
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
350b0ed191 Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
am: 1e8d712b78

Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a
2017-08-11 00:50:50 +00: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
Narayan Kamath
b51eae5825 Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev
am: af706b40de

Change-Id: I8e761bf1c4afba4795aa4041aeabc66b48964030
2017-08-10 11:14:20 +00:00
Narayan Kamath
96c11c58c9 PackageParser: Parse android:classLoader during the full parse.
There's no need to do this during a "lite" parse. Moreover, we don't
resolve resource references during a lite parse, which means that we
lose a lot of flexibility.

Test: CtsAppSecurityTestCases
Bug: 64339642

Change-Id: I7d02faab6bd226d96d63d2edd8c06b94e15e14ad
2017-08-09 15:32:00 +01:00
Takashi Furukawa
154a2377d5 Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
am: 552d35cb4f

Change-Id: I04ea51eee6ad1030844a720132a3e67b007cb19f
2017-08-08 18:30:55 +00:00
Takashi Furukawa
c6e2c78ee6 Merge "Add null check for Wi-Fi command" am: 43ee2ac140 am: 51e24de109
am: a6e588fffc

Change-Id: I4b09b7af3edc8656378a2abec2c395c07bb61fae
2017-08-08 18:27:19 +00:00
Takashi Furukawa
51e24de109 Merge "Add null check for Wi-Fi command"
am: 43ee2ac140

Change-Id: Ideddbcd85dc15012f405138c358f3dd8c516eef5
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
Takashi Furukawa
1aa263e5ab Cherry-pick: 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
Merged-In: I5684cdc7661b7d93fd6f2ac61863919077d12935
2017-08-07 13:27:56 -07:00
Martijn Coenen
6513db5b49 Merge "screencap: always exit with _exit()." into oc-dr1-dev
am: 4499576db0

Change-Id: I5b48a5792994034e93f7ed7d5024e44fb452e994
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 4d125c1df6b7e4dbc3a788ecce5434970e676b06)

Change-Id: Ie79ead94c62df0c4057d7fc6735abe9dcd1e940f
2017-08-04 07:31:09 +00:00
Makoto Onuki
d3cafac64d Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev
am: 437e43ed1f

Change-Id: Idc4e96751659c08d0b95760f41ba47c45bc4e476
2017-08-03 23:53:25 +00:00
Makoto Onuki
6fb2c9718c Bit: Don't ignore errors and crashes
Bit used to only see success results and failures (== assertion failures?),
and didn't see "errors" (other exceptions) and test process crashes.

Fixed it.

Now it also returns an error status code if there was a test failure.

Bug 64292779
Test: manual

Change-Id: Iaba93910d32abfc615ae595746a0e9be1108583a
2017-08-02 14:49:30 -07: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
c64c642e14 Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4
am: 795bcc5b75

Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a
2017-08-02 15:38:40 +00:00