Commit Graph

408 Commits

Author SHA1 Message Date
Andreas Gampe
e1b9262084 Frameworks/base: Use || instead of |
Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
2015-03-17 20:27:42 +00:00
Andreas Gampe
9c0ba24f3b am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
  Frameworks/base: Add removeAll for ArraySet
2015-03-05 17:15:58 +00:00
Andreas Gampe
f9345e93db Frameworks/base: Add removeAll for ArraySet
Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.

KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.

Bug: 19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f
2015-03-04 17:14:10 -08:00
Neil Fuller
c1a5e82c25 Merge "Remove usages of FloatMath" automerge: a8e8cdb
automerge: 27316a9

* commit '27316a93e5979859ae98f506eca365784353007a':
  Remove usages of FloatMath
2015-02-12 10:00:41 +00:00
Neil Fuller
e573aa9371 Remove usages of FloatMath
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
2015-02-12 09:20:31 +00:00
Adam Powell
bee1def31b am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '97e0ba691222d037c1820ca8338ad13d07221daf':
  Add DENSITY_280
2015-02-12 02:34:42 +00:00
Adam Powell
0ec652cf72 Merge "Add DENSITY_280" into lmp-mr1-dev 2015-02-12 02:08:04 +00:00
Adam Powell
f6d4045d6c Add DENSITY_280
Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
2015-02-11 13:34:43 -08:00
Adam Lesinski
88c5abb33f am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
automerge: abc88d0

* commit 'abc88d0743924441bf7fcd3085e3305b076f5af5':
  Make ArrayMap.EMPTY immutable
2015-02-05 23:05:40 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
2015-02-05 11:11:03 -08:00
Lorenzo Colitti
583dec84d9 am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
* commit '3d992507a09b4d32c1e961a99d77027db050f01b':
  Only try to fetch time from NTP if there is a network connection.
2015-01-26 22:22:27 +00:00
Lorenzo Colitti
df59053588 Only try to fetch time from NTP if there is a network connection.
Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
2015-01-26 15:24:07 +09:00
Jeff Sharkey
bcba21827c Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null
2015-01-08 01:03:49 +00:00
Young-Ho Cha
0eda7dfcac check ntpserver as empty string instead of null
mServer cannot set null, because string from resource always returns
non-null charsequence

Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
2015-01-08 09:34:01 +09:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
2014-12-08 19:33:49 +00:00
Dianne Hackborn
1e01d16982 Fix issue #17323751: Additional items in aggregated battery stats
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
2014-12-05 13:54:24 -08:00
ztenghui
bac3f5a6f0 am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit '9f67155332e49686ef622b096b715ee62845d401':
  Fix the starting pen's position when a path close.
2014-11-14 00:03:16 +00:00
ztenghui
5e7a29f677 Fix the starting pen's position when a path close.
We have to cache the starting point for the latest "move", then apply it after
we close the path.

b/18214929

Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
2014-11-13 12:55:16 -08:00
Christopher Lane
c56a9d10f7 am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
automerge: 38d6cf9

* commit '38d6cf9cbee98b3fe66e6ccda223b3c4c01a0815':
  Add convenience method for getting the complex unit type
2014-10-31 22:07:30 +00:00
Christopher Lane
9f357ae9f0 Add convenience method for getting the complex unit type
Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
2014-10-31 14:52:06 -07:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
2014-10-31 00:15:01 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
2014-10-29 17:09:36 -07:00
Jeff Sharkey
1c6659486c am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
automerge: 301b563

* commit '301b563107c7458a21e4460254e81694b45f0e35':
  Reduce PackageManager RAM usage: ArrayMap/Set.
2014-10-27 21:33:55 +00:00
Jeff Sharkey
e67b8d2829 Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 2014-10-27 19:57:00 +00:00
Alan Viverette
a8aa03efa7 Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev automerge: 1ac5266
automerge: 4329ad3

* commit '4329ad3be8f42b62f54ab070fcd97d2a1bb2d7f3':
  Add support for Explore by Touch to RadialTimePickerView
