Commit Graph

39941 Commits

Author SHA1 Message Date
Sunny Goyal
e1682a6258 am 0dd222ef: am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev
* commit '0dd222ef706eb4e1fdeaa7f2bf08f7254124ff11':
  Fixing bounds check.
2014-08-18 19:41:21 +00:00
Craig Stout
e7daa311df am 37e35094: am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev
* commit '37e3509452ed789d57165f7929c3f9d648c49eb0':
  Fix alert, date picker, time picker dialogs for TV.
2014-08-18 19:41:16 +00:00
Kenny Root
5a9621c73a am b1123831: am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev
* commit 'b1123831c098e9e32c39ce93583dadd121709935':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
2014-08-18 19:40:44 +00:00
Sunny Goyal
7bf7a25618 am 868b656d: am 860af1e5: Merge "Fixing bounds check." into lmp-dev
* commit '868b656d19dc6920fbcabe61e4913f95c4b68de0':
  Fixing bounds check.
2014-08-18 19:28:53 +00:00
Craig Stout
c27e79d3e1 am b23f941f: am a245102a: Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev
* commit 'b23f941f0f0b2ad267b8617aefd41bdc132fd21a':
  Fix alert, date picker, time picker dialogs for TV.
2014-08-18 19:28:48 +00:00
Kenny Root
74a74b637e am b4b398b7: am 286a1434: Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev
* commit 'b4b398b7cae59c581930acc58d9b9f09262c0695':
  Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"
2014-08-18 19:28:14 +00:00
Dianne Hackborn
80086cd4b4 am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev
* commit 'a0a646245c6aefa9d8303b641256381e639f0d47':
  Work on issue #16629489: Google (Play?) Services eating through battery
2014-08-18 19:17:51 +00:00
Dianne Hackborn
84ba83bb3d am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev
* commit 'af6eb301c54d90e534ed058c88f6ca7e907eb340':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
2014-08-18 19:17:47 +00:00
Adrian Roos
48986869c3 am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
* commit '2ff048ff5587e029e83e17fdfdecaa3fa0fd70c2':
  Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:14:52 +00:00
Adrian Roos
49e057d7ee Play "device trusted" sound when onTrustInitiatedByUser fires
Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
2014-08-18 16:53:27 +00:00
John Reck
30bb86629a am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
* commit '98270e20063bd6446c088335c957bb5062ba5cf1':
  Don't mangle layer paint's alpha
2014-08-18 16:21:34 +00:00
Jason Monk
d6ea61cd15 am 75391416: am 71793e71: Merge "Fixes to lock task API from API review" into lmp-dev
* commit '75391416fe284946f41cfa39799f7e580975fbbf':
  Fixes to lock task API from API review
2014-08-18 13:51:09 +00:00
Jinsuk Kim
b347ed75cd am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
* commit 'c68c9dbdd5b1e70a429ff2283348a5609522d8cb':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 02:37:42 +00:00
Anish Athalye
7c4db3583b Merge "Implement line breaking in native code" 2014-08-16 04:32:18 +00:00
Dianne Hackborn
e837316a50 am 2d810a47: am a0a64624: am 728f5d08: Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev
* commit '2d810a477456b93d39aa0cdc30565a9c6eaf574c':
  Work on issue #16629489: Google (Play?) Services eating through battery
2014-08-18 19:30:05 +00:00
Dianne Hackborn
aba7df589c am 0b04b981: am af6eb301: am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev
* commit '0b04b98199a89ee640eef3e860d9f003c05b58ca':
  Fix issue #17082301: replacePreferredActivity is ignoring userId
2014-08-18 19:30:00 +00:00
Anish Athalye
c8f9e62186 Implement line breaking in native code
The main purpose for this change is to prepare for adding support for
alternative line breaking algorithms (such as optimal line breaking).

The existing implementation of line breaking was intertwined with
measurement, so it wasn't structured in a way such that other line
breaking algorithms could be easily added. In addition to this,
algorithms (such as optimal line breaking) are usually fairly complex
and computation-intensive, so it is advantageous to implement them in
native code.

This has several other advantages:

    * Unlike the Java code in the previous version of generate(), this
      implementation separates line breaking from measurement. This
      makes it easier to understand and modify the line breaking process
      without affecting measurement (and vice versa).

    * This native implementation of greedy line breaking is identical to
      the Java version in terms of functionality, and it is similar in
      terms of performance, depending on the use case. The performance
      gains from this change are not significant due to increased JNI
      overhead. However, this change is a step in the right direction in
      terms of increasing performance. Once more code moves to C++,
      there will be fewer JNI crossings per layout call and less data
      will be passed from Java to C++, resulting in better performance.

