OSDN Git Service
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
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
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
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
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 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
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
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
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
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
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
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
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
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:49:03 +0000 (12:49 +0000)]
Merge "Fix smart selection logging bugs." into oc-mr1-dev
am:
9cbaa8c7e6
Change-Id: I00dfe6ac59782f431b5f50f059055d9537b73ae8
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
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"
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
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: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: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)
Janis Danisevskis [Fri, 1 Sep 2017 21:45:16 +0000 (14:45 -0700)]
Fix use of auth-bound keys after screen lock removal
When an auth-bound key is used after the screen lock has been removed by
the user, KeyStore.begin retruns UNINITIALIZED.
This patch adds handling for this error code, indicating that the key
that was to be used was permanently invalidated.
Bug:
65200397
Test: CtsVerifier ScreenLockBoundKeysTest:
1. Run test
2. with CtsVerifier in the background remove the screen lock
through the settings dialog
3. Select VtsVerifier in 'recents'
4. Run test again
Change-Id: If68ba0eb2f9c04655fe8c9eea28c4491eae8e92f
(cherry picked from commit
d07d3384279c0c07c5c6747ea8d0c5684264c9d0)
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: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
Siyamed Sinir [Tue, 12 Sep 2017 01:39:50 +0000 (01:39 +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
Change-Id: Ica932e9ac84c764412253decccbe608c534fe310
Siyamed Sinir [Tue, 12 Sep 2017 01:27:46 +0000 (01:27 +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
Change-Id: I065099fb086c91124e7076a0d9df5782547cb1f3
Siyamed Sinir [Tue, 12 Sep 2017 01:27:33 +0000 (01:27 +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
Change-Id: I7a9d0021466e4fa4d326b54df996d23045c15a5c
Siyamed Sinir [Tue, 12 Sep 2017 01:19:26 +0000 (01:19 +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
Change-Id: I20a77b0ed8af5570b899080b80655e965ecc0502
Siyamed Sinir [Tue, 12 Sep 2017 00:45:19 +0000 (00:45 +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
Change-Id: I87dd0675b05119a349887e534ec639fc798709e3
Siyamed Sinir [Tue, 12 Sep 2017 00:38:21 +0000 (00:38 +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
Change-Id: Ie45e4da6e29b61481d6d43cc24530e5e0db7fa15
Shubham Ajmera [Tue, 12 Sep 2017 00:33:47 +0000 (00:33 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
am:
3df5aa6fca
Change-Id: Ifa0a19d73b4570867630418085b67257b70f1224
Siyamed Sinir [Tue, 12 Sep 2017 00:31:18 +0000 (00:31 +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
Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465
Siyamed Sinir [Tue, 12 Sep 2017 00:23:53 +0000 (00:23 +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
Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c
Siyamed Sinir [Tue, 12 Sep 2017 00:16:19 +0000 (00:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be
am:
8393b54d3e
Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0
TreeHugger Robot [Tue, 12 Sep 2017 00:15:17 +0000 (00:15 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635
am:
064bfd22be
Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498
am:
6352ced635
Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
Lucas Dupin [Tue, 12 Sep 2017 00:00:45 +0000 (00:00 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev
am:
3163ba7458
Change-Id: I7a2d2ddaccaf099bb6a81c4129b8e03ed3d021e1
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6
am:
028ad8d498
Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
TreeHugger Robot [Mon, 11 Sep 2017 23:43:51 +0000 (23:43 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am:
06183a57a6
Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Android Build Merger (Role) [Mon, 11 Sep 2017 23:28:14 +0000 (23:28 +0000)]
Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp am:
529c7ea9bd" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 11 Sep 2017 23:25:55 +0000 (23:25 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43 am:
031e9d5cc8" into oc-mr1-dev-plus-aosp
Siyamed Sinir [Mon, 11 Sep 2017 23:25:46 +0000 (23:25 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp
am:
529c7ea9bd
Change-Id: I948bc394d3904a1c7e7245b539cd004ce8fccad1
Siyamed Sinir [Mon, 11 Sep 2017 23:24:21 +0000 (23:24 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43
am:
031e9d5cc8
Change-Id: I0e7b2804bc3cb8a356b2a57691dec44342b8c999
Jordan Liu [Mon, 11 Sep 2017 23:21:48 +0000 (23:21 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1 am:
2602e5ff62
am:
ab9cd2868e
Change-Id: Ief0f4d2f5c53917cc1f8d91091bf1644bc7c3589
Abodunrinwa Toki [Fri, 8 Sep 2017 20:11:49 +0000 (21:11 +0100)]
Fix smart selection logging bugs.
- Fix count with selection start index inside a word
- Properly handle whitespace characters
- Set the model version tag
Bug:
64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: Manually tested that logs are correct. Will follow up with automated tests.
Merged-In: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29
Change-Id: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29
Siyamed Sinir [Mon, 11 Sep 2017 23:18:51 +0000 (23:18 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c
am:
491aaaae43
Change-Id: I5aeedb12ac229181ea5f4b2343acf81e5778494f
Android Build Merger (Role) [Mon, 11 Sep 2017 23:18:13 +0000 (23:18 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp
Siyamed Sinir [Mon, 11 Sep 2017 23:16:13 +0000 (23:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c
am:
491aaaae43
Change-Id: I38a64e635f6820ca5368d154363ea3414c8e047e
Jordan Liu [Mon, 11 Sep 2017 23:14:59 +0000 (23:14 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1
am:
2602e5ff62
Change-Id: Ifd7054cb269edbc7728e1ad561a012ff858cdad5
Mathieu Chartier [Mon, 11 Sep 2017 23:11:52 +0000 (23:11 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev
am:
15998c4d01
Change-Id: I9164d6c8816c9cfaabe85b0e33c7eed76682e1fd
Siyamed Sinir [Mon, 11 Sep 2017 23:06:27 +0000 (23:06 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
am:
846a46043c
Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00
Jordan Liu [Mon, 11 Sep 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
am:
9da895b5e1
Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970
TreeHugger Robot [Mon, 11 Sep 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev
Jordan Liu [Mon, 11 Sep 2017 22:52:20 +0000 (22:52 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
Adam Lesinski [Mon, 11 Sep 2017 22:06:19 +0000 (22:06 +0000)]
Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf am:
9bf83b4cd1
am:
63c3aa9a45
Change-Id: I8c691fdcbe58c5fe60f0a55ed710f266f51c3f25
Adam Lesinski [Mon, 11 Sep 2017 21:59:04 +0000 (21:59 +0000)]
Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf
am:
9bf83b4cd1
Change-Id: Ibed7a996aed00e6e5cfdee457c40277469a95ebf
Adam Lesinski [Mon, 11 Sep 2017 21:57:44 +0000 (21:57 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am:
8303fb42e0 am:
6cbee7a73c
am:
4ad7c2dd29
Change-Id: I0cd56262c2b72dd48fa3c5263e60bee9feb65658
Adam Lesinski [Mon, 11 Sep 2017 21:50:55 +0000 (21:50 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
am:
9b65f03abf
Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed
Adam Lesinski [Mon, 11 Sep 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am:
8303fb42e0
am:
6cbee7a73c
Change-Id: I10f38277b2bdc364ea5f8caba08475badac325f4
Kevin Chyn [Mon, 11 Sep 2017 21:48:55 +0000 (21:48 +0000)]
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
am:
c6e9bb9da0
Change-Id: Ib8e1512e06cc81ddf9e7f9beac1eef49d232ffc0
Adam Lesinski [Mon, 11 Sep 2017 21:41:27 +0000 (21:41 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
am:
8303fb42e0
Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.
Bug:
63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java