32306 Commits

Author SHA1 Message Date
Lorenzo Colitti
5ad421a3d0 Use LinkAddress in address notifications.
Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.

This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.

Bug: 9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e
2013-11-26 21:55:15 +09:00
Lorenzo Colitti
5ae4a531cc Pass DNS server info notifications to observers.
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.

[Cherry-pick of 416740ad4d9132005a71dc0883334e852235a18a]

Bug: 9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
2013-11-25 17:27:17 +09:00
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
2013-11-22 11:18:57 -08:00
Robert Greenwalt
ecfae4f899 am a4c8fabf: Merge "fix ethernet and wifi can\'t be tuned seperately issue"
* commit 'a4c8fabfbb0bf5bf9da5267c13230c5169b5943d':
  fix ethernet and wifi can't be tuned seperately issue
2013-11-21 18:02:00 -08:00
Jianzheng Zhou
a363a10ca2 fix ethernet and wifi can't be tuned seperately issue
ethernet especially Gigabit enet use the same tune data with wifi
won't reach best performance.

Change-Id: Iac50ba47904c76ff7b5b8ad226e83451359ec534
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-11-15 13:32:23 +08:00
Dianne Hackborn
47b260d071 am 572b759a: Merge "Use index in SparseArray access properly"
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8':
  Use index in SparseArray access properly
2013-11-14 16:35:42 -08:00
Dianne Hackborn
572b759a41 Merge "Use index in SparseArray access properly" 2013-11-15 00:33:20 +00:00
Robert Greenwalt
ec9e8933ef am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:27:56 -08:00
Igor Chernyshev
b94d654d36 Use index in SparseArray access properly
The original code was calling get() rather than valueAt(),
treating index as if it was a key.

Change-Id: I52539dfcb49b3d2ee3cb027d38c50b46f73b5ee7
Signed-off-by: Igor Chernyshev <igorc@google.com>
2013-11-12 18:56:21 -08:00
Raj Mamadgi
f89fade0cd Fix for the invalid Global Proxy Setting
b/11598568

Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Change-Id: Ib93d24a80af1a329694f07c47bd81dfcc1e1b874
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
2013-11-12 21:14:02 -05:00
Jeff Brown
145cac85f8 am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
* commit '4bf6eb1775649a803efcc6da8f06e5083ed24f34':
  Memory leak in IInputMethodSessionWrapper executeMessage
2013-10-29 14:06:07 -07:00
Jeff Brown
5214dae44c am 6dbbba4e: Merge "handle negative temperature"
* commit '6dbbba4e9adc3f1c2481698e42f4ffc0c68937f1':
  handle negative temperature
2013-10-29 14:02:34 -07:00
Jeff Brown
4bf6eb1775 Merge "Memory leak in IInputMethodSessionWrapper executeMessage" 2013-10-29 21:01:13 +00:00
Jeff Brown
6dbbba4e9a Merge "handle negative temperature" 2013-10-29 20:59:38 +00:00
Alex Klyubin
5692203998 am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit 'b4cae4a955ebd91cf35aaeb00ab12ce6f1d5fc48':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
2013-10-29 08:50:28 -07:00
Alex Klyubin
019118af67 Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
The method was returning all supported cipher suites instead of the
default ones only. The default list of cipher suites actually used by
sockets created by this factory is not affected by this issue.

Change-Id: I2e4d7c6547fcb29ff7a0943bc8791706cc8d22bc
2013-10-28 16:24:33 -07:00
Zhijun He
98d1ba4bd7 am 650b4616: am 6355103b: Merge "Camera2: filter bad faces" into klp-dev
* commit '650b4616c1a4eedcafd9cdd5fcbde94454fff069':
  Camera2: filter bad faces
2013-10-16 16:47:39 -07:00
Svetoslav
53998c0f50 am 13bc41a5: am 265a099c: Merge "Add APIs for an advanced print options activity." into klp-dev
* commit '13bc41a52d19dc32a5a0a9b23d27a26978439010':
  Add APIs for an advanced print options activity.
2013-10-16 16:43:59 -07:00
Zhijun He
6355103bca Merge "Camera2: filter bad faces" into klp-dev 2013-10-16 23:39:24 +00:00
Scott Main
3d66877b93 am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
* commit '0763e1565b8e82a1754b21e7c9096b525402f724':
  some javadoc improvements for virtual display and new meta tag name
2013-10-16 16:36:03 -07:00
Svetoslav
265a099c10 Merge "Add APIs for an advanced print options activity." into klp-dev 2013-10-16 23:35:35 +00:00
Zhijun He
844b3520cc Camera2: filter bad faces
Filter bad face score and ids.

Bug: 11257538
Change-Id: I9beb042e8c0d2f08a3efcd2877deee036b80482f
2013-10-16 16:13:50 -07:00
Svetoslav
1c43fceaaa Add APIs for an advanced print options activity.
This is the API part needed to implement support for custom print
options by a print service. Some printers have quite fancy options
and we want users to benefit using them.

bug:11241800

Change-Id: I3a9df771c0ded559b61c597c686795840d702b27
2013-10-16 15:47:44 -07:00
Scott Main
cc2195bb56 some javadoc improvements for virtual display and
new meta tag name

Change-Id: If9caba425f825652468a0f3e868f71ed1a778fb1
2013-10-16 14:08:07 -07:00
Jeff Sharkey
fc7c4b9d72 am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
* commit '2a48dbcee91a3a37dacaa96763c92f116d916a15':
  Improve DocumentsProvider and contract docs.
