104507 Commits

Author SHA1 Message Date
Mike J. Chen
67a1218477 Fix a crash case
There's a runtime check for a bad argument, but it is
after the usage of the bad argument.  Move the usage
after the check.

Bug 8687716

Change-Id: Iddfa457951bac69b436a430cda21b5d7a563107b
Signed-off-by: Mike J. Chen <mjchen@google.com>
2013-04-26 12:39:04 -07:00
Elliott Hughes
032d8e3890 am 0bb497b8: Merge "Use the newer ZoneInfoDB API."
* commit '0bb497b8d1bac2206df89a878ecb7e356d21fe99':
  Use the newer ZoneInfoDB API.
2013-04-26 12:38:04 -07:00
Jeff Brown
eb6403e95d resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp
Change-Id: I42e15a186561222edd0d97047fcd207208a87282
2013-04-26 12:04:07 -07:00
Elliott Hughes
0bb497b8d1 Merge "Use the newer ZoneInfoDB API." 2013-04-26 18:41:47 +00:00
Jeff Brown
bfdd256632 Merge "Generate SDK docs for v7 support library packages." into jb-mr2-dev 2013-04-26 18:31:12 +00:00
Elliott Hughes
48289433d8 Use the newer ZoneInfoDB API.
Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
2013-04-26 11:30:54 -07:00
Wink Saville
962b038d01 am cdeb9cc1: Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev
* commit 'cdeb9cc1decaf23e5ec515b8841d33ecaedb57fd':
  Enhance TelephonyManger javadocs.
2013-04-26 11:23:02 -07:00
Wink Saville
cdeb9cc1de Merge "Enhance TelephonyManger javadocs." into jb-mr2-dev 2013-04-26 18:20:41 +00:00
Baligh Uddin
3433b6ff34 am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '5391a2fcb0d1232723ad37d6872bb5800414052f':
  Import translations. DO NOT MERGE
2013-04-26 10:37:22 -07:00
Baligh Uddin
5391a2fcb0 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-26 17:32:25 +00:00
Victoria Lease
aae1b5163c am b0e0e54d: Merge "Can not mark the same content of browser page after copy"
* commit 'b0e0e54d9dbef720ac653ed87d8ed6b46e1abdbe':
  Can not mark the same content of browser page after copy
2013-04-26 10:27:02 -07:00
Victoria Lease
b0e0e54d9d Merge "Can not mark the same content of browser page after copy" 2013-04-26 17:17:39 +00:00
Irfan Sheriff
bafd663fcd am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev
* commit '4d9431ab35c0a8bff8d1e05aa0148aea5ccdbc2f':
  Fix network reload when config is restored
2013-04-26 09:56:56 -07:00
Irfan Sheriff
4d9431ab35 Merge "Fix network reload when config is restored" into jb-mr2-dev 2013-04-26 16:52:51 +00:00
Svetoslav Ganov
d385999462 am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev
* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
2013-04-26 09:38:18 -07:00
Svetoslav Ganov
951ce6c966 Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev 2013-04-26 16:35:49 +00:00
Baligh Uddin
de40bb4570 Import translations. DO NOT MERGE
Change-Id: I59b1ac894eb47376cc516df18dea34bcc546060d
Auto-generated-cl: translation import
2013-04-26 08:53:21 -07:00
Jeff Brown
caf7b0a155 Generate SDK docs for v7 support library packages.
This change required fixing some bugs in how AAPT handles
qualified symbols such as "android:layout_height"
when generating JavaDoc links.  The links were being
generated using the package name of the generated R file
rather than the package name of the referenced symbol.
These broken links caused the JavaDoc build to fail.

Bug: 8175766
Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6
2013-04-26 00:20:42 -07:00
Irfan Sheriff
cca308e3e8 Fix network reload when config is restored
With scan mode opted in, supplicant connection is not shut
down even when wifi is turned off. This is a problem since
networks need to be reloaded when wifi is turned off and turned on
and this currently happens only on a supplicant connection.

Fix to handle this for scan mode state.

Bug: 8714796
Change-Id: I7d66c39fb51018fb52e783341222cea993993893
2013-04-25 23:27:19 -07:00
Scott Main
01e48e7d15 am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev
* commit '22f6a60e62253436a4f7da1a5d59adc0f17534cc':
  add docs for new attributes, including account restriction for restricted profiles
2013-04-25 21:22:38 -07:00
Chris Craik
57fc8122ea am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev
* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated
2013-04-25 21:22:35 -07:00
Scott Main
22e9225ab1 am 5e5aeb46: Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev
* commit '5e5aeb46849e21b605ef59a691bca478eb4fa380':
  fix javadoc build also add some docs to the service
2013-04-25 21:22:33 -07:00
Amith Yamasani
83a6142173 am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
* commit 'bbd90f8e7051fde96092cacdebc5d94ce46c7140':
  Hide isLinkedUser()
2013-04-25 21:22:31 -07:00
Matthew Xie
7a21c4cdb1 am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev
* commit '7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
  Added flush() for bluetooth output stream
2013-04-25 21:22:29 -07:00
Kristian Monsen
501bf50355 am 58665709: Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev
* commit '5866570947a7ef325f74d9dbfc1ccbdd02d3e7b6':
  Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B
