Commit Graph

1817 Commits

Author SHA1 Message Date
Svet Ganov
db2174dcb8 Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b
am: 0010741

* commit '0010741818127e6c9449fc49490f0bad14a76240':
  Ensure local settings caches are not stale

Change-Id: I26c4f1f72eda3b2ebfb3ca6e086a0381d357471c
2016-04-26 18:54:37 +00:00
Svet Ganov
d4bc15b66b Merge "Ensure local settings caches are not stale" into nyc-dev
am: f71d7fe

* commit 'f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
  Ensure local settings caches are not stale

Change-Id: I356b9ad0b6dc1e91bfad140de1b9fc79ab6efef3
2016-04-26 18:47:52 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Adam Lesinski
042799c06d Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 8414b87
am: 34e3a5f

* commit '34e3a5f72daa73f69956aace6583370d82902171':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I08d997bc9c0fc96c54eee8dda69e3c62005b38e5
2016-04-23 00:29:37 +00:00
Adam Lesinski
8414b87f6c Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Iaab0fd5bf59399a3ef2bfe2eb3904ec13691e186
2016-04-23 00:23:56 +00:00
Adam Lesinski
757c6eacc8 BatteryStats: Fix up semantics of SamplingTimer
SamplingTimer has been losing some data, as well as not correctly handling
entries that have gone away and come back with less data (reset).

This change correctly ends a SamplingTimer sample by adding the accumulated amount
to the total, then reseting the running counter to accept new values.

This is also triggered automatically when the incoming data is less than what is currently
recorded.

Bug:25695597
Change-Id: I6b540906e6be527578d1003485384a75ba211b52
2016-04-22 14:48:18 -07:00
Adam Lesinski
9369eb8802 Merge "Record in progress count when parceling Timer" into nyc-dev am: 752434a am: 7c7ee79
am: 27d36bb

* commit '27d36bb9421c6a05990820919f90989a0d92323a':
  Record in progress count when parceling Timer

Change-Id: I364905f0be07562b83695fea09c0ca154e0171f6
2016-04-20 05:26:21 +00:00
Adam Lesinski
27d36bb942 Merge "Record in progress count when parceling Timer" into nyc-dev am: 752434a
am: 7c7ee79

* commit '7c7ee79dc93ad12b2b5535e9727eef30ce1a3693':
  Record in progress count when parceling Timer

Change-Id: I7c4c92d2048df9bab52596bd3c9717fac9a056fb
2016-04-20 05:20:26 +00:00
Adam Lesinski
50e1291340 Merge "Record in progress count when parceling Timer" into nyc-dev
am: 752434a

* commit '752434a0ff54ac30b7701292b66361e64b2ae5a0':
  Record in progress count when parceling Timer

Change-Id: Icc7e8312df00bd22f0e5433e15fc65d2ad705db4
2016-04-20 01:31:46 +00:00
Adam Lesinski
752434a0ff Merge "Record in progress count when parceling Timer" into nyc-dev 2016-04-20 01:22:37 +00:00
Adam Lesinski
98f0d4692c Record in progress count when parceling Timer
The total time is computed before parceling, but the total count is not.

Bug:27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55
2016-04-19 17:21:40 -07:00
Seigo Nonaka
c2c0786787 Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767 am: 3de469a
am: e519b51

* commit 'e519b51d1db816c454bd73ded90ae6b9ea32de4e':
  Delete emojis before and after ZWJ at the same time.

Change-Id: I2426af56d5659c3e6c67d82cbd449815bb7d0e14
2016-04-19 18:44:59 +00:00
Raph Levien
e519b51d1d Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767
am: 3de469a

* commit '3de469a68750e8b9b455a4a5bd3a78ad2ecd4af0':
  Delete emojis before and after ZWJ at the same time.

Change-Id: I826f62aae6baaffea722d8c853cc1d01c8ff41f5
2016-04-19 18:39:52 +00:00
Seigo Nonaka
c94fd1664e Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev
am: 7ecd767

* commit '7ecd7671b75b2ae7c4d20928722b4a1d41bd62ff':
  Delete emojis before and after ZWJ at the same time.

