138963 Commits

Author SHA1 Message Date
Eino-Ville Talvala
ac4dcf6d90 am bc4b6859: Merge "Camera2: Many docs updates" into lmp-preview-dev
* commit 'bc4b6859cb12564d7dfe37abffd77465b4be75d0':
  Camera2: Many docs updates
2014-06-11 17:03:11 +00:00
Robert Greenwalt
d88fb3e670 am bcf103d0: Merge "Apply API review to android.net.Network:" into lmp-preview-dev
* commit 'bcf103d0ef929669268a76aa72bd90ed9af4d63d':
  Apply API review to android.net.Network:
2014-06-11 17:03:04 +00:00
Matthew Williams
86c9bb94b8 am d6d72e5b: Merge "Fix battery controller non-fire bug" into lmp-preview-dev
* commit 'd6d72e5bc4e5659eb06606abce01da80e6d2f2b6':
  Fix battery controller non-fire bug
2014-06-11 17:02:58 +00:00
Matthew Williams
43c4f41adb am 8e8c1401: Fix build.
* commit '8e8c140114cb3a4f1cf448c4492c13769738ca12':
  Fix build.
2014-06-11 17:02:53 +00:00
Jorim Jaggi
dbff68ae1a am d8c7eb63: (-s ours) Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev
* commit 'd8c7eb63a96e65cb0b0587f614e0353c1801f455':
  DO NOT MERGE: Fix paddings for user switch and status bar icons.
2014-06-11 17:02:46 +00:00
Christopher Tate
0d3c637e8a am 67691d13: Merge "Fix build" into lmp-preview-dev
* commit '67691d130e89135cc8de4cbe03d82058d9ee45b4':
  Fix build
2014-06-11 17:02:35 +00:00
Winson Chung
09cb074e0e am 16696cb1: Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev
* commit '16696cb15954020880c9bed85376c4b0814ff19d':
  Updating Recents to make the cards slightly more visible.
2014-06-11 17:02:29 +00:00
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
2014-06-11 17:02:18 +00:00
Jose Lima
acdee87366 am a49ab110: Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev
* commit 'a49ab11049339155c156e0f58bb076396695be75':
  Make convertToTranslucent a public method in Activity
2014-06-11 17:02:13 +00:00
John Spurlock
d038666f3c am 58b243c3: Merge "Saver: Shared resource update and new settings." into lmp-preview-dev
* commit '58b243c37e74d45129071ac55128c16160e6fac8':
  Saver: Shared resource update and new settings.
2014-06-11 17:02:07 +00:00
Jungshik Jang
6af993b55c Merge "Use model name for local devices' osd name." 2014-06-10 22:31:57 +00:00
Jungshik Jang
42c9800f4f Use model name for local devices' osd name.
Till we find better name use model name as local devices' osd name.
Note that all local devices share display name.

Change-Id: I97e51d76f8cb9511acfe854b7bbe276eec56a661
2014-06-12 13:23:19 +09:00
Sandeep Siddhartha
2adb5bdc93 Fix build break
The previously generated IDs were somehow off by one. I guess after I
did update-api someone else did that, and then I submitted my change

Change-Id: I276a7cdd72f067e46cb7bad625a9f4053c377dc5
2014-06-11 20:23:07 -07:00
Dirk Dougherty
c15f16b95a am 866ad0c2: am 460cab19: am b024fd20: am bdcd6fc7: Doc change: Update monetization docs.
* commit '866ad0c2b22b8553742add8a166c134878eb1ec4':
  Doc change: Update monetization docs.
2014-06-12 02:47:51 +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
Dirk Dougherty
bdcd6fc777 Doc change: Update monetization docs.
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
2014-06-11 17:52:07 -07:00
Jungshik Jang
1ffe68c9e0 Merge "Move message handling logic to local device instead of service." 2014-06-10 22:31:57 +00:00
Jungshik Jang
092b445ef8 Move message handling logic to local device instead of service.
Local device is in charge of handling incoming messages
and for some messages such as <set menum language> or
<report physical address> each device has slightly different
behavior. Instread of checking destination address and
local device status from service, this change leaves it
to each local device.
Note that some messages are still left on service
and will be refactored in the following changes.

Along with this, following changes are included.
1. add missing jin interfaces
  set_option
  set_audio_return_channel
  is_connected
  Note that get_port_info is under review of jinsuk's change
2. if tv device receives <Report Physical Address>,
  starts NewDeviceAction.
3. add constants variables related to new interfaces.
4. add two helper methods for physical address and vendor
  id handling

Change-Id: I9c9d04744bc09fbf38431ecfa6e77097b0618a37
2014-06-12 10:53:36 +09:00
Jinsuk Kim
7207b792d9 Merge "Define SendKeyAction for HdmiControlService" 2014-06-10 22:31:57 +00:00
Jinsuk Kim
cd97baf4d0 Define SendKeyAction for HdmiControlService
SendKeyAction is one of FeatureAction classes that handles HDMI-CEC UCP/UCP
(User Control Pressed/Release) command transmission flow mechanism.

Change-Id: Iede8479103330c1f9db516218c6a94d09ef6b7f4
2014-06-11 14:30:32 +09:00
Jungshik Jang
5945d484ca Merge "Use cached message in NewDeviceAction." 2014-06-10 22:31:57 +00:00
Jungshik Jang
a466929979 Use cached message in NewDeviceAction.
Vendor id and osd name can be cached in be reused
later.
Along with this, fix a bug on HotplugDetectionAction.

