139038 Commits

Author SHA1 Message Date
Robert Greenwalt
54e312a51b am 9c6d406e: Fix build breakage.
* commit '9c6d406eb7ab0fce40fb7cd1257714a29d06774c':
  Fix build breakage.
2014-06-12 19:57:11 +00:00
Robert Greenwalt
1455a0a05a am 67b8af58: Merge "Missed an api update." into lmp-preview-dev
* commit '67b8af5843f835d3d3124025d63c96b184cc87f5':
  Missed an api update.
2014-06-12 19:57:05 +00:00
Robert Greenwalt
1ced737cf4 am c7d65d75: Merge "Fix wifi connectivity issues." into lmp-preview-dev
* commit 'c7d65d759be6cd48a7bbaa4f061b4c4f85424b11':
  Fix wifi connectivity issues.
2014-06-12 19:56:55 +00:00
Robert Greenwalt
86eb5906c0 am e1f5b5e0: Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev
* commit 'e1f5b5e0cd5206e01e1c0e2bd282d421d9951960':
  Minor changes to the LinkAddress API docs.
2014-06-12 19:56:45 +00:00
Robert Greenwalt
962b987085 am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev
* commit '4ad1f0d31e4c998aa65344ccb8abb51cf96dd909':
  Add a new IpPrefix class and use it in RouteInfo.
2014-06-12 19:56:39 +00:00
Scott Main
3a1d38b331 am 91b078c8: am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev
* commit '91b078c8dcce20d5b04f14f730e35cc0b25b4041':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
2014-06-12 19:23:48 +00:00
Scott Main
91b078c8dc am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
2014-06-12 19:04:34 +00:00
Andrew Solovay
ad60891a6e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-06-12 18:50:02 +00:00
Andrew Solovay
56dc9a56f8 am d51a5b38: am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
* commit 'd51a5b389187ad7db3444a74dc75439ff739d7dc':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 18:49:55 +00:00
Robert Greenwalt
7c9f5529ea am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
* commit '558aeb901144fac460575402e38fc8baa2da83eb':
  Make NetworkCapabilities publicly immutable.
2014-06-12 18:49:07 +00:00
RoboErik
b41ed6ca70 am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev
* commit '8c4b4dc87f68d13331d67f4a25480455a7fb2378':
  b/15330955 Make RemoteController use the new session APIs
2014-06-12 18:49:02 +00:00
Adam Powell
90132dd7ca am c72a2a82: Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev
* commit 'c72a2a82160099e8f20c42eb0d36881c31537130':
  Explicitly track consumed state for WindowInsets
2014-06-12 18:37:33 +00:00
Christopher Tate
93e9e7208e am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev
* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
  Relax duplicate-permission-definition constraints slightly
2014-06-12 18:37:28 +00:00
Winson Chung
02a9c359a1 am e202fff5: Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev
* commit 'e202fff5f77568294ba4b50c879ca587535db3be':
  Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
2014-06-12 18:08:09 +00:00
Fabrice Di Meglio
0044b20eb7 am 52771816: Merge "Fix Material Preference Framework layout" into lmp-preview-dev
* commit '527718164cbb28dff6be6073ba78515395bcf9e1':
  Fix Material Preference Framework layout
2014-06-12 18:08:04 +00:00
Raph Levien
12871e99d0 am 0e8a57cc: Merge "Support fake italics" into lmp-preview-dev
* commit '0e8a57cc1ff4d12791231177b679114b05279548':
  Support fake italics
2014-06-12 17:56:00 +00:00
Raph Levien
63fa80eaab am 7a5662e8: (-s ours) Merge "Support for fake bold in Minikin builds" into lmp-preview-dev
* commit '7a5662e807f0e99bd8499a52ffed9d114d299f80':
  Support for fake bold in Minikin builds
2014-06-12 17:55:54 +00:00
Raph Levien
c9f705b8f9 am 7204116b: (-s ours) Merge "Fix getFontMetrics problems" into lmp-preview-dev
* commit '7204116b97bd5e1f79113566577c89c4d0925255':
  Fix getFontMetrics problems
2014-06-12 17:49:23 +00:00
Andrew Solovay
d51a5b3891 am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3 am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
2014-06-12 17:19:33 +00:00
Dirk Dougherty
866ad0c2b2 am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit '460cab199df38b16ea1a4fc9e4f62509049cc859':
  Doc change: Update monetization docs.
2014-06-12 02:44:11 +00:00
Dirk Dougherty
460cab199d am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit 'b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad':
  Doc change: Update monetization docs.
2014-06-12 02:41:07 +00:00
Dirk Dougherty
b024fd2087 am bdcd6fc7: Doc change: Update monetization docs.
* commit 'bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
  Doc change: Update monetization docs.
