Commit Graph

1750 Commits

Author SHA1 Message Date
Jeff Sharkey
4d341a5a1c Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f
am: 25b3756

* commit '25b37561104a3dfb5cc52d076f904fe0e8313217':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: Ieba43635739603787daa110a0bf35381c0e09574
2016-04-19 17:22:36 +00:00
Jeff Sharkey
84a4c971c4 Unlock should always wait for pending PRE_BOOT.
While processing an unlock request, we might go async to handle
long-running operations like dispatching PRE_BOOT_COMPLETED.  This
change ensures that all unlock requests for a particular user wait
in line behind any pending async operations.

Without this CL, any subsequent unlock requests would immediately
return successful, even though PRE_BOOT_COMPLETED events were still
being processed.

Bug: 28240584
Change-Id: I307d6aaebfb8f38028f3666a2e19e4399b7cf3a7
2016-04-18 15:38:35 -06:00
Narayan Kamath
42c2de56ab Remove unnecessary allocation+unboxing of objects. am: a09b4d2
am: 4c89ae0

* commit '4c89ae0ee4f3d73d84843bf05cdc328b5e821da3':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: I46f5ec0b9b8bc14073bcf7dc643bc909072d53ff
2016-04-18 10:36:37 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Joe Onorato
f35f061c50 Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev
am: 5dc3c67

* commit '5dc3c674a2635179d17e96af8fb248142e03b87e':
  Add some tests for procstats, and fix some bugs that the tests uncovered.

Change-Id: I53ee3334f58db4a0904370fc4f2f1b6b29365020
2016-04-12 22:22:52 +00:00
Joe Onorato
65adfeecd2 Add some tests for procstats, and fix some bugs that the tests uncovered.
Bug: 27045736
Change-Id: Ia910730c5a3a899c89aa63dd7ab48be62cf9cfef
2016-04-12 13:13:41 -07:00
Siyamed Sinir
cda996cff8 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev
am: 4b92594

* commit '4b92594857ce52f96252f43c776f3ed31f0ebdfb':
  Exclude unicode space characters from autoLink URL patterns

Change-Id: Ie8c41292ab33ed50cd41a62eaa98ca7f1a06db14
2016-04-12 00:43:08 +00:00
Siyamed Sinir
4b92594857 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev 2016-04-12 00:35:29 +00:00
Yohei Yukawa
ddee2875c1 Merge "Shift+Meta+Space should reverse-rotate subtypes." into nyc-dev
am: 270fe5d

* commit '270fe5dbe49b5619ac87ebd50cdececd699fc0ad':
  Shift+Meta+Space should reverse-rotate subtypes.

Change-Id: I8d0bd25545c6892f2788194350e290e6f8d9eb4c
2016-04-11 05:32:05 +00:00
Yohei Yukawa
d39ae85482 Shift+Meta+Space should reverse-rotate subtypes.
This is a follow up CL to my previous CL [1], which added a new key
binding Meta+Space to rotate enabled IME subtypes.  With this CL,
Shift+Meta+Space starts reverse-rotating enabled IME subtypes as
originally planed.

 [1]: I4005692215edfcf8bed3e86b1e07000148f986f5
      ae61f7118a

Bug: 25753404
Bug: 28103839
Change-Id: I3694edd80be6dfe18b90360e24ae4d451b331928
2016-04-10 20:28:40 -07:00
Bennie Ouyang
b45b0b7105 Merge "Added Notification Stress Tests" into nyc-dev
am: fc90ffe

* commit 'fc90ffe392c3f00d85998e778e5b0bcd5240ce93':
  Added Notification Stress Tests

Change-Id: I66b8ae96b0f6aa02ee228f2d85b52fe3cb1ac148
2016-04-08 17:08:08 +00:00
Bennie Ouyang
fc90ffe392 Merge "Added Notification Stress Tests" into nyc-dev 2016-04-08 16:58:21 +00:00
Bennie Ouyang
a6b8e9c313 Added Notification Stress Tests
Change-Id: I956ec68bf752becfedb3eca2483ae5c212166dd2
2016-04-07 16:15:50 -07:00
Adam Lesinski
968e6e940a Merge "Remove tests that have been moved to CTS" into nyc-dev
am: 41c1bb8

