139207 Commits

Author SHA1 Message Date
Craig Mautner
4c07d0246f Merge commit 'f5030ecb' into manualmerge
Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5
2014-06-11 17:12:59 -07:00
Dan Sandler
069438d3fe am 54c4c19b: Merge "NotificationListenerService: API updates" into lmp-preview-dev
* commit '54c4c19bc95e839cfce3d10f0e842ed5588391eb':
  NotificationListenerService: API updates
2014-06-12 00:04:01 +00:00
Dianne Hackborn
439688cf39 am 6d758619: Merge "Implement control of auto power save mode." into lmp-preview-dev
* commit '6d758619d90a0dda7f1136dcd44d0ac02cdada7e':
  Implement control of auto power save mode.
2014-06-12 00:03:55 +00:00
Dianne Hackborn
104e14531c am f894cad0: Merge "Some tweaks to improve document task creation." into lmp-preview-dev
* commit 'f894cad093c1a3083f4aca099babc4677977a12f':
  Some tweaks to improve document task creation.
2014-06-12 00:03:48 +00:00
John Spurlock
615166639b am a6522c40: Merge "SystemUI asset update." into lmp-preview-dev
* commit 'a6522c40e44c9b8c6dc551ab05c7b0ddfbfdac75':
  SystemUI asset update.
2014-06-12 00:03:40 +00:00
justinzhang
34576c6ace am 8b00d123: (-s ours) Hide status bars in lock task
* commit '8b00d123ec3154482644d2ebe913326552b47321':
  Hide status bars in lock task
2014-06-12 00:03:33 +00:00
vandwalle
6a9ef94bf4 Merge "auto-roam initial implementation" 2014-06-11 21:23:31 +00:00
Sol Boucher
8d336682d4 Merge "Add CameraToo, a sample point-and-shoot camera app" 2014-06-11 23:10:23 +00:00
Sol Boucher
b84fdffad4 Add CameraToo, a sample point-and-shoot camera app
It demonstrates basic use of the features of the new Camera2 API.

Change-Id: I593bc682e5c6203754e9a3ee9a78efbd1b208513
2014-06-11 21:47:49 +00:00
Craig Mautner
0aad830d1b am 28084383: am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev
* commit '28084383c13660864f75452f99183c377c2798ec':
  Add NO_ANIMATION flag to ActivityView Intents.
2014-06-11 21:38:49 +00:00
Calin Juravle
9c9777da68 am cdd1fd7a: am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"
* commit 'cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
  Shrink profiler.start-immediately to fit in the maximum property size
2014-06-11 21:38:43 +00:00
Calin Juravle
a48a6fd1f2 am 5fc4e487: am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '5fc4e487420b7730c9eaf2623ff1efd2633daba7':
  Improved profile.start-immediately comment
2014-06-11 21:38:38 +00:00
vandwalle
111fa0274d auto-roam initial implementation
Change-Id: Iad207974b2fea97420cc6131c5fa0a1f17bf2aac
2014-06-11 14:38:06 -07:00
Kenny Root
90c392fd2d resolved conflicts for merge of 579ace03 to master
Change-Id: I461879359824036ec861ad9b5b8804ae814179a9
2014-06-11 14:31:56 -07:00
Robin Lee
122c595cd9 More meaningful errors for DPM calls by non-owners
Now throws an exception titled something like "Admin X does not own the
profile" instead of the rather unhelpful NullPointerException that was
thrown previously.

Change-Id: I33f6da5ea5eb70d8ea3939cfa280c794b01c3382
2014-06-11 18:01:07 +01:00
Roozbeh Pournader
5ea183db0f Merge "Add Roboto Black Italic." 2014-06-10 22:12:51 +00:00
Roozbeh Pournader
e210ded9fc Add Roboto Black Italic.
The fonts was missed during the update to Roboto v2.

Bug: 15475947
Change-Id: I134138bff27bb651c91f966e20d90626172bba58
2014-06-11 15:37:02 -07: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
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
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