2013-04-25 21:22:26 -07:00
Scott Main
22f6a60e62 Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev 2013-04-26 03:26:12 +00:00
Chris Craik
addc906f70 Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev 2013-04-26 02:15:45 +00:00
Scott Main
b40c1fdaee add docs for new attributes, including account restriction for restricted profiles
Change-Id: I737ea55bfa58562b1b384e52626e95b479759376
2013-04-25 19:05:55 -07:00
Scott Main
5e5aeb4684 Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev 2013-04-26 01:57:00 +00:00
Amith Yamasani
bbd90f8e70 Merge "Hide isLinkedUser()" into jb-mr2-dev 2013-04-26 01:42:20 +00:00
Matthew Xie
7f3c5d164f Merge "Added flush() for bluetooth output stream" into jb-mr2-dev 2013-04-26 01:18:34 +00:00
Alan Viverette
e7a4e636ac Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.
Previously, onHoverEvent() would return true if a view was hoverable
and consume the event. After the change, it would return the result of
dispatchGenericMotionEventInternal(). As a result, touch exploration
caused multiple hover events to be sent from every view under a given
touch point. This change reverts to the original behavior and fixes
touch exploration.

BUG: 8723842
Change-Id: I0c7362f19c51bf21ed842711a03b7f02613958d2
2013-04-25 17:32:45 -07:00
Kristian Monsen
5866570947 Merge "Workaround for bug 8700358: Reproducible WebView crash in Feedly starting in JWR22B" into jb-mr2-dev 2013-04-26 00:06:16 +00:00
Scott Main
04667dae3a fix javadoc build
also add some docs to the service

Change-Id: I712710de403bc000c0a69a2de726bace6e7873bd
2013-04-25 17:01:53 -07:00
Nick Kralevich
071c78e007 am e00a3b80: Merge "Don\'t set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev
* commit 'e00a3b80635c830dc57510556231cc40db6651f5':
  Don't set ADDR_COMPAT_LAYOUT on the emulator
2013-04-25 16:57:59 -07:00
Svetoslav
c6eeacd934 am c38bc5ab: Merge "Lockscreen widgets not always announced." into jb-mr2-dev
* commit 'c38bc5ab6b55804c7a8d440cf2bf249baa2efc98':
  Lockscreen widgets not always announced.
2013-04-25 16:57:56 -07:00
Jeff Sharkey
c054d414ee am 99ba7203: Merge "Avoid leaking Surface native object." into jb-mr2-dev
* commit '99ba72039d9d97ea3ed7d01b327b98c87051e989':
  Avoid leaking Surface native object.
2013-04-25 16:57:54 -07:00
Michael Wright
f652551b3b am b044c40c: Merge "Fixed javadoc in input related classes" into jb-mr2-dev
* commit 'b044c40c154ba8abe62154608812ad87993ca0d8':
  Fixed javadoc in input related classes
2013-04-25 16:57:52 -07:00
Igor Murashkin
10ce90adfa am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev
* commit 'eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED
2013-04-25 16:57:49 -07:00
Daniel Sandler
56f7afb056 am cc165d16: Merge "Fix build." into jb-mr2-dev
* commit 'cc165d165e314ccef5d14891fb7673d3baefd7bb':
  Fix build.
2013-04-25 16:57:47 -07:00
Daniel Sandler
ca12d75577 am 027f84c3: Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev
* commit '027f84c310158edfc94d94ab0ef0480843d49d3b':
  API: getPkg() -> getPackageName()
2013-04-25 16:57:45 -07:00
Daniel Sandler
4064af9b09 am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev
* commit 'a7b6cbf1a3fe91bdbb01edd9a656a62c40c302fd':
  API cleanup: NotificationListener
2013-04-25 16:57:43 -07:00
Chris Craik
eaddac6d26 Force clipping on layers that fail to be allocated
bug:8666842

In SW rendering, a previous optimization avoided clipping to the
bounds of views that are layers. This breaks if the view fails to
create a layer (such as if it's too big), so instead look at whether
the view has a layer.

Change-Id: I653882035512012aefd91f06ff0bdc73aa5e4430
2013-04-25 15:32:40 -07:00
Nick Kralevich
e00a3b8063 Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator" into jb-mr2-dev 2013-04-25 22:08:20 +00:00
Wink Saville
ca3597d436 Enhance TelephonyManger javadocs.
Bug: 856818
Change-Id: Idd30361f57b0f6627132a25e5b9520f30fce548c
2013-04-25 15:02:34 -07:00
Svetoslav
c38bc5ab6b Merge "Lockscreen widgets not always announced." into jb-mr2-dev 2013-04-25 21:49:00 +00:00
Jeff Sharkey
99ba72039d Merge "Avoid leaking Surface native object." into jb-mr2-dev 2013-04-25 21:43:28 +00:00
Michael Wright
b044c40c15 Merge "Fixed javadoc in input related classes" into jb-mr2-dev 2013-04-25 21:43:03 +00:00
repo sync
12566be46c Set persistent property for SELinux enforcement on update.
Bug: 8702843
Change-Id: I41c0084a71160061b297d57d995261e238ea555c
2013-04-25 14:41:33 -07:00
Igor Murashkin
eaebe4c106 Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev 2013-04-25 21:32:26 +00:00