142808 Commits

Author SHA1 Message Date
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
2014-07-17 10:19:20 -07:00
Craig Mautner
45374c9afa Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Martin Kosiba
7df3625d5b Allow for appending of resources to an AssetManager.
BUG: 11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
2014-07-17 18:10:02 +01:00
Alexandra Gherghina
999d394ade Ads per-user APIs to manage accounts through the AccountManager
Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
2014-07-17 17:08:49 +00:00
Craig Mautner
efc81e7d5e resolved conflicts for merge of 75f31740 to lmp-dev
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
2014-07-17 10:05:07 -07:00
Amith Yamasani
3f4f2fbcd0 Merge "Keep track of user_setup_complete in DPMS" into lmp-dev 2014-07-17 16:16:48 +00:00
Jae Seo
874f95ca73 Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 2014-07-17 16:16:48 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
2014-07-17 10:55:56 +00:00
Filip Gruszczynski
95198b9166 am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 10:55:43 +00:00
Ji-Hwan Lee
66bdf247df TIF: Add TvInputInfo.getParentId
Bug: 16166859
Change-Id: I07130b6f974ca7b2527aba68b92dc31fb4b5a139
2014-07-17 14:40:31 +09:00
Sandeep Siddhartha
2883ba6975 Plumb the database code to read/update sound models
Change-Id: I135131b042481462f905bdb69ea8544e2561d177
2014-07-16 22:10:45 -07:00
Sandeep Siddhartha
e6cd2476aa Add recognition modes to the enrollment metadata
This will be used by the Voice interaction service to determine what type of recognition may be run
on the DSP. e.g. If the DSP supports voice trigger only for the given keyphrase,
the voice interaction service may want to perform user identification at its end.

Also support keyphrase metadata for all keyphrases and locales.
In case the enrollment app supports open-ended keyphrases, it can leave the keyphrase text
to be empty
similarly, if the enrollment app supports all locales, it can leave the supported locales
attribute to be empty,

Change-Id: I782a17a877fc79ed569fa7c3a81697641182590b
2014-07-16 22:03:03 -07:00
Alan Viverette
5134478151 Add public attributes for TimePicker styling
BUG: 11218747
Change-Id: Ifdf981280ebe20a9066f219c9a4505d0d7486b2e
2014-07-17 04:36:11 +00:00
Amith Yamasani
ed239cb950 Keep track of user_setup_complete in DPMS
This is to ensure that some system app can't modify that
state for purposes of changing the profile owner without
user consent.

Bug: 16207721

Change-Id: Ic5f454d7568cd824b83456eed0e2611779a9adf8
2014-07-16 20:36:41 -07:00
Kenny Guy
f05b231485 Merge "Allow app restrictions for uninstalled packages." into lmp-dev 2014-07-17 00:09:54 +00:00
Kenny Guy
d21b218139 Allow app restrictions for uninstalled packages.
Stop cleaning up app restrictions for packages
that aren't installed.
Remove app restriction file if restrictions is
set to an empty or null bundle.
All user types may now have restrictions if a
profile or device owner is present.

Bug: 15565914
Change-Id: I55f38ca0ad7794b9fc2967113973dc035a416558
2014-07-17 17:00:33 +01:00
Adrian Roos
9d32507a86 Merge "Update QS user switcher colors to spec" into lmp-dev 2014-07-17 00:15:07 +00:00
Adrian Roos
929f4e89e0 Merge "Partially fix the keyguard scrim" into lmp-dev 2014-07-17 00:09:54 +00:00
Filip Gruszczynski
39f0e7da00 Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev 2014-07-16 23:37:00 +00:00
Filip Gruszczynski
dcb70c2e08 Using outset bottom from theme as bottom inset on circular screens.
Change-Id: I46374b345e60a74b6afbbb6a278a0b8e81650681
2014-07-16 17:09:06 -07:00
Dan Sandler
d10b2f17a1 Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev 2014-07-16 23:37:00 +00:00
Dan Sandler
16128f4523 Album artwork returns triumphantly to the lockscreen.
It is pulled from the metadata of the active media
session, which we fetch in one of two ways:

1. From a proper media notification, we can extract the
   session token from EXTRA_MEDIA_SESSION.
2. If none of these is found, we ask MediaSessionManager for
   any outstanding media sessions whose packages match an
   active notification. These include legacy RCC clients,
   whose notifications are oblivious to EXTRA_MEDIA_SESSION.

We then pull the album artwork out of the metadata and fade
it in on the lockscreen.

Bug: 15147533
Bug: 15135254
Change-Id: Ia967bfba310b6c792b14673872cb132ddd7052a5
2014-07-16 23:51:54 -04:00
Dianne Hackborn
faa0192826 Merge "Fix build." into lmp-dev 2014-07-16 23:37:00 +00:00
Dianne Hackborn
a4635d8c7d Fix build.
Change-Id: I3db1e059534581728a52699681b739482aeb913f
2014-07-16 23:23:26 -07:00
Dianne Hackborn
fee756ff91 Implement issue #16330060: Inform ActivityManager about WebView...
...state changes.

Add a new API to tell the activity manager about a new dependency
one process has on another package.  Start using it already for
when apps is Context.createPackageContext() to load code from another
app.

Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.