* commit '41c1bb8f4a5a1f2f0a23d6cece525eaea50f57b3':
  Remove tests that have been moved to CTS

Change-Id: I39012b182d637d37fccafbc13677089885dcbcdb
2016-04-07 17:08:33 +00:00
Adam Lesinski
41c1bb8f4a Merge "Remove tests that have been moved to CTS" into nyc-dev 2016-04-07 17:04:13 +00:00
Keisuke Kuroyanagi
240c23b534 Merge "Rewrite SuggestionsPopupWindowTest using espresso." into nyc-dev
am: d119ab9

* commit 'd119ab94c0d55c3077b1a7c8ca6a54baf6d7087b':
  Rewrite SuggestionsPopupWindowTest using espresso.

Change-Id: I5dca34e91ee05a1cc3cea3f5fa016df675266cb5
2016-04-07 04:37:50 +00:00
Keisuke Kuroyanagi
d119ab94c0 Merge "Rewrite SuggestionsPopupWindowTest using espresso." into nyc-dev 2016-04-07 04:33:11 +00:00
Adam Lesinski
04518f8e9f Remove tests that have been moved to CTS
ag/906284

Change-Id: I9e5da9239a62dbc85a1b22f8fe8876da65675d9a
2016-04-06 17:47:10 -07:00
Keisuke Kuroyanagi
31eb74fb2b Rewrite SuggestionsPopupWindowTest using espresso.
- Rewrite existing test about text appearance.
- Add new tests for suggestions popup.

Bug: 25904136
Bug: 27765262
Change-Id: I12e522436a83fa264cd22176d054877eec411708
2016-04-06 19:37:46 +09:00
Makoto Onuki
ec0a5e0bea Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev
am: ca94f29

* commit 'ca94f29366b9b6e3211351c2d098060114ef5fa8':
  Make FastXmlSerializer more suitable to persist arbitrary strings

Change-Id: Ib9a061aaad82054c0060cbc2b84118a71d1c098b
2016-04-06 00:43:46 +00:00
Makoto Onuki
ca94f29366 Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev 2016-04-06 00:36:52 +00:00
Siyamed Sinir
911c2694e2 Exclude unicode space characters from autoLink URL patterns
Excludes the following space characters from autoLink URL patterns:
\u00A0: no-break space
\u2000: en quad
\u2001: em quad
\u2002: en space
\u2003: em space
\u2004: three-per-em space
\u2005: four-per-em space
\u2006: six-per-em space
\u2007: figure space
\u2008: punctuation space
\u2009: thin space
\u200A: hair space
\u2028: line separator
\u2029: paragraph separator
\u202F: narrow no-break space
\u3000: ideographic space

Bug: 28020781
Change-Id: Ie6df818dc4d33dfee6ee54432a2231cca51ec423
2016-04-05 16:33:58 -07:00
Jeremy Joslin
7acd105411 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev
am: b770ed1

* commit 'b770ed132813356c2b1548b0a98c1edb565c7340':
  Have the NetworkScoreService bind to the scorer.

Change-Id: I319344d3362068624b4f3bda7f1cf1d563507115
2016-04-05 23:25:18 +00:00
Philip P. Moltmann
c48311f0eb Merge "We only have one mock service." into nyc-dev
am: c05a7a0

* commit 'c05a7a04c22c836c49ea0e605247c0f35799a3dc':
  We only have one mock service.

Change-Id: I6c3748cb83103be7a50cff528d97607e73de7ef0
2016-04-05 23:25:14 +00:00
Makoto Onuki
3ae3557ea3 Make FastXmlSerializer more suitable to persist arbitrary strings
- Encode '\u000' - '\u001F', so KXmlParser can read them properly.
Otherwise KXmlParser will ignore CRs/LFs in attributes, and CRs
in text.

- Originally FastXmlSerializer would throw if a string contains
dangling surrogate pairs.  Now we REPLACE them with.

Bug 27792649