2013-10-15 17:52:29 -07:00
Jeff Sharkey
905c50a212 Merge "Improve DocumentsProvider and contract docs." into klp-dev 2013-10-16 00:47:36 +00:00
Jeff Sharkey
f53c1a6841 am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
* commit 'f82a387cc7e82a18622465e62370e2c4203839f1':
  Improve OPEN/CREATE_DOC docs.
2013-10-15 17:15:44 -07:00
Jeff Sharkey
9f81a1a49c am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
* commit '84c8603da051638b41baabef54bcc0f4cbef9735':
  Improve external storage docs on Context.
2013-10-15 17:15:40 -07:00
Michael Wright
ee3674a01b am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
* commit '19fa212251542ac8f24ec0b24316bb08417cb44e':
  Force the wallpaper to reload when dimensions change
2013-10-15 17:15:35 -07:00
Jeff Sharkey
e3924ca486 Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 2013-10-15 23:45:10 +00:00
Jeff Sharkey
3cf56085f1 Merge "Improve external storage docs on Context." into klp-dev 2013-10-15 23:44:54 +00:00
Jeff Sharkey
e8c00d8ed4 Improve DocumentsProvider and contract docs.
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
2013-10-15 16:44:22 -07:00
Michael Wright
6bd7603a56 Merge "Force the wallpaper to reload when dimensions change" into klp-dev 2013-10-15 23:40:14 +00:00
Jeff Sharkey
adef88a0a9 Improve OPEN/CREATE_DOC docs.
Bug: 10936473
Change-Id: I4378aaaf927f114982191efd4f9887dad075390d
2013-10-15 13:54:47 -07:00
Michael Wright
b9fca99971 Force the wallpaper to reload when dimensions change
Currently it's possible for the home application to suggest new
wallpaper dimensions and the WallpaperService to request the bitmap
between when the new dimensions have been propagated and the old
bitmap has been forgotten. This leads to the WallpaperService
drawing a Bitmap with the old dimensions into a Surface with the new
dimensions.

By forcing the WallpaperManager to forget the old Bitmap immediately
before we reload it, we can ensure that we always have a Bitmap of
the correct size.

Bug: 10853302
Change-Id: I298ac5f3f8bcde54eeb1e45d21bf2ba3cbb618c9
2013-10-15 13:03:44 -07:00
Jeff Sharkey
6feb50b826 Improve external storage docs on Context.
Bug: 10461652
Change-Id: I42a3d887418e126f9dc2a9be8060a8eedd425f8e
2013-10-15 13:01:33 -07:00
Zhijun He
2c31cf7cc4 am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES
* commit '549a95902a20c8a96167215982c282264e47d3ed':
  Camera2: return CaptureResult.STATISTICS_FACES
2013-10-15 10:18:44 -07:00
Zhijun He
58216c2650 Camera2: return CaptureResult.STATISTICS_FACES
Changes included in this CL:

- remove the WAR for face detect mode null case.
- make the sanity check assert to warnings.
- make number of faces to be the minimal length of face metadata array length to
avoid out of bound access, since we relax the sanity check.

Bug: 11206459
Change-Id: Ifd9f7f79617039c1b3ad631f202b48076d775e09
2013-10-15 07:46:53 -07:00
Torne (Richard Coles)
f96b93e22c Resolved conflicts for merge of c5f742d4 to klp-dev-plus-aosp
Change-Id: Ieeb9460a66ca761ae347fecff671ce54dfbc9cdf
2013-10-15 11:49:09 +01:00
Torne (Richard Coles)
db931a3b2b am a1ba29ac: am d892afc8: Remove support for switching WebView.
* commit 'a1ba29acc4a6709f74fb7fefdcdb66adc71c849a':
  Remove support for switching WebView.
2013-10-15 03:41:34 -07:00
Torne (Richard Coles)
94c0057d67 Delete the old WebView.
Delete all the Java classes used only by the old WebView implementation,
and also sections of common classes that were only needed for the old
WebView.

Bug: 10427705
Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d
2013-10-15 11:18:51 +01:00
Torne (Richard Coles)
d892afc88d Remove support for switching WebView.
WebViewFactory remains as an abstraction layer, but will now always
creates Chromium WebView instances.

Bug: 10427705
Change-Id: I045e43eb35462567fecd29d04e7b61902baef547
2013-10-15 11:18:50 +01:00
Eino-Ville Talvala
c80477e712 am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev
* commit 'a7833f861e303d9dea2cf54ceb519ff937f68367':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
2013-10-14 23:48:29 -07:00
Eino-Ville Talvala
bf9b087be0 Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 2013-10-15 06:41:59 +00:00
Michael Jurka
a0ce8c92cf am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev
* commit 'a09c20a23038c1d77ae3d511da18a377572aed0c':
  Fix getBuiltInWallpaper method
2013-10-14 20:57:22 -07:00
Michael Jurka
a457211af5 Merge "Fix getBuiltInWallpaper method" into klp-dev 2013-10-15 03:49:13 +00:00
Michael Jurka
0539153e77 Fix getBuiltInWallpaper method 2013-10-14 20:45:02 -07:00
John Spurlock
5a87a4e355 am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev
* commit '30408434d3c04efa2b4a18838f9dfe0b5760f4ef':
  Give IMEs the entire screen to use for measuring purposes.
2013-10-14 19:02:03 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
2013-10-14 19:01:55 -07:00
Michael Jurka
7ec3a98110 am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev
* commit '588bfeeaad627985163c8bcd76d4815b1ebce13a':
  Fix the build
2013-10-14 19:01:47 -07:00