Some small fixes and additions to VoiceInteractionService.

Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.

Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
2014-07-16 22:50:31 -07:00
Chulwoo Lee
5130655bcb Merge "Pass input ID to the setup/settings activity" into lmp-dev 2014-07-17 04:18:22 +00:00
Chulwoo Lee
3b2f507910 Merge "Introduce "input_id" column to the channels table" into lmp-dev 2014-07-17 04:15:25 +00:00
Adrian Roos
19f653ec19 Update QS user switcher colors to spec
Bug: 15545213
Change-Id: Id0e48e4406c64d2a8a19ed8fdcec398896ca11c0
2014-07-17 01:32:30 +02:00
Jeff Davidson
fad2c9a257 Merge "Restrict SCORE_NETWORKS permission to signature|system." into lmp-dev 2014-07-16 23:30:53 +00:00
Jeff Davidson
4bd7efbe98 Restrict SCORE_NETWORKS permission to signature|system.
As long as the APIs aren't ready to be un-hidden, there's no need to
allow non-system apps to access them. This can be reverted when the
APIs are finalized and we have mechanisms in place for selecting
between scorers installed on the device, rather than only a
preselected scorer bundled with the system.

Change-Id: I745b4c691eccfb526014d4cb71639db2119e4fdb
2014-07-17 09:27:36 -07:00
Torne (Richard Coles)
08cfaf6726 Use the WebView's loader library to load the real library.
Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.

Bug: 13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
2014-07-17 09:18:43 -07:00
Torne (Richard Coles)
b5de924fad Remove WebView library preloading mechanism.
We don't want to preload the WebView library in the zygote process any
more, as loading an updatable WebView in the zygote is a stability risk.
The memory benefits of preloading will be obtained in other ways.

Bug: 13005501
Change-Id: Ic89f2a1d057dc92b01fb775bf326b47ac2d4caa2
2014-07-17 09:18:43 -07:00
Julia Reynolds
38d3c26fd5 Merge "Update message on DISALLOW_REMOVE_USERS constant." into lmp-dev 2014-07-17 07:39:11 +00:00
Julia Reynolds
5b8224901b Update message on DISALLOW_REMOVE_USERS constant.
Change-Id: I4f873eba4082278553ded830bb902fb3a3195d87
2014-07-17 11:50:05 -04:00
John Spurlock
969265af31 Merge "Zen: Maintain selection throughout rocker session." into lmp-dev 2014-07-17 07:39:11 +00:00
John Spurlock
fbb3d6ff39 Zen: Maintain selection throughout rocker session.
While the panel is visible, allow toggling between
none + priority (and even 'all') without resetting
the exit condition.

Bug:16350606
Change-Id: I830be8ccad1ba95a64239f00a72f773c4fe739f2
2014-07-17 12:09:05 -04:00
John Spurlock
f83fc9b48f Merge "Shade: Hide the status icons from the collapsed header." into lmp-dev 2014-07-17 07:12:45 +00:00
John Spurlock
07f6d3b6dd Shade: Hide the status icons from the collapsed header.
Only show wifi / cell / battery / user, the entire statusIcons
layout s/b hidden when reparented to the header.

Bug:16355667
Change-Id: I4c99ffed82af47c4e67e7915a8cb98fc04ad7017
2014-07-17 10:44:34 -04:00
Przemyslaw Szczepaniak
defcd33850 Merge "Add AudioAttributes support in the TTS." into lmp-dev 2014-07-17 00:10:10 +00:00
Przemyslaw Szczepaniak
672695e423 Add AudioAttributes support in the TTS.
Bug: 16259299
Change-Id: I53f4f7a2b9a3b9a422affaf6abe4aca258e67d7f
2014-07-17 13:19:39 +01:00
John Spurlock
4d6d722017 Merge "Zen: Return of the alarm warning." into lmp-dev 2014-07-17 07:39:11 +00:00
John Spurlock
89f060a1e0 Zen: Return of the alarm warning.
- Remove the term timers from subtitle, the term "alarms"
  is now inclusive of timers.
- Resurrect the alarm warning, give it a more prominent
  appearance if we can detect an overlap in a time-based
  exit condition and the next alarm time.

Change-Id: I5d6d67694c7acc9e2a5a7c63e647069744a22cec
2014-07-17 11:41:18 -04:00
Kenny Guy
78fd9d6b36 Merge "Check for exported and category before starting activity." into lmp-dev 2014-07-17 00:09:54 +00:00
Nicolas Prevot
e702404c5a DO NOT MERGE
Remove cross-profile intent filters when removing a user.

When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.

Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
(cherry picked from commit d44e2d7340c70406d8b5eb8b3d6c6c0daaa8705f)
2014-07-17 13:44:56 +00:00
Filip Gruszczynski
31a37dc0a1 am 95198b91: am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
* commit '95198b91665bb93473ea1ec68c69bdbfd0002d49':
  Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 13:37:25 +00:00
Kenny Guy
2df1892f41 Check for exported and category before starting activity.
Make LauncherAppService check that component passed to
startActivityAsUser is exported and has the category
Intent.CATEGORY_LAUNCHER before starting it.

Bug: 15989072
Change-Id: I29d03fae49ff0ca8d7f7524f5e71895d62ff3cae
2014-07-17 12:14:13 +00:00
Chris Craik
c8d5247b39 Merge "Initializing variables - generally a good practice" into lmp-dev 2014-07-16 23:30:53 +00:00
Chris Craik
58ddced277 Initializing variables - generally a good practice
Change-Id: Ib29a69f741eda869701493bb04e155d786e6e402
2014-07-16 19:11:46 -07:00
Robert Shih
c20533c1a7 MediaRecorder: added constants for WEBM output
Change-Id: Iacbb55bda71bb6da98244255bf2a4c34c7342fb0
2014-07-16 16:06:21 -07:00
Justin Koh
77cdac05ba Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev 2014-07-16 22:30:55 +00:00