Change-Id: I10c547dad2475b68f60e9e8208d9a3eae8e20063
2016-04-05 16:12:07 -07:00
Jeremy Joslin
b770ed1328 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev 2016-04-05 22:27:11 +00:00
Philip P. Moltmann
f4eadc5c53 We only have one mock service.
Fixes: 28024464
Change-Id: I1392704c4fdb9e7c3a4b1540131af8a14359c8f4
2016-04-05 15:16:54 -07:00
Jeremy Joslin
dd251ef495 Have the NetworkScoreService bind to the scorer.
If the current active scorer provides a service that can handle the
android.net.scoring.SCORE_NETWORKS action then the NetworkScoreService
will bind to that service to keep the scorer alive. If no service is
discovered then no attempt to bind will be made.

BUG: 27612145
Change-Id: I3f6ed0cbd83e658f1533c3e37b0cac2692c01761
2016-04-04 18:13:29 -07:00
Keisuke Kuroyanagi
3620738bf9 Merge "Make TextViewActivityTest stable by sleeping between clicks." into nyc-dev
am: 75aee0a

* commit '75aee0a681a763b8de67cb078ca3e520f65c8efe':
  Make TextViewActivityTest stable by sleeping between clicks.

Change-Id: I089fe9b89c84b1021bca57a25be6d73ba6437f98
2016-04-04 03:46:35 +00:00
Keisuke Kuroyanagi
75aee0a681 Merge "Make TextViewActivityTest stable by sleeping between clicks." into nyc-dev 2016-04-04 03:39:20 +00:00
Keisuke Kuroyanagi
51ec6d9789 Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev
am: fc1d11e

* commit 'fc1d11ed9dc4d25a939e5187f32fe9eb107e942c':
  Make hasTransientState be true only if user created selection is active.

Change-Id: Ic28caa1dea935da7b6408282fb0266c889c29050
2016-04-04 03:20:47 +00:00
Keisuke Kuroyanagi
fc1d11ed9d Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev 2016-04-04 03:12:32 +00:00
Clara Bayarri
ceeab499ac Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev
am: 032a76f

* commit '032a76f94b457d255ebc0895bc1d8f3c0b6d8e31':
  Remove unused import for KeyboardShortcutGroup

Change-Id: Id69c4c923a3456857d73a2c21a27be962378bd12
2016-04-01 16:27:01 +00:00
Clara Bayarri
89203de878 Remove unused import for KeyboardShortcutGroup
Left it in accidentally when removing default method.

Change-Id: I6af0712624ffaefff4cb4ad2a9e5a86d7104d2e7
2016-04-01 14:40:34 +01:00
Keisuke Kuroyanagi
5f318b6285 Make TextViewActivityTest stable by sleeping between clicks.
Bug: 27893257
Change-Id: I2eaaa38b4af9333a46a8702098b4ec0806def538
2016-04-01 19:16:31 +09:00
Keisuke Kuroyanagi
183fd5071e Make hasTransientState be true only if user created selection is active.
Previously, hasTransientState returned true even when TextView has a
selection that hasn't been created by the user. This unnecessarily
prevents the TextView from being recycled.
This issue was introduced by Ib454b0fbbc2c2f8d198, which fixes that
setHasTransientState(true) is not always coupled with
setHasTransientState(false).

With this CL:
hasTransientState will get true when selection action mode is started.
hasTransientState will get false when selection is removed.
Note that hasTransientState intentionally continues to be true when
selection action mode is terminated with preserving selection.

Bug: 27913323
Change-Id: I960ddfd7221caeb676c23926af06a8a415dec288
2016-04-01 15:00:53 +09:00
Ying Wang
e7965d4a22 Merge "Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3" into nyc-dev-plus-aosp 2016-03-31 18:00:52 +00:00
Ying Wang
c2f612e048 Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3
Change-Id: I84953dc077a5dfea1290b952e2de73f9a6d34118
2016-03-31 10:55:46 -07:00
Siyamed Sinir
07fd581581 Merge "Benchmarks for Linkify" into nyc-dev
am: e14bab8

* commit 'e14bab859ef3a1e47eb063781d04dd32d92cf3e8':
  Benchmarks for Linkify