Change-Id: I0583a9c266eed4281a99a59b1301f41b3e155505
2014-06-11 13:59:59 +09:00
Jungshik Jang
65c64c31ab Implements Hdmi Cec keycode translater
In order to transfer some keyevent to other device
we need to have a logic to translate Android keycode
to Hdmi CEC keycode and vice versa.
HdmiCecKeyTranslater handles bidirectional keycode translation.
Basically it assumes bijection between android key code to
a pair of cec keycode and its optional param.
KeycodeEntry of HdmiCecKeycodeTranslate handles a mapping of it.

Note that all available mappings have no parameterized mapping.
If new Android keycode is defined for parameterized cec keycode,
entry should be added.

Change-Id: I287082a0a6ef5eb6f0916044b78179fe3fdfbece
2014-06-11 10:14:39 +09:00
Yohei Yukawa
04fcf1cabe Merge "Show IME-related system IME dialogs over windows owned by the IME" 2014-06-10 22:29:12 +00:00
George Mount
426a768974 Merge "Make more descriptive exception for null viewName." 2014-06-10 22:12:51 +00:00
George Mount
d5f9d735b7 Make more descriptive exception for null viewName.
Bug 15114583

Change-Id: I73db179e032947843e3f9a7f1cc5228cbf6fc22b
2014-06-11 13:00:11 -07:00
George Mount
e089d06151 Merge "Allow enter activity transitions to be delayed until data is ready." 2014-06-10 22:06:31 +00:00
George Mount
8c2614ce43 Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:03:43 -07:00
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +00:00
Robert Greenwalt
78802575ac Merge "Add a new IpPrefix class and use it in RouteInfo." 2014-06-10 22:12:51 +00:00
Selim Gurun
1ac3e017d4 Merge "Add WebChromeClient.showFileChooser" 2014-06-10 22:13:32 +00:00
Elliott Hughes
1a3908e959 Merge "Switch to a type-safe album art interface." 2014-06-10 21:55:12 +00:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface.
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
2014-06-11 14:43:57 -07:00
Lorenzo Colitti
7dc78cf3af Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
2014-06-10 14:46:39 -07:00
Leon Scroggins
84ecb7e1aa Merge "remove call to (deprecated) SetDeviceConfig" 2014-06-10 21:44:22 +00:00
Mike Reed
2216f9c2e5 remove call to (deprecated) SetDeviceConfig
this was ignored by all callers, in that they always specify a preferred config (8888).

This removal will allow skia to remove the api and its global.

Change-Id: Ic0a4c673ddd60d0078f75e0e482aba4c9b9cf682
2014-06-11 16:08:31 +00:00
Sreeram Ramachandran
7ac927873c Merge "Fix wifi connectivity issues." 2014-06-10 22:18:15 +00:00
Sreeram Ramachandran
211c06eb81 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 15:56:51 -07:00
Robert Ly
e37da759c5 am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit 'b1cb5aabeb68815715eed423f1f9a7edb9a3e938':
  Add documentation for AndroidKeyStore
2014-06-11 19:33:51 +00:00
Justin Koh
41a2c47e65 am 44195b4f: am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev
* commit '44195b4f90d035533c879672891e7e169972d95d':
  Catch OperationUnsupportedException when linkifying using WebView
2014-06-11 19:33:46 +00:00
Justin Koh
69b8b79a4f am 7b9fa3bd: am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser
* commit '7b9fa3bd11f73bc201a404e8dacf7c02c15290b7':
  Remove WebIconDatabase calls from android.provider.Browser
2014-06-11 19:33:40 +00:00
Ruben Brunk
ef1b1398e9 fixbuild: Remove 'pinned' attr.
Needed by ag/481620

BUG: 15523923
BUG: 15473856

Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
2014-06-11 11:56:58 -07:00
Jay Civelli
9262cbe551 Merge "Temporary removing the Trust Agent permission change." 2014-06-10 21:55:02 +00:00
Leon Scroggins III
17a8bfc38a In Bitmap.reconfigure, update the pixelref's info.
This fixes CTS tests which are crashing on an SkASSERT due to a
mismatch of SkImageInfo between the SkPixelRef and SkBitmap.

Also directly call ref() and unref() instead of SkSafeRef/SkSafeUnref,
since we would already crash if the SkPixelRef in question was NULL.

Also if the user attempts to reconfigure to 4444, use 8888 instead.

Change-Id: I473ef225c6cd1c92d67ae103c53c6cff0dad92de
2014-06-11 18:53:42 -04:00
Jay Civelli
abc40bbeeb Temporary removing the Trust Agent permission change.
Removing the permission check for Trust Agents, until the GMS core prebuilt
has that permission.

BUG: 15546358

Change-Id: Id42d3820d8d772b7788ea1f7431944bf13d4cc92
2014-06-11 09:19:15 -07:00
Zhijun He
5f0d640c02 Merge "CamcorderProfiles: Add 4K video constants" 2014-06-10 21:44:22 +00:00
Zhijun He
e414608cb3 CamcorderProfiles: Add 4K video constants
Bug: 15287656
Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
2014-06-10 22:16:41 +00:00
Leon Scroggins
2e9df83b4a Merge "Changes to framework for ToT Skia." 2014-06-10 21:44:22 +00:00