OSDN Git Service
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."
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: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
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"
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: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."
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
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
Treehugger Robot [Tue, 12 Sep 2017 11:12:53 +0000 (11:12 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside"
TreeHugger Robot [Tue, 12 Sep 2017 11:00:04 +0000 (11:00 +0000)]
Merge "Fix smart selection logging bugs."
Andreas Huber [Tue, 12 Sep 2017 10:42:19 +0000 (10:42 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev am:
ce30e909c2
am:
b7fb36566b
Change-Id: I38a005c2cbadf2f3773361d16be7e8882f95079c
Andreas Huber [Tue, 12 Sep 2017 10:34:29 +0000 (10:34 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev
am:
ce30e909c2
Change-Id: I8fe0d1a2d5e27cf059a216353bfabf700c4bbddf
TreeHugger Robot [Tue, 12 Sep 2017 10:26:40 +0000 (10:26 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev
Petar Šegina [Tue, 12 Sep 2017 10:24:35 +0000 (10:24 +0000)]
Merge "Enable smart select animation for multiline scenarios"
Petar Šegina [Tue, 12 Sep 2017 10:23:36 +0000 (10:23 +0000)]
Merge "Filter out empty and unnecessary rectangles"
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
Change-Id: I539578703570a901e0a5dff0155422ca78c52401
Narayan Kamath [Tue, 12 Sep 2017 07:54:57 +0000 (07:54 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev am:
c0e6aa4233
am:
1b31be026d
Change-Id: I43970535a3a3e614fa9acd990035f73dca80ba88
Shubham Ajmera [Tue, 12 Sep 2017 07:48:43 +0000 (07:48 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev am:
3de875019e
am:
a8a9acaf85
Change-Id: Icaabfd74daa96f7a3f44be0996987d94789fbd06
Narayan Kamath [Tue, 12 Sep 2017 07:45:12 +0000 (07:45 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev
am:
c0e6aa4233
Change-Id: I91b6f277344032daf4c3c5ee57d5c4f483064e48
TreeHugger Robot [Tue, 12 Sep 2017 07:36:24 +0000 (07:36 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev
Shubham Ajmera [Tue, 12 Sep 2017 07:34:36 +0000 (07:34 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
am:
3de875019e
Change-Id: I570bcf56e7b971b452007eb8db1ce6f13066ce05
TreeHugger Robot [Tue, 12 Sep 2017 07:26:35 +0000 (07:26 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
Erik Kline [Tue, 12 Sep 2017 06:39:44 +0000 (06:39 +0000)]
Merge "Check for IControllOffload.getServer() returning null" am:
c5932ab2a8 am:
a3658b0fc2 am:
c9fad76673 -s ours
am:
1efca130c9 -s ours
Change-Id: I50776e3406b0aa6606a617bba05bb1170919dce0
Erik Kline [Tue, 12 Sep 2017 06:34:11 +0000 (06:34 +0000)]
Merge "Check for IControllOffload.getServer() returning null" am:
c5932ab2a8 am:
a3658b0fc2
am:
c9fad76673 -s ours
Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1
Erik Kline [Tue, 12 Sep 2017 06:26:11 +0000 (06:26 +0000)]
Merge "Check for IControllOffload.getServer() returning null" am:
c5932ab2a8
am:
a3658b0fc2
Change-Id: I69d8504f8487218f14faf4f35b5307c396f9cb4f
Erik Kline [Tue, 12 Sep 2017 06:19:16 +0000 (06:19 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
am:
c5932ab2a8
Change-Id: If27fca9aa594af2f58a470709d78f19f31bb316d
Treehugger Robot [Tue, 12 Sep 2017 06:10:45 +0000 (06:10 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
Erik Kline [Mon, 11 Sep 2017 07:33:27 +0000 (16:33 +0900)]
Check for IControllOffload.getServer() returning null
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
65529504
Merged-In: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497
Merged-In: Ib2d1862367145260ac83f14d181646eb827538f8
Change-Id: I671487344000f1f2db92b8e4a693c096b680830c
(cherry picked from commit
87b3bfd5f2d3d0ccfc3ee1279b496d4ff289e38f)
Erik Kline [Tue, 12 Sep 2017 03:15:35 +0000 (03:15 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev am:
ec02583438
am:
b49e11f712
Change-Id: Ib2d1862367145260ac83f14d181646eb827538f8
Erik Kline [Tue, 12 Sep 2017 03:06:53 +0000 (03:06 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
am:
ec02583438
Change-Id: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497
TreeHugger Robot [Tue, 12 Sep 2017 03:00:38 +0000 (03:00 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
Siyamed Sinir [Tue, 12 Sep 2017 01:53:53 +0000 (01:53 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours am:
428f7402ba -s ours
am:
dd5fc73944 -s ours
Change-Id: I999efafd61f5f21d3405a28ddb4b0722bf0304c3
Siyamed Sinir [Tue, 12 Sep 2017 01:46:59 +0000 (01:46 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours am:
ba7d98210e -s ours
am:
2135d23dcc -s ours
Change-Id: I81ba6fc009d0e1933576821cc7633deb30b970f3
Siyamed Sinir [Tue, 12 Sep 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours
am:
428f7402ba -s ours
Change-Id: Ic1829b1574e9185f533c3c09cdbc165ea30ca88f
OSDN Git Service