Change-Id: Ie4812aa87376f95a0824fc4e0d87a1eba335e534
2016-03-31 17:49:19 +00:00
Siyamed Sinir
e14bab859e Merge "Benchmarks for Linkify" into nyc-dev 2016-03-31 17:17:18 +00:00
Jeff Sharkey
294163e833 Merge "Fix DownloadManager tests." into nyc-dev
am: 4938d6e

* commit '4938d6e161733b69a291d2ddf16d25efb41030cb':
  Fix DownloadManager tests.

Change-Id: I306883251d72e655a361a30217bf825e0fe8beea
2016-03-31 02:45:45 +00:00
Jeff Sharkey
4938d6e161 Merge "Fix DownloadManager tests." into nyc-dev 2016-03-31 02:43:21 +00:00
Philip P. Moltmann
fa04bc7a5d Merge "Add the print service recommendation service" into nyc-dev
am: 740a5f0

* commit '740a5f023eea7b2fdb3e31efe8b8d5ac18aa8302':
  Add the print service recommendation service

Change-Id: Ie58ade9356f591781496581259b6d8a876780ac9
2016-03-31 02:17:26 +00:00
sergeyv
761f59c19f Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev
am: 394d3df

* commit '394d3dfb2d9ccd2ca2fd7aad06ef2e9a8458a0c7':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Iab1265b6a4c4ff5291259f7e5d9b96c217ee3141
2016-03-31 00:32:41 +00:00
Jeff Sharkey
f584f12b6b Fix DownloadManager tests.
ERROR_CANNOT_RESUME is the correct code for one, and relative paths
are supported by the RFC, so change the test to check for success.

Bug: 27580939
Change-Id: Ife99c22a44dd71232466e35d38a2441c16a558f7
2016-03-30 18:22:22 -06:00
Philip P. Moltmann
9dcb86a48d Add the print service recommendation service
This service connects through the print manager to the print spooler:

PrintSpooler.AddPrintersActivity <-> PrintManager <-> PrintManagerService <-> UserState <-> RemotePrintServiceRecommendationService <-> PrintRecommendationService <-> PrintRecommendationServiceImpl

Hence there is a lot of mindless plumming.

The actual changes are only in the AddPrintersActivity which is extended
to show another list of services: The recommended services.

The PrintServiceRecommendationService is based on the experimenal print
service stubs provider. This provider was contributed the Android by
Mopria. As this services uses Android own network discovery service most
code from the experimental provider goes away. In fact the only logic
left over is the selections of mdns-txt fields to look at and the
printer vendor configuration.

This relies on the Android MDNS to get fixed (Bug: 27696905). This also
does not deal with how to update the recommendation service.

Bug: 24533249
Change-Id: I6edc6e25fc08a50d478b61c71bb8ea158b08624c
2016-03-30 17:21:07 -07:00
Siyamed Sinir
545c3cf95f Benchmarks for Linkify
Add benchmarks for Linkify and URL regular expressions.

Bug: 27921706
Change-Id: I61dcd090bdf877f2df77e898c8a0f441de1dc45a
2016-03-30 17:02:02 -07:00
Sergei Vasilinetc
394d3dfb2d Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev 2016-03-30 23:42:34 +00:00
Adam Lesinski
7baa5212c2 Merge "Allow multiple Resources associated with an Activity" into nyc-dev
am: d17f96a

* commit 'd17f96ae007179007765c0f75b6bffb13c9285cb':
  Allow multiple Resources associated with an Activity

Change-Id: I34dd24af289d3384deb72cf66ba076b2f7cfd2e8
2016-03-30 22:37:35 +00:00
Adam Lesinski
7f3f499887 Allow multiple Resources associated with an Activity
Previously it was assumed that one Resources object per Activity would be fine.
This proved to be incorrect, as methods like Context#createConfigurationContext()
expect to create a new Resources object that gets updated whenever the Activity Resources
get updated.

To fix this issue, there exists a master override configuration for each Activity. Subsequent
Resources created for an Activity will be based off that master override configuration, and
will be updated accordingly.

Bug:27644297
Bug:27604953
Change-Id: Idb3d851f55ee7981eec4e3fe28e2ea8d55f1192d
2016-03-30 14:27:11 -07:00