2014-06-12 02:37:27 +00:00
Robert Greenwalt
130669992c Fix build breakage.
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00
2014-06-11 18:06:55 -07:00
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs.
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
2014-06-11 17:52:07 -07:00
Elliott Hughes
b952587184 am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '8525fe8d0a5a886704307055ef211fc911997783':
  Switch to a type-safe album art interface.
2014-06-12 00:06:20 +00:00
Elliott Hughes
8525fe8d0a am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.
2014-06-12 00:02:42 +00:00
Craig Mautner
f5030ecbca am 4a9f1298: Close ActivityView and ActivityContainer cleanly.
* commit '4a9f129874785d34930f165268dbc618e4bc2618':
  Close ActivityView and ActivityContainer cleanly.
2014-06-12 00:00:17 +00:00
Craig Mautner
4a9f129874 Close ActivityView and ActivityContainer cleanly.
- Do not call IActivityContainer.release() from
ActivityView.finalize() if it has already been called from
ActivityView.release(). Eliminates IBinder finalized Exception.

- Call ActivityRecord.makeFinishing() before calling ActivityStack.
destroyActivityLocked(). Forces call to scheduleDestroyActivity()
and eventually removeFromHistory(). Otherwise removeFromHistory()
is never called and window manager AppWindowTokens become orphans.

- Defer call to ActivityContainer.detachLocked() until all
activities have finished or timed out. Fixes problem where Display
is removed while activities are still launching.

- Call ActivityStackSupervisor.deleteActivityContainer() when all
activities have finished or timed out. Fixes orphaned
ActivityContainers.

Fixes bug 15450798.
Fixes bug 15484154.
Fixes bug 15383479.
Fixes bug 15316558.
Fixes bug 15168560.
Fixes bug 15143914.

Change-Id: Id3c641976b6f825458690f9ee063c07818b56f23
2014-06-11 16:33:00 -07:00
Robert Greenwalt
55213c8022 Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Sreeram Ramachandran
6307b35e1d Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)
2014-06-11 16:32:21 -07:00
RoboErik
c92856c4bb Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Robert Greenwalt
9468ddee2d Merge "Missed an api update." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
10e049b651 Missed an api update.
Fix build.

Change-Id: I2563ec3c26e1c8dbb9abea9f87537a87ce5fda41
2014-06-11 16:57:03 -07:00
Robert Greenwalt
f09d128517 Merge "Fix wifi connectivity issues." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Sreeram Ramachandran
fb7690d4e1 Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
2014-06-11 23:02:59 +00:00
Scott Main
55c11af78a Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 2014-06-11 21:23:31 +00:00
Scott Main
4795031492 reorg the SDK setup docs to streamline setup for all variations.
Move ADT plugin to the ADT help doc and combine the three setup guides
into one page that is dynamic based on a URL parameter.

Change-Id: If8a8855bdb8e8ec9b0eefedd35ae24ea60497741
2014-06-11 20:17:05 -07:00
Robert Greenwalt
6ba62e6416 Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
7569f1811f Make NetworkCapabilities publicly immutable.
Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
2014-06-11 23:29:39 +00:00
Winson Chung
91b7d2b4fb Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Svetoslav
39f0882786 Merge "Fix NPE in PrintActivity." 2014-06-11 21:23:31 +00:00
Svetoslav
e3bbb3d6c0 Fix NPE in PrintActivity.
It is possible that the orientation is chosen before the media size.
The code handling orientation change was wrognly expecting to have
a selected media size all the time resulting in a NPE.

bug:15512333

Change-Id: I9f2786af314641144a24c1d1363c8d2590b0df57
2014-06-12 10:43:23 -07:00
Svetoslav
4604abc97d Moving and resizing windows not reported propely for accessibility.
When the position and size of a window changes we have to report that
to the accessibility layer if the window introspection is enabled.

bug:15569915

Change-Id: I3f869e0a582592bfa5f3743d5c2133ee8cb39b34
2014-06-12 08:26:21 -07:00
Nicolas Prevot
006812acd2 am 485303e2: Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev
* commit '485303e2e45ca91287400b0b26e1e737062c8839':
  Correcting a bug related to Uri permissions.
2014-06-12 15:23:38 +00:00
John Reck
dea0f13683 am 82469fb2: (-s ours) Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev
* commit '82469fb2aa173e307c0c92ccdf9db30316502813':
  DO NOT MERGE Disable AtlasInitializer
2014-06-12 15:23:32 +00:00
Mark Salyzyn
fe2fd536de Merge "hwui: 64-bit compile issue" 2014-06-11 21:23:31 +00:00
Andy McFadden
564dae50b5 Merge "Delete a local ref in getSurface" 2014-06-12 03:30:50 +00:00
Andy McFadden
5ad3ab8a16 Delete a local ref in getSurface
ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.

Bug 14087233

Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
2014-06-11 15:22:32 -07:00