This change moves line breaking from Java to native C++ code. Inspired
by the "Breaking Paragraphs into Lines" paper by Knuth and Plass (1981),
we express the line breaking problem in terms of 'box', 'glue', and
'penalty' primitives, along with a few others. Our implementation
differs in a couple ways:

    * We do not want to clip text when words are wider than the view, so
      we add a new primitive type to represent break opportunities
      between letters. These breaks are avoided whenever possible, but
      when single words do not fit on lines by themselves, they can be
      broken so the entire word is visible.

    * We have to support tab characters, along with user*specified tab
      stops, so we add a new primitive type for that purpose.

    * We are left*aligning text, and so we are not using shrinking /
      stretching glue.

    * We do not support hypenation, so we do not use penalties that have
      widths.

Change-Id: Ia22d1d1275ef26ff3d7b41ee2658e4db525a0305
2014-08-18 12:25:16 -07:00
Adrian Roos
1bd5a220e7 am 04935e46: am 2ff048ff: am a31e2348: Play "device trusted" sound when onTrustInitiatedByUser fires
* commit '04935e46cbbc298e930e5c10450a4118861a1b77':
  Play "device trusted" sound when onTrustInitiatedByUser fires
2014-08-18 17:21:02 +00:00
John Reck
931d0d073c am 41f5d936: am 98270e20: am 976189a1: Merge "Don\'t mangle layer paint\'s alpha" into lmp-dev
* commit '41f5d93635d91e309eb49dbd8973ff8593e66529':
  Don't mangle layer paint's alpha
2014-08-18 16:28:47 +00:00
Jason Monk
45c3597975 resolved conflicts for merge of 8e6b5343 to master
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
2014-08-18 11:05:17 -04:00
Jinsuk Kim
ac33c6cb56 am 28920008: am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev
* commit '28920008ff3835c8febcad58f638530ec6253112':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
2014-08-18 04:06:25 +00:00
Robert Greenwalt
2c8a41fba5 am f8f559f5: am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent.
* commit 'f8f559f5234a8ae0596ecce7814e66a1948d3c2e':
  Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:30:35 +00:00
Robert Greenwalt
bbca13351a am 316c9421: am c993be52: Add tcp buffer size conduit to NetworkAgent.
* commit '316c9421eda732bd510631acd9384b593f37f027':
  Add tcp buffer size conduit to NetworkAgent.
2014-08-17 23:22:32 +00:00
Robert Greenwalt
3f05bf4d78 Add tcp buffer size conduit to NetworkAgent.
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
2014-08-17 15:14:29 -07:00
Dianne Hackborn
314b29a70c am b8496b22: am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev
* commit 'b8496b223a714b8bc6233f17562d13360063d257':
  Make sure we initialize to enable the default voice interaction service.
2014-08-16 19:17:14 +00:00
Dianne Hackborn
28bb0b8ff3 am 7da20cdf: am 83249fc9: Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev
* commit '7da20cdf3c36162ab02790dc99a8c7592e86a015':
  Make sure we initialize to enable the default voice interaction service.
2014-08-16 19:09:39 +00:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Dianne Hackborn
90f58b4447 Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 2014-08-16 04:29:45 +00:00
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Santos Cordon
bb958df02e am fe75850a: am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev
* commit 'fe75850adbbcc63cec8f8a68ab903ab3d28ccdbc':
  Fixing wrong tag usage
2014-08-16 04:11:33 +00:00
Craig Stout
26bcdf14cf Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-dev 2014-08-16 04:03:42 +00:00
John Reck
fb5899d6e0 Don't mangle layer paint's alpha
Bug: 15918037

Change-Id: Iecca0908c6e3b77f15807f75a8294d34975533b4
2014-08-18 08:53:36 -07:00
Santos Cordon
4adf4b0882 am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev
* commit 'ef80aab4cd9042171bdd14f2afb89de72d96db06':
  Fixing wrong tag usage
2014-08-16 03:56:27 +00:00
Craig Stout
fd4bc4cdca Fix alert, date picker, time picker dialogs for TV.
b/15194230

Change-Id: I85bcef86332acb041e5c3b1f8c515d981486c3d1
2014-08-15 20:56:14 -07:00
Sunny Goyal
0efc1186fe Merge "Fixing bounds check." into lmp-dev 2014-08-16 03:56:00 +00:00
Sunny Goyal
681bf60ce2 Fixing bounds check.
Change-Id: Ie17b173ef88288076a5cbfdc741b8e105dcda03e
2014-08-18 11:14:42 -07:00
Dianne Hackborn
89e4ae2f50 Merge "Work on issue #16629489: Google (Play?) Services eating through battery" into lmp-dev 2014-08-16 03:56:00 +00:00
Dianne Hackborn
d953c53d3b Work on issue #16629489: Google (Play?) Services eating through battery
There is a bug in how we deal with name overflows combined with resetting
the battery stats data.  If we do a reset while a wakelock is being
actively held that has been put into the overflow bucket, then we can
end up reducing the number of known wake locks in the list so when after
that it is released we try to release it under its real name rather than
the overflow name.