2014-10-24 21:28:34 +00:00
Alan Viverette
1ac52667ee Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev 2014-10-24 20:36:33 +00:00
Jeff Sharkey
9f837a99d4 Reduce PackageManager RAM usage: ArrayMap/Set.
Transition PackageManager internals away from heavier HashMap/HashSet
to use drop-in ArrayMap/ArraySet replacements.  Saves ~38% RAM and
thousands of objects on a typical device.

Bug: 18115729
Change-Id: Ie107d2fee4b7baa4e3c3923231b4be877d1a5d2f
2014-10-24 12:26:45 -07:00
Alan Viverette
ffb46bf295 Add support for Explore by Touch to RadialTimePickerView
Also adds IntArray, which is like LongArray for integers, and prevents
the AM/PM label text in the time picker header from wrapping.

BUG: 17468036
Change-Id: I7120089885709f23e20368927e4b3ed9db2e5393
2014-10-24 12:06:11 -07:00
Neil Fuller
a021e92218 resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp
Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
2014-10-24 11:36:46 +01:00
Neil Fuller
bbf8871e1c Deprecating FloatMath and Time
Bug: https://code.google.com/p/android/issues/detail?id=36199
Bug: https://code.google.com/p/android/issues/detail?id=37653
Bug: https://code.google.com/p/android/issues/detail?id=42750
Bug: https://code.google.com/p/android/issues/detail?id=61137
Bug: https://code.google.com/p/android/issues/detail?id=74754
Bug: https://code.google.com/p/android/issues/detail?id=76386
Bug: https://code.google.com/p/android/issues/detail?id=76439
Bug: https://code.google.com/p/android/issues/detail?id=77836
Change-Id: Ic9b57d8a575f93b2258a5481df0ed6b3a952f636
2014-10-23 13:13:05 +01:00
Neil Fuller
1f2ad9eb74 am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:16:29 +00:00
Neil Fuller
38b63f0ede am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:16:08 +00:00
Nick Kralevich
7b3db39aa4 Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
2014-10-20 09:24:11 +01:00
Elliott Hughes
870367567a am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:54:05 +00:00
Elliott Hughes
5fc9f9c293 am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:53:38 +00:00
Elliott Hughes
4cd671e4d2 Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 2014-10-18 20:43:07 +00:00
Elliott Hughes
b3b68d0333 Revert "Replacing FloatMath native implementation with calls to Math"
This reverts commit 32b88b48da.

Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
2014-10-18 20:41:27 +00:00
Neil Fuller
06965cfd12 am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
  Replacing FloatMath native implementation with calls to Math
2014-10-16 09:35:43 +00:00
Neil Fuller
4ef9403577 am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
  Replacing FloatMath native implementation with calls to Math
2014-10-16 09:32:33 +00:00
Neil Fuller
fd2d41b742 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-16 08:16:24 +00:00
Neil Fuller
32b88b48da Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
2014-10-15 11:47:58 +01:00
ztenghui
6a7335acd8 am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev
* commit '3406be853d21af58d551adbde805706f43ef51e2':
  Support negative value in exponential data in the pathData.
2014-10-10 20:12:06 +00:00
ztenghui
897f6daeff Support negative value in exponential data in the pathData.
Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
2014-10-10 11:11:34 -07:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
2014-10-10 16:57:03 +00:00
ztenghui
4cc3e2704a Support dot separation as the svg path data did.
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
2014-10-08 15:51:37 -07:00
vandwalle
542cc240b5 am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
* commit '88b927e258214a31342326d46f527528e5979f85':
  add millisecond timestamp to locallog
2014-10-04 15:45:35 +00:00
vandwalle
40bf513506 am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev
* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
  add millisecond timestamp to locallog
2014-10-03 23:57:21 +00:00
vandwalle
c520aa89a3 add millisecond timestamp to locallog
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
2014-10-03 15:35:25 -07:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
2014-10-02 13:38:23 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
2014-10-02 14:32:37 +01:00