OSDN Git Service
Leon Scroggins III [Fri, 30 Mar 2018 14:12:21 +0000 (14:12 +0000)]
Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev
am:
5d27097739
Change-Id: I426e6cf6da60b7b82d51d671ce7c35b19d6cb62b
Yi Jin [Fri, 30 Mar 2018 14:02:17 +0000 (14:02 +0000)]
Merge "Add more privacy tags." into pi-dev
am:
0246723afe
Change-Id: I646514c3c8f8a30c21583ea5f41de9a1e4f9dc35
Bernie Innocenti [Fri, 30 Mar 2018 13:17:15 +0000 (13:17 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" am:
786150bc09
am:
6b9e31d7eb
Change-Id: I1674ac22f00af037ad415a4436b94b2eec6a02b7
Bernie Innocenti [Fri, 30 Mar 2018 13:05:05 +0000 (13:05 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"
am:
786150bc09
Change-Id: I966776e6574cbf167a6148e20d40e2bdcc887327
Bernie Innocenti [Fri, 30 Mar 2018 11:51:41 +0000 (11:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature"
Roshan Pius [Fri, 30 Mar 2018 11:12:21 +0000 (11:12 +0000)]
Merge "wifi metrics(proto): Add new metrics for wifi native failures" into pi-dev
am:
8dc5b8b53e
Change-Id: I16841161fde8df64defc7770b438453a2914d576
Patrick Baumann [Fri, 30 Mar 2018 11:03:54 +0000 (11:03 +0000)]
Merge "Revert "Install for all on replace"" into pi-dev
am:
27c003dcde
Change-Id: I5123ec44302a80c2d1e0c8655890898c6d1bc81d
Rohan Shah [Fri, 30 Mar 2018 10:58:52 +0000 (10:58 +0000)]
Merge "Revert "[QS] Update landscape UI"" into pi-dev
am:
a994156b55
Change-Id: I7c325c2367ace2807c0597fee8fb983bcc970dbd
Julia Reynolds [Fri, 30 Mar 2018 10:54:11 +0000 (10:54 +0000)]
Merge changes I3e542532,Id8f2147f into pi-dev
am:
68256e09d9
Change-Id: Iffa80c2254d25336d52c0f502b4c050c9c448581
Bo Zhu [Fri, 30 Mar 2018 10:48:36 +0000 (10:48 +0000)]
Merge "Minor correction to the javadoc to match implementation" into pi-dev
am:
3cda0f2989
Change-Id: I74097793f02cf97d0e61961d01df3c96fcbefb58
Benedict Wong [Fri, 30 Mar 2018 10:43:36 +0000 (10:43 +0000)]
[automerger skipped] Merge "Add documentation for TCP interactions with transforms" into pi-dev
am:
dab50eecfd -s ours
Change-Id: I6f24e8fbffedccbbce98c8bfede66ffc764a58ec
Kweku Adams [Fri, 30 Mar 2018 10:36:47 +0000 (10:36 +0000)]
Merge "Creating java package for Privacy proto." into pi-dev
am:
12912d71b1
Change-Id: If1f06051aede2003fc72ba84ef70a81e2f3965f6
Jeff Sharkey [Fri, 30 Mar 2018 10:31:32 +0000 (10:31 +0000)]
Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev
am:
ee1661f7cd
Change-Id: Ibaed0d6289ce9312f2acc2701cea9cee90740492
Dmitry Dementyev [Fri, 30 Mar 2018 10:26:18 +0000 (10:26 +0000)]
Merge "Add support for testing mode root certificate." into pi-dev
am:
2d3e4b7437
Change-Id: I24ac397b82ec0ce0913f4aa9c8bad9481ed5a970
Victor Hsieh [Fri, 30 Mar 2018 10:20:20 +0000 (10:20 +0000)]
[automerger skipped] Merge "Fix seccomp filter set up in zygote" into pi-dev
am:
d523130af7 -s ours
Change-Id: Ie0821297f0f53865364c08edd1bbd11794428f96
Bernie Innocenti [Fri, 30 Mar 2018 09:37:55 +0000 (09:37 +0000)]
Merge "Relax APF version check in ApfGenerator" am:
51dab0ed9d
am:
45dd4b7930
Change-Id: If32b43fc217e5966fd6620d5c103c70883990842
Bernie Innocenti [Fri, 30 Mar 2018 09:25:47 +0000 (09:25 +0000)]
Merge "Relax APF version check in ApfGenerator"
am:
51dab0ed9d
Change-Id: Id8d2d9df1e562ae15e63ba50e65ab6e67dab108c
Lorenzo Colitti [Fri, 30 Mar 2018 09:05:09 +0000 (09:05 +0000)]
Merge "Mark networks with OEM_PAID always restricted" am:
8e338f7dae
am:
b9cce46ba8
Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d
Chalard Jean [Fri, 30 Mar 2018 08:58:44 +0000 (08:58 +0000)]
Merge "Limit the number of routes for performance" am:
b8a1509d68
am:
7d25b9abf6
Change-Id: I1fcf34b553b4a7cbadd0a2a7bf697140e948243e
Chalard Jean [Fri, 30 Mar 2018 08:51:38 +0000 (08:51 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends" am:
39d6694208
am:
3621eb75cb
Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5
Lorenzo Colitti [Fri, 30 Mar 2018 08:47:25 +0000 (08:47 +0000)]
Merge "Mark networks with OEM_PAID always restricted"
am:
8e338f7dae
Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
Chalard Jean [Fri, 30 Mar 2018 08:42:42 +0000 (08:42 +0000)]
Merge "Limit the number of routes for performance"
am:
b8a1509d68
Change-Id: If4de2779b24560f75a7bb977dbb0f996115a0648
Chalard Jean [Fri, 30 Mar 2018 08:36:58 +0000 (08:36 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends"
am:
39d6694208
Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
Lorenzo Colitti [Fri, 30 Mar 2018 08:33:06 +0000 (08:33 +0000)]
Merge "Disallow Reserved SPI Allocation" am:
7fcde83572
am:
62e6b774e3
Change-Id: Ic5c7857754a04ae7238414b55a1e5ab653d62f6b
Bernie Innocenti [Fri, 30 Mar 2018 08:12:02 +0000 (17:12 +0900)]
apf: adjust JNI to accept_packet()'s new signature
Test: Fixes the build breakage
Change-Id: Id5c3cec5459ce6f9693457448002e60bbca6c09b
Lorenzo Colitti [Fri, 30 Mar 2018 07:45:04 +0000 (07:45 +0000)]
Merge "Require explicitly supplied truncation length" am:
0dde066ef7
am:
2749432646
Change-Id: I347bfd43be54d162dea831770ab08d792ea1443f
Lorenzo Colitti [Fri, 30 Mar 2018 07:39:01 +0000 (07:39 +0000)]
Merge "Disallow Reserved SPI Allocation"
am:
7fcde83572
Change-Id: Idd387dfad8d8886fad28005f9001a732a73cae1b
Bernie Innocenti [Fri, 30 Mar 2018 07:25:08 +0000 (07:25 +0000)]
Merge "Relax APF version check in ApfGenerator"
Lorenzo Colitti [Fri, 30 Mar 2018 07:00:54 +0000 (07:00 +0000)]
Merge "Mark networks with OEM_PAID always restricted"
Pavel Maltsev [Wed, 7 Mar 2018 22:33:22 +0000 (14:33 -0800)]
Mark networks with OEM_PAID always restricted
Bug:
68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
Lorenzo Colitti [Fri, 30 Mar 2018 06:48:22 +0000 (06:48 +0000)]
Merge "Require explicitly supplied truncation length"
am:
0dde066ef7
Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
Lorenzo Colitti [Fri, 30 Mar 2018 06:48:17 +0000 (06:48 +0000)]
Merge "Clarify UDP encapsulation socket API" am:
2891409c93
am:
a12c8fe218
Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb
Chalard Jean [Fri, 30 Mar 2018 06:40:29 +0000 (06:40 +0000)]
Merge "Limit the number of routes for performance"
Chalard Jean [Fri, 30 Mar 2018 06:37:22 +0000 (06:37 +0000)]
Merge "Clarify documentation for getActiveNetworkInfo and friends"
Lorenzo Colitti [Fri, 30 Mar 2018 06:35:22 +0000 (06:35 +0000)]
Merge "Clarify UDP encapsulation socket API"
am:
2891409c93
Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
Lorenzo Colitti [Fri, 30 Mar 2018 06:16:17 +0000 (06:16 +0000)]
Merge "Disallow Reserved SPI Allocation"
TreeHugger Robot [Fri, 30 Mar 2018 06:06:40 +0000 (06:06 +0000)]
Merge changes I61fe0d67,I830a8eb1 into pi-dev-plus-aosp
* changes:
Don't build android.test.mock.stubs for unbundled builds
Make android.test.mock.stubs in Android.bp
Jiyong Park [Fri, 23 Mar 2018 08:29:05 +0000 (17:29 +0900)]
Don't build android.test.mock.stubs for unbundled builds
Unbundled builds use the prebuilt libs in /prebuilts/sdk/current and
system_current.
Bug:
73829976
Test: m -j ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Merged-In: I61fe0d671778595f49be82d7c11caffc411f58a3
Change-Id: I61fe0d671778595f49be82d7c11caffc411f58a3
(cherry picked from commit
ea93a9ebc22d2685ecc94b0a51175ec7c6eb7d05)
Jiyong Park [Tue, 13 Mar 2018 07:06:03 +0000 (16:06 +0900)]
Make android.test.mock.stubs in Android.bp
Stubs libraries android.test.mock.stubs and
android.test.mock.stubs-system are now built in Android.bp.
(Note that API check and update are still done in Android.mk)
As a good side effect, this allows android.test.runner[-minus-junit]
libraries (that are defined in Android.bp) to be built with the
android.test.mock.stubs instead of the runtime library
android.test.mock. This in turn allows us to prevent java:sdk ->
java:platform dependency also in Soong, because the runner libraries
were the only violators.
Bug:
73829976
Test: m -j android.test.mock.stubs android.test.mock.stubs-system
Test: m -j checkapi
Test: m -j update-api
Merged-In: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
Change-Id: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
(cherry picked from commit
e649b8066c3385ba0b667a79d378402b15ef3127)
Lorenzo Colitti [Fri, 30 Mar 2018 04:59:22 +0000 (04:59 +0000)]
Merge "Require explicitly supplied truncation length"
Lorenzo Colitti [Fri, 30 Mar 2018 04:58:47 +0000 (04:58 +0000)]
Merge "Clarify UDP encapsulation socket API"
Calin Juravle [Fri, 30 Mar 2018 04:21:00 +0000 (04:21 +0000)]
Merge "Add the compilation reason to the dexopt dumps" am:
d136b0fb08
am:
6a6dde5b70
Change-Id: If96ae8a397c3bf9f369f774ebaf0af35ca8943b9
Bernie Innocenti [Fri, 30 Mar 2018 04:08:26 +0000 (13:08 +0900)]
Relax APF version check in ApfGenerator
Instead of requiring an *exact* version, we now require a minimum
version. This is necessary if we wish to upgrade the APF interpreter in
vendor firmware independently of the framework code. Adding new opcodes
without changing the semantics of the old ones is always possible and
usually easy, so we can at least have a backwards-compatibility horizon
wider than a single version.
Change-Id: I4f1ed661afb2ede193188eb8086fbf2a8b45b33d
Test: Change extracted from aosp/647079 and tested there
Calin Juravle [Fri, 30 Mar 2018 04:08:47 +0000 (04:08 +0000)]
Merge "Add the compilation reason to the dexopt dumps"
am:
d136b0fb08
Change-Id: Id15de7a3a32835b2dabcef668845b6605a070c68
Remi NGUYEN VAN [Fri, 30 Mar 2018 02:32:07 +0000 (02:32 +0000)]
Merge "Use InterfaceSet for upstream interfaces." am:
e18fd9fff0
am:
36d3bf8372
Change-Id: Ic8602dd029b5a9626aaf6651315b82ab6327037c
Remi NGUYEN VAN [Fri, 30 Mar 2018 02:21:53 +0000 (02:21 +0000)]
Merge "Use InterfaceSet for upstream interfaces."
am:
e18fd9fff0
Change-Id: I4fa2446fe67ba2d88e4230f9accdfe0b8d2ec241
Bookatz [Fri, 30 Mar 2018 01:46:18 +0000 (01:46 +0000)]
[automerger skipped] Merge "Dummy WorkChain class" am:
81270b1885
am:
d29a94a466 -s ours
Change-Id: I33da7668ddce07013091c3ab88c782830718d0b5
Bookatz [Fri, 30 Mar 2018 01:32:57 +0000 (01:32 +0000)]
Merge "Dummy WorkChain class"
am:
81270b1885
Change-Id: Id8caf73e4dcb0b230cd57fe485c2768decf1d8eb
Treehugger Robot [Fri, 30 Mar 2018 01:20:26 +0000 (01:20 +0000)]
Merge "Add the compilation reason to the dexopt dumps"
Remi NGUYEN VAN [Fri, 30 Mar 2018 01:05:38 +0000 (01:05 +0000)]
Merge "Use InterfaceSet for upstream interfaces."
TreeHugger Robot [Fri, 30 Mar 2018 00:48:29 +0000 (00:48 +0000)]
Merge "Fix Skia's impl for TextureView.getBitmap" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 00:43:58 +0000 (00:43 +0000)]
Merge "Add more privacy tags." into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 00:28:15 +0000 (00:28 +0000)]
Merge "wifi metrics(proto): Add new metrics for wifi native failures" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 00:26:12 +0000 (00:26 +0000)]
Merge "Revert "Install for all on replace"" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 00:23:41 +0000 (00:23 +0000)]
Merge "Revert "[QS] Update landscape UI"" into pi-dev
Treehugger Robot [Fri, 30 Mar 2018 00:17:37 +0000 (00:17 +0000)]
Merge "Dummy WorkChain class"
TreeHugger Robot [Fri, 30 Mar 2018 00:10:22 +0000 (00:10 +0000)]
Merge changes I3e542532,Id8f2147f into pi-dev
* changes:
Update notification blocking documentation.
Wait before computing contact affinity
Bo Zhu [Fri, 30 Mar 2018 00:04:46 +0000 (00:04 +0000)]
Merge "Minor correction to the javadoc to match implementation" into pi-dev
Benedict Wong [Fri, 30 Mar 2018 00:01:43 +0000 (00:01 +0000)]
Merge "Add documentation for TCP interactions with transforms" into pi-dev
Felipe Leme [Thu, 29 Mar 2018 23:56:35 +0000 (23:56 +0000)]
Merge "Minor javadoc fixes." into pi-dev
am:
46e83ebf27
Change-Id: Ibcd6d4e610b714fd042f8bc3389904527482dae1
Bo Zhu [Thu, 29 Mar 2018 23:42:29 +0000 (16:42 -0700)]
Minor correction to the javadoc to match implementation
Change the number of bytes for the length prefix for salted hash to be
4-byte instead of 1-byte
Bug:
77294103
Test: None
Change-Id: Ifa2739c757539e9b7d2aaa1ea702de0148a311ba
Mukesh Agrawal [Thu, 29 Mar 2018 23:41:39 +0000 (23:41 +0000)]
Merge ""02:00:00:00:00:00" invalid for MAC randomization" into pi-dev
am:
0f57f60b7c
Change-Id: Ibff476cade8dcf1f3452adad76826ce4dab63345
TreeHugger Robot [Thu, 29 Mar 2018 23:37:55 +0000 (23:37 +0000)]
Merge "Creating java package for Privacy proto." into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 23:33:18 +0000 (23:33 +0000)]
Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev
Android Build Merger (Role) [Thu, 29 Mar 2018 23:33:00 +0000 (23:33 +0000)]
Merge "Merge "Allow PO to call setSystemSetting." into pi-dev am:
04446f9f68" into pi-dev-plus-aosp
yuemingw [Thu, 29 Mar 2018 23:32:18 +0000 (23:32 +0000)]
Merge "Allow PO to call setSystemSetting." into pi-dev
am:
04446f9f68
Change-Id: Ib0fe1542e76c862a5b6c1f7652dd5d5ded29b122
John Reck [Thu, 29 Mar 2018 23:27:04 +0000 (23:27 +0000)]
[automerger skipped] Merge "Change shader precision because of CTS fail" am:
9ab5045d92
am:
16b293218d -s ours
Change-Id: I8c49a91abd61cd82a0fe87a768da773c2f9f3538
Dmitry Dementyev [Thu, 29 Mar 2018 23:25:14 +0000 (23:25 +0000)]
Merge "Add support for testing mode root certificate." into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 23:21:50 +0000 (23:21 +0000)]
Merge "Fix seccomp filter set up in zygote" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 23:11:32 +0000 (23:11 +0000)]
Merge "Minor javadoc fixes." into pi-dev
Mihai Popa [Thu, 29 Mar 2018 23:06:57 +0000 (23:06 +0000)]
Merge "[Magnifier-37] Hide handle when overlaps magnifier" into pi-dev
am:
3708933872
Change-Id: I9b8cfebb79d9a886b502bc1057716c3b20b3d7f3
Jeff Sharkey [Thu, 29 Mar 2018 23:03:26 +0000 (23:03 +0000)]
Merge "Only return internal path when not visible." into pi-dev
am:
2254fe2e04
Change-Id: I7e90be19432f3ac8e0ec9b878f31416dca6c1e4a
Felipe Leme [Thu, 29 Mar 2018 22:59:53 +0000 (22:59 +0000)]
Merge "Fixed mClientState dump." into pi-dev
am:
8b08d54869
Change-Id: If36606536a0971346c18f211b11053c61754d70e
Felipe Leme [Thu, 29 Mar 2018 22:56:05 +0000 (22:56 +0000)]
Merge "Fixed annotation typo." into pi-dev
am:
74896e21a7
Change-Id: I6baeb8014228b9faba0be901935b6dd25e7cd9fd
John Reck [Thu, 29 Mar 2018 22:54:56 +0000 (22:54 +0000)]
Merge "Change shader precision because of CTS fail"
am:
9ab5045d92
Change-Id: Ic4f411ddb7a0e7015c283151dc97669f75ffb6b1
jdesprez [Thu, 29 Mar 2018 22:36:35 +0000 (22:36 +0000)]
Merge "Add the CorePerfTests and MultiUserPerfTests to APCT metrics" into pi-dev
am:
879240cc38
Change-Id: I27d491fcfb0c17e2b7138ac5e1e619235be77b99
jdesprez [Thu, 29 Mar 2018 22:30:06 +0000 (22:30 +0000)]
Merge "Add MtpDocumentsProviderPerfTests to APCT metric" into pi-dev
am:
208f0ea367
Change-Id: I6cc869b0c79b402f3fbf6d34a6783a8d72974ecf
Mukesh Agrawal [Thu, 29 Mar 2018 22:25:13 +0000 (22:25 +0000)]
Merge ""02:00:00:00:00:00" invalid for MAC randomization" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 22:24:25 +0000 (22:24 +0000)]
Merge "Allow PO to call setSystemSetting." into pi-dev
Mady Mellor [Thu, 29 Mar 2018 22:22:51 +0000 (22:22 +0000)]
Merge "Add permission hint, update permission slice structure" into pi-dev
am:
92006c1764
Change-Id: I3c0a31b24fa9e37b5a5bee384578ac4ad2c4ed9f
TreeHugger Robot [Thu, 29 Mar 2018 22:16:58 +0000 (22:16 +0000)]
Merge "[Magnifier-37] Hide handle when overlaps magnifier" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 22:16:32 +0000 (22:16 +0000)]
Merge "Only return internal path when not visible." into pi-dev
Benjamin Franz [Thu, 29 Mar 2018 22:15:08 +0000 (22:15 +0000)]
Merge "Block root task from being shown in recents" into pi-dev
am:
8a5e85c9ef
Change-Id: Ied185646430eb0b8bff72741e2697e6f35fa468b
Amin Shaikh [Thu, 29 Mar 2018 22:07:01 +0000 (22:07 +0000)]
Merge "Update mobile data icons." into pi-dev
am:
e7b74370db
Change-Id: I9e6cba68c008d4da7c503443b968d225c01a3333
Victor Hsieh [Thu, 29 Mar 2018 22:00:19 +0000 (22:00 +0000)]
Merge "Fix seccomp filter set up in zygote" am:
29d32fb55b
am:
13127dfa03
Change-Id: I0e10cba54face9b8b4a690d27518f9fd83670a6b
TreeHugger Robot [Thu, 29 Mar 2018 21:58:17 +0000 (21:58 +0000)]
Merge "Fixed mClientState dump." into pi-dev
Victor Hsieh [Thu, 29 Mar 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Fix seccomp filter set up in zygote"
am:
29d32fb55b
Change-Id: Ie2a052905ae6703b45c951c852aa786c41a8a7f9
TreeHugger Robot [Thu, 29 Mar 2018 21:43:14 +0000 (21:43 +0000)]
Merge "Fixed annotation typo." into pi-dev
Yao Chen [Thu, 29 Mar 2018 21:40:23 +0000 (21:40 +0000)]
Merge "Surface the log write errors to StatsLog.write" into pi-dev
am:
03cd687912
Change-Id: I99ae0b3e887a0fd97a8826e52573d4d33dc1349e
TreeHugger Robot [Thu, 29 Mar 2018 21:33:45 +0000 (21:33 +0000)]
Merge "Add the CorePerfTests and MultiUserPerfTests to APCT metrics" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 21:33:25 +0000 (21:33 +0000)]
Merge "Add MtpDocumentsProviderPerfTests to APCT metric" into pi-dev
Bryan Mawhinney [Thu, 29 Mar 2018 21:29:49 +0000 (21:29 +0000)]
Merge "Add a SystemApi to control display saturation." into pi-dev
am:
49c27f2267
Change-Id: I426c85c95a4ececdb3ff3d88d3e6c3b6a68bcaf5
TreeHugger Robot [Thu, 29 Mar 2018 21:29:07 +0000 (21:29 +0000)]
Merge "Add permission hint, update permission slice structure" into pi-dev
Kweku Adams [Thu, 29 Mar 2018 21:26:23 +0000 (14:26 -0700)]
Creating java package for Privacy proto.
Also setting fields in the GlobalSettingsProto.Private message to LOCAL.
Bug:
72814439
Bug:
74975371
Test: flash device and check incident.proto output
Change-Id: Ia580144b8b0d0cb9bd9a3297a37213ed5f60a514
Dmitry Dementyev [Wed, 28 Mar 2018 19:36:45 +0000 (12:36 -0700)]
Add support for testing mode root certificate.
1) Add Certificate
2) Helper class for end-to-end tests
3) Only create snapshot for passwords with special prefix in test mode
4) Sync only keys with insecure prefix in test mode.
Bug:
76433465
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I6edc8c4716c3a034b6b79c7aa6f4b8478e9a3c9e
TreeHugger Robot [Thu, 29 Mar 2018 21:10:31 +0000 (21:10 +0000)]
Merge "Block root task from being shown in recents" into pi-dev
Tomasz Wasilczyk [Thu, 29 Mar 2018 21:09:12 +0000 (21:09 +0000)]
Merge "Fix empty program list filter handling." into pi-dev
am:
7a33063b39
Change-Id: I4f0a2a4914e71654c17ec7cb5fa6ec966d61d6a8
John Reck [Thu, 29 Mar 2018 21:04:05 +0000 (21:04 +0000)]
Merge "Change shader precision because of CTS fail"
Leon Scroggins [Thu, 29 Mar 2018 20:59:10 +0000 (20:59 +0000)]
Merge "Add in/out ColorSpace to ImageDecoder" into pi-dev
am:
bf1fe9aecd
Change-Id: Ida1cc2fa8a824a85813fc57662c394e0344349d6
TreeHugger Robot [Thu, 29 Mar 2018 20:58:02 +0000 (20:58 +0000)]
Merge "Update mobile data icons." into pi-dev