This means we need to keep track of which wake locks have been placed
in the overflow bucket while they are actively being used, so we can be
sure to properly handle it as part of that bucket until it is eventually
released.

This makes things...  somewhat more complicated.  So now we have a class
to take care of all these details, and also use it for other places where
we have the same overflow semantics sync and job stats.

Also fix potential deadlock -- BatteryStatsHelper needs to call on to
ConnectivityManager to find out of there is telepohny, however we use
that class when doing a dump while the battery stats lock is held.  To
fix this, we check the connectivity state up in the battery stats service
before acquiring the lock and propagate that information through to the
dump code.

Change-Id: Ib452206af5c36f4b0f03cc94d2845d36613d1ba5
2014-08-17 12:39:36 -07:00
Dianne Hackborn
57137289a2 Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev 2014-08-16 03:56:00 +00:00
Dianne Hackborn
f2ac276127 Fix issue #17082301: replacePreferredActivity is ignoring userId
It was being given the argument and just...  ignoring it.

But the bulk of this change is to make replacePreferredActivity
better about replacing -- it now detects if the request will not
make a change and, in that case, just do nothing.

The reason for this?

It turns out that each time you install an app, the telephony
system is calling this function over 20 times to set the default
SMS app.  This is almost always doing nothing, but before this
change it means we would re-write packages.xml over 20 times...!

There are definitely more improvements that can be made here (delaying
write of packages.xml to allow them to batch together, reducing
the amount of calls being made), but until then this is a big
improvement.

Change-Id: I02c4235b8ecd5c13ef53e65d13c7dc2223719cec
2014-08-16 19:34:13 -07:00
Kenny Root
f6040e9c11 Merge "Revert "Remove the warning if the caller gets the insecure variant and add hostname verification (SNI)"" into lmp-dev 2014-08-16 03:52:42 +00:00
Alan Viverette
d7cb8dae66 am 926b8ebd: am 95495581: am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
* commit '926b8ebdd8e02d59d306449494eb00218d550c9a':
  Fix date and time picker styling
2014-08-16 03:34:11 +00:00
Jeff Brown
da5966dc57 am dcc0cc99: am dbab7079: am 23c7b927: Add trace tag for power management.
* commit 'dcc0cc99577d795be71880025835ecce78dc33d2':
  Add trace tag for power management.
2014-08-16 03:34:05 +00:00
Alan Viverette
ef88cb4405 am c49542fb: am 3adb9051: am 47eba14f: Merge "Better handling of unresolved theme attributes" into lmp-dev
* commit 'c49542fb4524d24735bc2d6d693c29ef93ee8b44':
  Better handling of unresolved theme attributes
2014-08-16 03:33:50 +00:00
Alan Viverette
a74b02ca87 am b428f3b0: am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
* commit 'b428f3b0122f9edeb9f4efb7389a50a63594a640':
  Scrapping the view at position zero is still position zero
2014-08-16 03:33:43 +00:00
Alan Viverette
7544bb43f0 am 95495581: am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
* commit '954955811273138b9262f8a1e2ae6df78bdf77e0':
  Fix date and time picker styling
2014-08-16 03:14:24 +00:00
Jeff Brown
ae330728bf am dbab7079: am 23c7b927: Add trace tag for power management.
* commit 'dbab7079dc0cde1026c39149f8240260ce09df8a':
  Add trace tag for power management.
2014-08-16 03:14:14 +00:00
Alan Viverette
e40b205ef4 am 3adb9051: am 47eba14f: Merge "Better handling of unresolved theme attributes" into lmp-dev
* commit '3adb9051a29c904f3a09d82b74c41d16cfa84ca3':
  Better handling of unresolved theme attributes
2014-08-16 03:13:06 +00:00
Alan Viverette
5502a547eb am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
* commit '1125e88d3955f900242754691238995b45d00027':
  Scrapping the view at position zero is still position zero
2014-08-16 03:12:58 +00:00
Dianne Hackborn
16ec0808b5 Make sure we initialize to enable the default voice interaction service.
We weren't taking care of the case of an upgrade to L.  The main
change here is that the voice interaction service setting now has
an empty string when the user has explicitly said they don't want
one, so when it is null we will initialize it to its default.

Change-Id: Icdd30b4f09498f8928cea759a64628bd43bc5d0e
2014-08-15 18:34:10 -07:00