Commit Graph

82221 Commits

Author SHA1 Message Date
Atanas Kirilov
94fbd36ef8 Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev am: c3b4881ea5
am: 4f74605d11

Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570
2018-06-05 15:38:16 -07:00
Atanas Kirilov
4f74605d11 Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev
am: c3b4881ea5

Change-Id: Ia58465b88ef5334753094719f4fdbb175b423f24
2018-06-05 14:24:30 -07:00
Atanas Kirilov
c3b4881ea5 Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev
* changes:
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313 am: 6be1d6713f
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a
  [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008
  [automerger] Make safe label more safe am: 2263da9539
  Make safe label more safe
2018-06-05 19:37:52 +00:00
Mihai Popa
0348259446 Merge "Optimise the hit test algorithm" into oc-dev
am: 6064d8fd4c

Change-Id: I465c15edb18c3084e6b8cbf1f42c0c2c1ebea4eb
2018-06-05 04:39:29 -07:00
TreeHugger Robot
6064d8fd4c Merge "Optimise the hit test algorithm" into oc-dev 2018-06-05 11:28:42 +00:00
TreeHugger Robot
bbfee3189d Merge "Optimise the hit test algorithm" into oc-mr1-dev 2018-06-05 11:28:11 +00:00
Adrian Roos
668761b146 Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am: f04714c59a
am: 6281d64277

Change-Id: Ic7b12c406ac5aea0e9f40b5f2c2f72c5efd87212
2018-06-04 11:18:38 -07:00
Adrian Roos
6281d64277 Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev
am: f04714c59a

Change-Id: I38bab1ff56a30cccb2f748588ffbbe54d5e17e80
2018-06-04 10:02:32 -07:00
TreeHugger Robot
f04714c59a Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev 2018-06-04 11:44:21 +00:00
Mihai Popa
69b589b21d Optimise the hit test algorithm
Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.

This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.

Bug: 79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
2018-05-31 16:19:15 +00:00
Mihai Popa
97c613bb2b Optimise the hit test algorithm
Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the
length of the current line. The method is used when a touch event
happens on a text line, to compute the cursor offset (and the character)
where it happened. Although this is not an issue in common usecases,
where the number of characters on a line is relatively small, this can
be very inefficient as a consequence of Unicode containing 0-width
(invisible) characters. Specifically, there are characters defining the
text direction (LTR or RTL), which cause our algorithm to touch the
worst case quadratic runtime. For example, a person is able to send a
message containing a few visible characters, and also a lot of these
direction changing invisible ones. When the receiver touches the message
(causing the Layout#getOffsetForHorizontal method to be called), the
receiver's application would become not responsive.

This CL optimizes the method to run in O(n) worst case. This is achieved
by computing the measurements of all line prefixes at first, which can
be done in a single pass. Then, all the prefix measurement queries will
be answered in O(1), rather than O(n) as it was happening before.

Bug: 79215201
Test: manual testing
Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
2018-05-31 17:16:52 +01:00
Jakub Pawlowski
bc45dc9536 Fix bad type for txPower in PeriodicAdvertisingReport serialization
am: 459888be84

Change-Id: Ibccfb97e0b41a9ef6af9fcb1da23870dbff7f9b9
2018-05-29 17:50:07 -07:00
Jakub Pawlowski
459888be84 Fix bad type for txPower in PeriodicAdvertisingReport serialization
Bug: 69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
2018-05-29 22:36:32 +00:00
Adrian Roos
3cd5e3d9bb WM: Prevent secondary display focus while keyguard is up
Fixes an issue where input intended for the keyguard could end up going
to a different display.

To prevent this, make sure that only the default display can get focused
when the keyguard is showing.

Change-Id: I6463c44aedca06930d2c9bda7c45ffd93141308c
Merged-In: I6463c44aedca06930d2c9bda7c45ffd93141308c
Fixes: 71786287
Test: atest DisplayContentTests
2018-05-24 14:05:44 +02:00
Benedict Wong
d08ab5a641 DO NOT MERGE: Fix ConnectivityController meteredness checks
This patch corrects ConnectivityController's meteredness checks to
perform correct meteredness checks while VPNs are running. This fixes a
bug in O-MR1 where any apps using the DownloadProvider with unmetered
network constraints fail to start while the VPN is enabled.

This change adds a bespoke method for ConnectivityController, allowing
it to correctly identify the meteredness without affecting public API
surfaces.

Bug: 78644887
Test: Built, flashed on Walleye, and tested.
Test: Additional test coverage in subsequent patch(es).
Change-Id: Ie1d11d93d51d936ce81cd5984af61bde30325983
2018-05-23 23:15:36 -07:00
Android Build Merger (Role)
6e4eaec69b [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313 am: 6be1d6713f
Change-Id: I68cc7356fb9069b8e59913e5524955c241990c8c
2018-05-22 21:59:45 +00:00
Android Build Merger (Role)
6be1d6713f [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313
Change-Id: I49cbda7a4d9643808cc9c164970a6ee630b2233c
2018-05-22 21:59:39 +00:00
Android Build Merger (Role)
46f4563313 [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a
Change-Id: I0f74a4a39349e7c45f1468776618e360be87090c
2018-05-22 21:59:34 +00:00
Android Build Merger (Role)
77f449068a [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008
Change-Id: Ibf0d6da3ef712a2cc45587d59880ddce03a34447
2018-05-22 21:59:30 +00:00
Android Build Merger (Role)
05086b1008 [automerger] Make safe label more safe am: 2263da9539
Change-Id: If833354e5ae2b056de124fe23f0414c7654f6c33
2018-05-22 21:59:24 +00:00
Todd Kennedy
2263da9539 Make safe label more safe
* limit the absolute maximum size of the label to 50000 characters
[which is probably far more than necessary, but, can be dialed down]

* use a string buffer while processing the string [instead of creating
multiple string objects]

Bug: 62537081
Test: Manual. Install APK in bug and see that it can be uninstalled
Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Merged-In: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
2018-05-22 21:59:22 +00:00
Eugene Susla
dd7d1ca671 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06 am: 3543522564
am: 775b8adf7b

Change-Id: I835e777e7e6bee5e91bfa729d095f8b6f0653c43
2018-05-10 13:20:16 -07:00
Eugene Susla
775b8adf7b [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06
am: 3543522564

Change-Id: I62fb1c7d3eb618e7f3d8b2033303761c5f75e9c8
2018-05-10 13:07:48 -07:00
Android Build Merger (Role)
3543522564 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670 am: 2bd91daa06
Change-Id: I88ccfc06e5639ce48c5e8a4659d2cbb7c47b5825
2018-05-09 17:20:01 +00:00
Android Build Merger (Role)
2bd91daa06 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8 am: 76a04ff670
Change-Id: Id013258bbcfb2664c03df15a082bc04ea053663e
2018-05-09 17:19:53 +00:00
Android Build Merger (Role)
76a04ff670 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18 am: 232f42c7b8
Change-Id: I42da7843ef9ecdbc1411a25feb95701150664490
2018-05-09 17:19:45 +00:00
Android Build Merger (Role)
232f42c7b8 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18
Change-Id: I4f4b15c92832c0806fcf3e67f6fd5c9b13eebc1f
2018-05-09 17:19:38 +00:00
Android Build Merger (Role)
97f7498c18 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2
Change-Id: Ia6ba75b4938ab6d9ec0ffe1bc39b6ce6995a808e
2018-05-09 17:19:32 +00:00
Android Build Merger (Role)
9e291fe8c2 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960
Change-Id: Ia3658c17dc890ca2de951da5c701e953ce8c969b
2018-05-09 17:19:18 +00:00
Android Build Merger (Role)
6b95503960 [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f
Change-Id: I7aaceff0646a5e738ed862c34645e548aabf62f1
2018-05-09 17:19:12 +00:00
Android Build Merger (Role)
a99414f51f [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a
Change-Id: Ia89ea1adb47be3b70f5db292677c4c19194a04db
2018-05-09 17:19:07 +00:00
Android Build Merger (Role)
743abb939a [automerger] Nullcheck to fix Autofill CTS am: 6c68a69288
Change-Id: I379d54d926e01da53b637bba6b3b1ee8577cbdbb
2018-05-09 17:19:02 +00:00
Eugene Susla
6c68a69288 Nullcheck to fix Autofill CTS
Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
2018-05-09 17:18:59 +00:00
android-build-team Robot
eaa6d200b3 Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev
am: 8d16d7915d

Change-Id: Ib34226b3ce41e83ae018c86d5a4e53564e207b46
2018-05-03 17:58:59 -07:00
Hansong Zhang
24da173b63 DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug: 73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
2018-04-26 21:26:27 +00:00
Hansong Zhang
d0c2aa5b1b DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
Merged-In: I7f2201cab36adf7f01d1a794d783cb78a536811f
2018-04-26 21:26:17 +00:00
Android Build Merger (Role)
4eaa691175 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 am: 2b41ff76b0
Change-Id: I6e5bf8c2f05f44bc292f4c0ec1fcc885a4a24655
2018-04-26 21:19:03 +00:00
Android Build Merger (Role)
2b41ff76b0 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184
Change-Id: I8e628fee8dd1b9c488aca0ce8f3508c109dd9e18
2018-04-26 21:18:58 +00:00
Android Build Merger (Role)
9822117184 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81
Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60
2018-04-26 21:18:53 +00:00
Android Build Merger (Role)
b906043c81 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1
Change-Id: I3f951fac78c6e2da84eac511d3b0e19141e90153
2018-04-26 21:18:47 +00:00
Hansong Zhang
b6cde9ecc1 DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
2018-04-26 21:18:46 +00:00
Android Build Merger (Role)
365fb1c844 [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f
Change-Id: I937e2d9a676b38f6a18cda70f42d06eaa22ce051
2018-04-26 21:18:27 +00:00
Android Build Merger (Role)
0cd0cef08f [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e
Change-Id: If7693b2ff5785a1a09920061b318aaac33f5d6b6
2018-04-26 21:18:21 +00:00
Android Build Merger (Role)
8fbe4bce1e [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c
Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c
2018-04-26 21:18:14 +00:00
Hansong Zhang
984dfe074c DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
2018-04-26 14:17:52 -07:00
akirilov
531975da75 RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)
am: e5776af814

Change-Id: If7a7b5f316cbf8640e0760e590b279494e5341ac
2018-04-10 11:11:53 -07:00
akirilov
e5776af814 RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
Merged-In: If3752e106aa7fdee4645dc9852289af471ceff18
2018-04-10 17:55:55 +00:00
Android Build Merger (Role)
bae1ea6478 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456
Change-Id: I1d6b280c14a7a6166221ea0d1448de7bc7feb18c
2018-04-09 22:24:28 +00:00
Android Build Merger (Role)
1890afd456 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116
Change-Id: Ib3a14de258a548393279940fd3aeb067f2596ca8
2018-04-09 22:24:22 +00:00
Android Build Merger (Role)
5ddeef7116 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61
Change-Id: If515d9ec229e37bdc1368a96ae1f1b474dd50ebe
2018-04-09 22:24:16 +00:00