Change-Id: If877cde7549f0bd0e56c7cbd707e360c8df012fd
2016-04-19 18:36:15 +00:00
Raph Levien
7ecd7671b7 Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev 2016-04-19 18:31:05 +00:00
Jeff Sharkey
8f218a61af Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f am: 25b3756
am: 4d341a5

* commit '4d341a5a1c204e4b23fd86cb78b85dd3471c4bb5':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: Id07b89914bcf161ab1a8e9fb1d61b3e2f69c0fe3
2016-04-19 17:28:55 +00:00
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
4dc65d31a1 Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev
am: 89fa73f

* commit '89fa73fd7abe0f87634d2914163a8fc79ba2f738':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: I0043da18fabef2c5c916a2e5562d9e613c2b057c
2016-04-19 17:16:25 +00:00
Seigo Nonaka
3675d3cd84 Delete emojis before and after ZWJ at the same time.
Vendor may want to introduce their own ZWJ emoji sequence. To delete
them by one back space as the same behavior of Unicode emoji sequence,
use all emoji as the zwj emoji.

Bug: 28248662
Change-Id: I572dad42ee108476962d4b3fe9f3a6019cb50098
2016-04-19 18:54:50 +09: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
75d09e6608 Remove unnecessary allocation+unboxing of objects. am: a09b4d2 am: 4c89ae0
am: 42c2de5

* commit '42c2de56abb91a613291a935cc88da3f655b3a9d':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Ic48935549f7f9b13d5f0a2d98fc0979fbfc5a38b
2016-04-18 10:42:28 +00: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
3a00b69702 Remove unnecessary allocation+unboxing of objects.
am: a09b4d2

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

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31: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
Siyamed Sinir
5932e8b8f0 Update autoLink URL regex to match empty path, $ and _
Update URL regular expression to match
- path and query that contains dollar sign
- domain name that contains underscore
- empty path with query parameters. i.e. a.com?q=v

Bug: 27436084
Bug: 27501264
Change-Id: I3884624e145ccc1175915327dc2f280ef4e55ce1
2016-04-13 20:10:47 +00:00
Joe Onorato
5ae916e1ad Merge "Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev am: 5dc3c67" into nyc-dev-plus-aosp
am: e111018

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

Change-Id: I3b4957a0f20767a44a5064b1276ccd34c49b26f8
2016-04-12 22:42:11 +00: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
4b46826f16 Merge "Exclude unicode space characters from autoLink URL patterns" into nyc-dev am: 4b92594
am: cda996c

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

Change-Id: I00026490816b2a64424effe34d349870eaeae549
2016-04-12 00:48:10 +00: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
f883c447aa Merge "Shift+Meta+Space should reverse-rotate subtypes." into nyc-dev am: 270fe5d
am: ddee287

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

Change-Id: I82773b8bf55eacc6fbc07ee98936df47619f1400
2016-04-11 06:43:07 +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
afb749fcd7 Merge "Added Notification Stress Tests" into nyc-dev am: fc90ffe
am: b45b0b7

* commit 'b45b0b71058053dd7fd00f47ad92a430b48b29fb':
  Added Notification Stress Tests

Change-Id: I16ac8abe9f5b4c3c6431e24d807f9b8fb23ab6d3
2016-04-08 17:13:36 +00: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
3acf361908 Merge "Remove tests that have been moved to CTS" into nyc-dev am: 41c1bb8
am: 968e6e9

* commit '968e6e940a86633192fd81802aa6846dc2d13301':
  Remove tests that have been moved to CTS

Change-Id: I2053b6ea6865e7dc347344a21da13601135e41f9
2016-04-07 17:12:44 +00: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
3c4a67def0 Merge "Rewrite SuggestionsPopupWindowTest using espresso." into nyc-dev am: d119ab9
am: 240c23b

* commit '240c23b5340a5a37cb162d3fbef5c880cabca2d8':
  Rewrite SuggestionsPopupWindowTest using espresso.

Change-Id: I70b0a86b391fed471cd2f7d1e14b55c818bab90b
2016-04-07 04:40:35 +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
a912446c44 Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev am: ca94f29
am: ec0a5e0

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

Change-Id: Ibb0a004e26c510faefc3b0adf821440829863af6
2016-04-06 00:47:08 +00: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