138975 Commits

Author SHA1 Message Date
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
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +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
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
Leon Scroggins
2e9df83b4a Merge "Changes to framework for ToT Skia." 2014-06-10 21:44:22 +00:00
Robert Phillips
b59508fce5 Changes to framework for ToT Skia.
Consists of 3 cherry-pick from changes by robertphillips@google.com
in master-skia:

-----------------------------------------------------------------------

New AndroidPicture wrapper class

Address code review comments & use new SkPictureRecorder::partialReplay
entry point

Addressing code review issues

Switch MakePartialCopy to makePartialCopy

Conflicts:
	core/jni/android/graphics/Picture.cpp

Ie530ab15b3d549f0ecfb0ecc131f9144a7b72a91

Remove AndroidPicture from GraphicsJNI and split into .h and .cpp

-----------------------------------------------------------------------

Fix lingering legacy picture recording behavior
Address code review issues

Iaf870c2c400dbe70dc32d6d445574904f5ea718f

-----------------------------------------------------------------------

Update Android to new SkCanvas::drawPicture interface

As of Skia 9b14f26d (Alter SkCanvas::drawPicture (devirtualize,
take const SkPicture, take pointer) -
https://codereview.chromium.org/313613004) SkCanvas::drawPicture
has an alternate signature. The old entry point is deprecated.

I63395da61ecc3b58bfd2bc094752081f4b2f7535

-----------------------------------------------------------------------

Change-Id: I041133aeb5639abd853370e512acf93870f82aea
2014-06-11 18:27:48 -04:00
Jorim Jaggi
85a7bb169b am 331b598b: Merge "Fix blank lockscreen." into lmp-preview-dev
* commit '331b598b261c6e531095b37185739b16bfefdd68':
  Fix blank lockscreen.
2014-06-11 22:16:53 +00:00
Chris Wren
85fa7722fe am 9abea7a7: Merge "Only post interrupting notifications to the Heads Up." into lmp-preview-dev
* commit '9abea7a7764e6735c1a37ab5ce45342bbfe56eed':
  Only post interrupting notifications to the Heads Up.
2014-06-11 22:16:47 +00:00
George Mount
93aa858b7f am f3e9a19c: (-s ours) Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev
* commit 'f3e9a19c53522d478257f2d83255c8878707745e':
  DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
2014-06-11 22:16:41 +00:00
Selim Cinek
9f7c624a32 am 634a15af: Merge "Fixed a racecondition which could lead to invisible backgrounds" into lmp-preview-dev
* commit '634a15aff1d106ae549984e26113f734c016760d':
  Fixed a racecondition which could lead to invisible backgrounds
2014-06-11 22:16:35 +00:00
Daniel Sandler
1a762874fa am 26bd8885: Clean up progress bars for media & other notifications.
* commit '26bd8885f044181654bff60acdd1013d254feec7':
  Clean up progress bars for media & other notifications.
2014-06-11 22:16:30 +00:00
Sandeep Siddhartha
dcdb8df2d7 Merge "Add SoundTriggerManager to handle calls to SoundTrigger" 2014-06-10 22:12:51 +00:00
Sandeep Siddhartha
f7a13df899 Add SoundTriggerManager to handle calls to SoundTrigger
- We are abstracting out the nitty-gritty details of the code that talks
  to the SoundTrigger APIs as the
  VoiceInteractionService is mostly interested in the "voice" related
  aspects of the sound trigger APIs

Change-Id: I4a450033040280f2e67d06785d2b05a0e5cdc192
2014-06-11 15:41:23 -07:00
Sandeep Siddhartha
22968950b8 Activity for enrollment
- Make the enrollment attrs public
- Add a dummy activity for enrollment

- Manually tested that the meta-data is correctly read by the
  VoiceInteractionService when the enrollment application is under
  /system/priv-app

Change-Id: I36676ed8ffc919109031c26bac047d0c51a77e13
2014-06-11 15:34:39 -07:00
Sandeep Siddhartha
e912ac012e Add capability APIs to VoiceInteractionService
The only API we currently need is one that tells us whether the system
is capable of running hotword detection for a given keyphrase+locale on
the hardware.

Also adds support in the KeyphraseEnrollmentInfo to provide an intent
for enrollment.

Change-Id: Iec102a4a94e7b161087b8d19785d761346e927c2
2014-06-11 15:34:26 -07:00
Sandeep Siddhartha
e570678759 Initial support for reading the enrollment metadata
- Defines schema for enrollment apps to publish metadata for the search
  keyphrase. This metadata consists of an ID, a user visible keyphrase,
  and the target package to handle the keyphrase, when it triggers.
- Reads the metadata and populates the KeyphraseInfo object for access via
  the VoiceInteractionService
- Adds permission and intent action for the enrollment app.
  The enrollment app needs to be a system app protected with the
  MANAGE_VOICE_KEYPHRASES permission and the activity performing the
  enrollment needs to handle the ACTION_MANAGE_VOICE_KEYPHRASES
- The keyphrase info currently stores an ID - that's for internal
  bookkeeping only, a keyphrase text - that's used by the public APIs,
  and a list of supported locales, which isn't exposed but is used while
  indicating if hardware hotword is available for a particular keyphrase
  in a language or not.

Change-Id: Ibe6c52a5a3eecfd74c4a8382713a35eb88d38df9
2014-06-11 15:33:58 -07:00
Sandeep Siddhartha
297c2daabd Merge "Activity for enrollment" 2014-06-11 21:23:31 +00:00
Sandeep Siddhartha
4af3c7cf02 Merge "Add capability APIs to VoiceInteractionService" 2014-06-10 22:18:15 +00:00
Sandeep Siddhartha
5833bbe2d6 Merge "Initial support for reading the enrollment metadata" 2014-06-10 22:18:15 +00:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Robert Greenwalt
a8580b5fe0 Merge "resolved conflicts for merge of 5192ea2b to master" 2014-06-10 21:49:59 +00:00
Robert Greenwalt
673c910ddd resolved conflicts for merge of 5192ea2b to master
Change-Id: I011b18d19749cdadfa39fa3b5a41ca9d588d0506
2014-06-11 13:29:41 -07:00
Sreeram Ramachandran
cc91c7b804 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
2014-06-10 14:30:15 -07:00
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00
Calin Juravle
16719591f4 Merge "Shrink profiler.start-immediately to fit in the maximum property size" 2014-06-10 21:26:11 +00:00
Calin Juravle
994cd28e72 Shrink profiler.start-immediately to fit in the maximum property size
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
2014-06-11 18:21:41 +01:00
Jose Lima
583b6f782c Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev 2014-06-10 21:25:11 +00:00
John Spurlock
6ab89e28cd Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 2014-06-10 21:22:41 +00:00
Jorim Jaggi
ce3d6c4c02 Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev 2014-06-10 21:21:32 +00:00
Adrian Roos
2643de55d3 Merge "Update security method after switching user" 2014-06-10 21:21:32 +00:00
Jorim Jaggi
a5c1506313 am dc61882e: Merge "Fix black background for auto-redacted legacy notifications" into lmp-preview-dev
* commit 'dc61882ef03a25f7861aff838577ef124a8f40e7':
  Fix black background for auto-redacted legacy notifications
2014-06-11 11:25:07 +00:00
Adrian Roos
1ab15ca80b am c77c504e: Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev
* commit 'c77c504ed7a155a80291f8b54c8e3db6f5303d30':
  Fix broken tablet layout of QS on lockscreen
2014-06-11 11:25:00 +00:00
Doug Zongker
f27c27c20c am 68adbeb1: (-s ours) Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev
* commit '68adbeb1348501dfd7677bf6c04e317127f5f851':
  hide RECOVERY permission from L preview -- DO NOT MERGE
2014-06-11 11:24:54 +00:00
Selim Cinek
1352ef562f am 02f94e07: Merge "Fixed several bugs with redaction." into lmp-preview-dev
* commit '02f94e073838c4b58b01d4dbba7b8f60ce01b49c':
  Fixed several bugs with redaction.
2014-06-11 11:24:49 +00:00
Selim Cinek
9e5ed535a4 am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev
* commit '0f700f8c65979609242d3a18db412a0ce561eccb':
  Fixed an issue where holes in the notification shade could appear.
2014-06-11 11:24:44 +00:00
Nicolas Prevot
0cc9c1e9d3 Merge "Changing the value of the user consent extra in DevicePolicyManager." 2014-06-10 21:31:35 +00:00
Jessica Hummel
fe1de89fe9 am 3d5066de: Merge "Add different resolutions of afw icons" into lmp-preview-dev
* commit '3d5066de154193cc3a08a7be168aa5e31bfe0359':
  Add different resolutions of afw icons
2014-06-11 09:55:17 +00:00
Jessica Hummel
9c9fc7e536 am f65d5b41: Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
* commit 'f65d5b41bb382a93be752076a2c0d8bd8a2cb012':
  Updating the pictures and labels for cross-profile intents.
2014-06-11 09:55:11 +00:00
Selim Cinek
45f904a529 resolved conflicts for merge of b38fd3d4 to master
Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e
2014-06-11 11:45:24 +02:00