OSDN Git Service
TreeHugger Robot [Wed, 13 Sep 2017 22:23:24 +0000 (22:23 +0000)]
Merge "One final attempt at patching over ASEC mess."
Mathieu Chartier [Wed, 13 Sep 2017 22:13:31 +0000 (22:13 +0000)]
Merge "Add extra preloads to image"
TreeHugger Robot [Wed, 13 Sep 2017 21:12:15 +0000 (21:12 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Sep 2017 21:10:15 +0000 (21:10 +0000)]
Merge "Log number of known dependencies if Dependency throws an exception"
TreeHugger Robot [Wed, 13 Sep 2017 21:05:22 +0000 (21:05 +0000)]
Merge "Remove Picture validation"
Eric Schwarzenbach [Wed, 13 Sep 2017 20:39:38 +0000 (20:39 +0000)]
Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev am:
7ccaa98fbb
am:
05ebe674c1 -s ours
Change-Id: I29ebaa39053b36ecd1c58c6c40d3db0a50d76771
Jeff Sharkey [Wed, 13 Sep 2017 20:37:06 +0000 (14:37 -0600)]
One final attempt at patching over ASEC mess.
Test: builds, boots multiple times, runtime permissions grantable
Bug:
65544665
Change-Id: Ia6a7b2c30e36c72e61ad201e2d8eb8de4d0fd110
Patrik Torstensson [Wed, 13 Sep 2017 20:33:41 +0000 (20:33 +0000)]
Merge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev am:
f876e789fd
am:
0b15e684ec
Change-Id: Ie4d78ad7c8d75d24965474f1eab2bc844d922f57
Janis Danisevskis [Wed, 13 Sep 2017 20:23:26 +0000 (20:23 +0000)]
Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev am:
b893b4b121
am:
938b1c5f6a
Change-Id: Id59805016a566c35e4e32a7a4119b1d792e16989
Eric Schwarzenbach [Wed, 13 Sep 2017 20:23:19 +0000 (20:23 +0000)]
Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev
am:
7ccaa98fbb
Change-Id: If5de66f03f7bef4f14b4f44f8af5742d2a8fe1cc
Rubin Xu [Wed, 13 Sep 2017 20:19:54 +0000 (20:19 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev am:
f531f886fb
am:
42a0e89b61
Change-Id: I4ab30e194dca28decc9e621c45d25af3d4c8b2c8
Patrik Torstensson [Wed, 13 Sep 2017 20:16:16 +0000 (20:16 +0000)]
Merge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev
am:
f876e789fd
Change-Id: If4c101905988549eb3f5f5dfa8a64ad03ae4048a
Janis Danisevskis [Wed, 13 Sep 2017 19:38:13 +0000 (19:38 +0000)]
Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev
am:
b893b4b121
Change-Id: I72c674a64f60451bea762995804e23b3b035ade1
Evan Laird [Wed, 13 Sep 2017 18:05:37 +0000 (14:05 -0400)]
Log number of known dependencies if Dependency throws an exception
This can provide a modicum of insight into why Dependency may be failing
to retrieve the required class. If, for instance, there is a race
condition then we would expect to see a smaller number of known
dependencies.
Dependency.
Bug:
65560049
Test: request a non-registered depdency from Depdency.java, then read
the logs.
Change-Id: I583287d0b59da321ab590f53a86c2d9b357304b2
Rubin Xu [Wed, 13 Sep 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev
am:
f531f886fb
Change-Id: Id2afe1701b1c09e7a8d8070a2514e22d2213c61d
TreeHugger Robot [Wed, 13 Sep 2017 19:17:50 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Sep 2017 19:07:50 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Sep 2017 18:53:00 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Sep 2017 18:43:31 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Wed, 13 Sep 2017 18:40:55 +0000 (18:40 +0000)]
Merge "Move all crypto commands over to Binder."
Leon Scroggins III [Tue, 12 Sep 2017 17:20:33 +0000 (13:20 -0400)]
Remove Picture validation
This assert is failing, and not revealing anything interesting. Remove
it.
Bug: skia:7040
Test: Presubmit checks will test this change.
Change-Id: Ib5cae563047096f0f5af8eb58da9287e59d698ba
TreeHugger Robot [Wed, 13 Sep 2017 18:33:52 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Sep 2017 18:24:08 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Wed, 13 Sep 2017 15:28:02 +0000 (08:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb120744be1ab7432cab92162ae01da3cb8e4f4b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 13 Sep 2017 14:59:28 +0000 (14:59 +0000)]
Merge "Add logs to IOExceptions during adb backup"
TreeHugger Robot [Wed, 13 Sep 2017 13:58:56 +0000 (13:58 +0000)]
Merge "Add keylayout file for Sony DS4 v1 joystick"
Bernardo Rufino [Wed, 13 Sep 2017 11:53:34 +0000 (12:53 +0100)]
Add logs to IOExceptions during adb backup
Test: Run adb backup
Bug:
65435587
Change-Id: I744cb2878654b716858d7c9bedeb12fb9978df6b
Bill Yi [Wed, 13 Sep 2017 12:37:46 +0000 (05:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb01aafda150115243107e2adea7a9e2829b13e5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 13 Sep 2017 11:30:04 +0000 (04:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifee897620195deef2d0c462081c682ada358cde0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 13 Sep 2017 11:25:07 +0000 (04:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82d19a9c1cadb5f776e9636e190e84c2b2d5c5a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 13 Sep 2017 10:57:09 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic959df8acf42038aca17ca3b8a1cafd2275da421
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 13 Sep 2017 10:48:42 +0000 (03:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaabce33969436918512e5192fad1c4ca0fe7a160
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 13 Sep 2017 09:46:23 +0000 (02:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2208db3be228d5a99342b2b6441b958000a7152b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Mathieu Chartier [Tue, 12 Sep 2017 21:54:21 +0000 (14:54 -0700)]
Add extra preloads to image
Since some of these can be initialized AOT during image creation, add
them to the boot profile. Numbers are in the bug, here is the zygote
init back at normal ranges: Zygote64Timing_ZygoteInit_avg:1003.1
Test: make and flash
Bug:
65582823
Change-Id: Ide2b7c496d38af656c027bdae73e1577904fc99e
Sanket Padawe [Wed, 13 Sep 2017 04:39:36 +0000 (04:39 +0000)]
Merge "Fix doc for Telephony Manager api and make isTtySupported public."
Jeff Sharkey [Tue, 12 Sep 2017 22:31:45 +0000 (16:31 -0600)]
Move all crypto commands over to Binder.
Prefix FDE related commands with "fde" to make it clear which devices
they apply to. This will also make it easier to remove once FDE
is fully deprecated in a future release.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.DirectBootHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.storage.cts.StorageManagerTest
Bug:
13758960
Change-Id: I6a9f7a47267d2464257d8066aa37353ec5741974
Siarhei Vishniakou [Tue, 12 Sep 2017 22:19:26 +0000 (15:19 -0700)]
Add keylayout file for Sony DS4 v1 joystick
This file is a copy of Vendor_054c_Product_09cc.kl,
which is a v2 version of the same joystick.
They have the same layout.
Bug:
36693940
Test: mapped with getevent, works OK
Change-Id: I439caf97f2c51d643753e1fc8d5dd0213131927a
TreeHugger Robot [Tue, 12 Sep 2017 22:04:29 +0000 (22:04 +0000)]
Merge "Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics."
Yi Jin [Tue, 12 Sep 2017 21:40:31 +0000 (21:40 +0000)]
Merge changes Icdcbeded,I6753df11
* changes:
Extract IncidentHeaderProto to a separated file for statsd to consume
Implement Pii Stripper Part 3
Yi Jin [Tue, 12 Sep 2017 21:35:19 +0000 (21:35 +0000)]
Merge "Implement PII Stripper, part 2"
Eric Schwarzenbach [Tue, 12 Sep 2017 21:21:44 +0000 (21:21 +0000)]
Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev
Patrik Torstensson [Tue, 12 Sep 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev
Mathieu Chartier [Tue, 12 Sep 2017 20:18:54 +0000 (20:18 +0000)]
Merge "Add some extra zygote preloads"
James Hawkins [Tue, 12 Sep 2017 20:16:03 +0000 (13:16 -0700)]
Tron/proto: Add ACTION and FIELD for logging the boot reason string value through metrics.
Bug:
63584589
Test: None
Change-Id: Iad6941df5a357e3a1471d446e9776d8412d9e215
TreeHugger Robot [Tue, 12 Sep 2017 20:13:45 +0000 (20:13 +0000)]
Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 20:00:28 +0000 (20:00 +0000)]
Merge "Binder: Change reaction to Error"
TreeHugger Robot [Tue, 12 Sep 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Fix a typo in metric constant"
Bryce Lee [Tue, 12 Sep 2017 19:42:55 +0000 (19:42 +0000)]
Merge "Update reference to top activity."
Jeff Sharkey [Tue, 12 Sep 2017 19:21:02 +0000 (19:21 +0000)]
Merge "Move even more vold commands over to Binder."
TreeHugger Robot [Tue, 12 Sep 2017 18:05:32 +0000 (18:05 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev
Eric Schwarzenbach [Wed, 6 Sep 2017 18:53:07 +0000 (11:53 -0700)]
Fix TimestampedScoredNetwork parceling logic.
The old implementation used incompatible read/write logic. Fixes the
constructor to use readParcelable() instead of
CREATOR.createFromParcel(). Adds tests.
Bug:
65379063
Test: make -j40 RunSettingsLibRoboTests
Change-Id: I6a6c183fe065f36fcc8d4a25637f98dfdaad350d
Merged-In: I6a6c183fe065f36fcc8d4a25637f98dfdaad350d
Beverly Tai [Tue, 12 Sep 2017 17:46:18 +0000 (17:46 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec am:
0392ba5f72 am:
517bb6eaa6" into oc-mr1-dev-plus-aosp
am:
071443e933 -s ours
Change-Id: I62ede21d3aeec251d7c702da3ee824d4a8c49e17
Bryce Lee [Tue, 12 Sep 2017 16:50:35 +0000 (09:50 -0700)]
Update reference to top activity.
A condition dealing with a paused top activity references the last
paused activity rather than the top activity. While technically
correct, this may be confusing. Updating to solely reference the
top activity.
Fixes:
65585235
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff
Change-Id: Ie67cb8b103e7dec59b1c0b40a5bb35ef0c3cb2b7
Beverly Tai [Tue, 12 Sep 2017 17:38:27 +0000 (17:38 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec am:
0392ba5f72 am:
108e142d61
am:
ae86706b68 -s ours
Change-Id: I68dbff15a630e518c2500ae4c8d8b8bfc9e3a83e
Android Build Merger (Role) [Tue, 12 Sep 2017 17:29:11 +0000 (17:29 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec am:
0392ba5f72 am:
517bb6eaa6" into oc-mr1-dev-plus-aosp
Beverly Tai [Tue, 12 Sep 2017 17:27:18 +0000 (17:27 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec am:
0392ba5f72
am:
517bb6eaa6
Change-Id: I8d89c0f195d37c1588fd7e1a77fcd97fb97fc775
Beverly Tai [Tue, 12 Sep 2017 17:26:56 +0000 (17:26 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec am:
0392ba5f72
am:
108e142d61
Change-Id: Ic7391a1b769b3621025b007dd07863cacea3af6e
Fan Zhang [Tue, 12 Sep 2017 17:24:27 +0000 (10:24 -0700)]
Fix a typo in metric constant
Bug:
65522852
Test: builds
Change-Id: I6f7d8074177095919684be49131b79b4c6c5c168
Beverly Tai [Tue, 12 Sep 2017 17:18:01 +0000 (17:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec
am:
0392ba5f72
Change-Id: I84fe2d446aa887c2934224c772d5b0ab7b570f5b
Beverly Tai [Tue, 12 Sep 2017 17:17:52 +0000 (17:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours am:
ff5a0512ec
am:
0392ba5f72
Change-Id: Ife88f86f94919d731e79f7ec5838b14fbb30a4cc
Abodunrinwa Toki [Tue, 12 Sep 2017 17:12:14 +0000 (17:12 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-dev am:
bb3a812a71
am:
13ca88dbf6 -s ours
Change-Id: I93b2adbba15fd04ae12a14d3871af85947b8a1fa
Beverly Tai [Tue, 12 Sep 2017 17:08:07 +0000 (17:08 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5 am:
be95e1d91e -s ours
am:
ff5a0512ec
Change-Id: Icd9cc186849eba7d03afe0456c92017be2f1dc4e
Abodunrinwa Toki [Tue, 12 Sep 2017 17:02:44 +0000 (17:02 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-dev
am:
bb3a812a71
Change-Id: I7c81e50fadfa2f2fc8d3c62c69250c0f9f618651
Beverly Tai [Tue, 12 Sep 2017 16:57:46 +0000 (16:57 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5
am:
be95e1d91e -s ours
Change-Id: I6bbcdf36c8f550699ad5123b1b08c30d4fff0570
TreeHugger Robot [Tue, 12 Sep 2017 16:50:15 +0000 (16:50 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-dev
Beverly Tai [Tue, 12 Sep 2017 16:49:49 +0000 (16:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360
am:
4bdddadcc5
Change-Id: I0530a9ca24c432ee0a4af4861bad7976ca355070
TreeHugger Robot [Tue, 12 Sep 2017 16:43:50 +0000 (16:43 +0000)]
Merge "Log the "change selected text" gesture."
Beverly Tai [Tue, 12 Sep 2017 16:41:18 +0000 (16:41 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093
am:
6cd1142360
Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789
Beverly Tai [Tue, 12 Sep 2017 16:32:29 +0000 (16:32 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0
am:
b4913b7093
Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899
Beverly Tai [Tue, 12 Sep 2017 16:23:44 +0000 (16:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours
am:
5252746fe0
Change-Id: I9e4cc6677d3ea0c31584efb0416e1d8716285f68
Jeff Sharkey [Tue, 12 Sep 2017 16:21:40 +0000 (16:21 +0000)]
Merge "Explicitly update permissions after pre-grants."
Beverly Tai [Tue, 12 Sep 2017 16:15:49 +0000 (16:15 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec
am:
c64209fb6a -s ours
Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37
Beverly Tai [Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6
am:
ff058a78ec
Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef
Evan Laird [Tue, 12 Sep 2017 16:07:10 +0000 (16:07 +0000)]
Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev am:
6201780278
am:
38ab0009de
Change-Id: Ic633ade7f03854db9da3e4ff88fe4ed964f56ff3
Andreas Gampe [Sat, 9 Sep 2017 00:44:05 +0000 (17:44 -0700)]
Binder: Change reaction to Error
Instead of aborting immediately with a native error, try to call
Thread.dispatchUncaughtException to trigger a Java-side abort.
Only fall back to the old strategy if this fails.
Bug:
64689630
Test: m
Test: manual test
Change-Id: If07a04d3769f3b9181c4736220333df9a2871a16
Beverly Tai [Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours
am:
d0d0fea3d6
Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
Evan Laird [Tue, 12 Sep 2017 15:58:08 +0000 (15:58 +0000)]
Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev
am:
6201780278
Change-Id: I24adfb04cdafcaf6269ef04029bc607937b0b9ad
Amith Yamasani [Tue, 12 Sep 2017 15:54:47 +0000 (15:54 +0000)]
Merge "Remove incorrect note about truncation in the javadoc"
Beverly Tai [Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am:
89a94b706d -s ours
Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
TreeHugger Robot [Tue, 12 Sep 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev
Beverly Tai [Tue, 12 Sep 2017 15:29:21 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
TreeHugger Robot [Tue, 12 Sep 2017 15:02:51 +0000 (15:02 +0000)]
Merge "Remove org.apache.http classes from preloaded classes"
Bryce Lee [Tue, 12 Sep 2017 14:37:37 +0000 (14:37 +0000)]
Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev am:
8c8ae38eac
am:
a61fc4ff79
Change-Id: Ia879bc9ddf0cb11764e0669aa05be93da89d6f2e
Beverly [Fri, 1 Sep 2017 15:14:03 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89
Bryce Lee [Tue, 12 Sep 2017 14:29:34 +0000 (14:29 +0000)]
Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev
am:
8c8ae38eac
Change-Id: I174e78c4f26f9b9fa77a91c04353c75a2197ebd4
Bryce Lee [Tue, 12 Sep 2017 14:20:50 +0000 (14:20 +0000)]
Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev
Abodunrinwa Toki [Wed, 6 Sep 2017 21:05:18 +0000 (22:05 +0100)]
Log the "change selected text" gesture.
This logs when the selected text is changed e.g. by typing on
the hard or soft keyboard.
Bug:
64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Merged-In: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
Change-Id: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
Abodunrinwa Toki [Tue, 12 Sep 2017 12:56:59 +0000 (12:56 +0000)]
Merge "Fix smart selection logging bugs." into oc-mr1-dev am:
9cbaa8c7e6
am:
646726f2f9 -s ours
Change-Id: I45725e8837afed6d02081971bb78a927099b36f2
Abodunrinwa Toki [Tue, 12 Sep 2017 01:58:49 +0000 (02:58 +0100)]
Log the "change selected text" gesture.
This logs when the selected text is changed e.g. by typing on
the hard or soft keyboard.
Bug:
64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
Abodunrinwa Toki [Tue, 12 Sep 2017 12:49:03 +0000 (12:49 +0000)]
Merge "Fix smart selection logging bugs." into oc-mr1-dev
am:
9cbaa8c7e6
Change-Id: I00dfe6ac59782f431b5f50f059055d9537b73ae8
Jorim Jaggi [Tue, 12 Sep 2017 12:46:06 +0000 (12:46 +0000)]
Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev am:
d9ad8cbb0c
am:
ed409dd2ca
Change-Id: Ie0fb3688bf2f5be1f60f760a51f387d1e88fee82
TreeHugger Robot [Tue, 12 Sep 2017 12:39:42 +0000 (12:39 +0000)]
Merge "Fix smart selection logging bugs." into oc-mr1-dev
Rubin Xu [Mon, 11 Sep 2017 14:21:10 +0000 (15:21 +0100)]
Patch incoming LinkProperties before it's visible to the outside
Otherwise we risk a race condition when we are fixing the LinkProperties
routes, other parts of ConnectivityService is reading the field at the
same time.
Test: runtest frameworks-net -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Bug:
65529483
Bug:
35995111
(cherry picked from commit
6c1f6fd78927514df73ddace81edac4899c4cda4)
Change-Id: I539578703570a901e0a5dff0155422ca78c52401
Jorim Jaggi [Tue, 12 Sep 2017 12:37:56 +0000 (12:37 +0000)]
Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev
am:
d9ad8cbb0c
Change-Id: I12c3a2e2be226253521157f8acd2f0bc08d3d089
TreeHugger Robot [Tue, 12 Sep 2017 12:29:46 +0000 (12:29 +0000)]
Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev
Paul Duffin [Tue, 12 Sep 2017 11:50:47 +0000 (12:50 +0100)]
Remove org.apache.http classes from preloaded classes
Change I686e3c20f5860e58825e1b88f220f9b8c335849c removed the
org.apache.http.legacy library from the bootclasspath which means that
the classes are no longer available to be preloaded by the zygote. This
change removes the classes that cannot be preloaded from the list of
classes to preload.
Bug:
18027885
Test: make droid, flash, check log for "Class not found for preloading"
Change-Id: I57032355d805feb08720c9fcb1076f8e267d73dd
Rubin Xu [Tue, 12 Sep 2017 11:40:31 +0000 (11:40 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" am:
7b625191e2 am:
2a4b62dd12 am:
2cf8f74180
am:
d1fb92df52
Change-Id: Ibd5c615b9cb38664742e96327163bd970a38d848
Rubin Xu [Tue, 12 Sep 2017 11:34:55 +0000 (11:34 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" am:
7b625191e2 am:
2a4b62dd12
am:
2cf8f74180
Change-Id: Ic82526773116db3b80449cb0241a1f80934b3d55
Rubin Xu [Tue, 12 Sep 2017 11:28:55 +0000 (11:28 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside" am:
7b625191e2
am:
2a4b62dd12
Change-Id: I69700df358f8c5481d03b051163ba020e83c9fe4
Rubin Xu [Tue, 12 Sep 2017 11:23:20 +0000 (11:23 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside"
am:
7b625191e2
Change-Id: I032ba648ec0476ab8a02a710e2ae485ab4a590b8
OSDN Git Service
