142796 Commits

Author SHA1 Message Date
Adrian Roos
f7bcc1c25f am 221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev
* commit '221433ab83c1d6719b563f07314c474743ea7416':
  Partially fix the keyguard scrim
2014-07-17 14:19:17 +00:00
Dianne Hackborn
cee665dd89 am cf3580b0: Merge "Fix build." into lmp-dev
* commit 'cf3580b0c64a69173bfe1423a023d1dbd56b0ef5':
  Fix build.
2014-07-17 14:19:09 +00:00
Chulwoo Lee
a5e0562e01 am 62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev
* commit '62572cabc4083b716d15f85a36eaf4225415b9d8':
  Pass input ID to the setup/settings activity
2014-07-17 14:19:04 +00:00
Chulwoo Lee
78b3a83616 am 02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev
* commit '02023167740b862c0df7541a23f825eb5463c3f8':
  Introduce "input_id" column to the channels table
2014-07-17 14:19:01 +00:00
Dianne Hackborn
c9f1d2fc5a am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...
* commit 'dbec91c09bd8c184e897d36b8150307ad4713c6c':
  Implement issue #16330060: Inform ActivityManager about WebView...
2014-07-17 14:18:56 +00:00
Sandeep Siddhartha
559d9a1bf1 am 47ecf354: Plumb the database code to read/update sound models
* commit '47ecf354c7d43bd6f6df5f6a6de78fb9201b3805':
  Plumb the database code to read/update sound models
2014-07-17 14:18:49 +00:00
Sandeep Siddhartha
3ff0850a07 am aecd5383: Add recognition modes to the enrollment metadata
* commit 'aecd5383e3647d9428dc3c83c894830ab2efc421':
  Add recognition modes to the enrollment metadata
2014-07-17 14:18:43 +00:00
Alan Viverette
f7b705afd2 am bbbbb3b2: Add public attributes for TimePicker styling
* commit 'bbbbb3b25050e624c6e4c75a9c76c043695b92d5':
  Add public attributes for TimePicker styling
2014-07-17 14:18:38 +00:00
Dan Sandler
9591597f53 am ce4dc71c: Merge "Album artwork returns triumphantly to the lockscreen." into lmp-dev
* commit 'ce4dc71cfc0ecbfe1bd504b5d906fbd81b2164b1':
  Album artwork returns triumphantly to the lockscreen.
2014-07-17 14:17:16 +00:00
John Spurlock
6530a89c8e am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit 'efe8514f89c8f8ecd256f8fc1ef577cbcec05421':
  Update data limit notification icon + strings.
2014-07-17 14:17:12 +00:00
Sandeep Siddhartha
7c7e18a2bd am 43bc655b: Add code for isKeyphraseActive and some logging to help debug issues
* commit '43bc655b3c5ddd70af813280d9125797d076d00e':
  Add code for isKeyphraseActive and some logging to help debug issues
2014-07-17 14:17:08 +00:00
John Spurlock
42140162ea am 45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '45aebdf2d2b552914abf9656a69bc92bd6540b54':
  Add a zen-specific event sink, include in dumpstate.
2014-07-17 14:17:05 +00:00
Amith Yamasani
5d74829cf9 am b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit 'b31b07c8b10937f3071300068da64158d3686513':
  Allow content provider access across users
2014-07-17 14:17:01 +00:00
Lorenzo Colitti
3acb0871a3 am 1098531c: Disable logging in NetlinkTracker.
* commit '1098531c19d337b4544c51e446e859d86e7fdab9':
  Disable logging in NetlinkTracker.
2014-07-17 14:16:57 +00:00
Chris Craik
0dd0ebad92 am b63869a6: Merge "Add accessibility text contrast setting" into lmp-dev
* commit 'b63869a6fb76ede4492f2184ae005687ac70c916':
  Add accessibility text contrast setting
2014-07-17 14:16:53 +00:00
Santos Cordon
61406a1fce am ec82a805: Add toString & equals helper methods to PhoneAccount.java
* commit 'ec82a805b55ce61e2049d66d74fbab5610577013':
  Add toString & equals helper methods to PhoneAccount.java
2014-07-17 14:16:50 +00:00
Baligh Uddin
5676e0668f am 54639300: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '54639300d0ec7424fe6b18ba82f0293c2543c62f':
  Import translations. DO NOT MERGE
2014-07-17 14:16:47 +00:00
John Spurlock
186f2c40fa am fddad887: Merge "QS: Deal with null uuids in BT controller." into lmp-dev
* commit 'fddad8871e41cedc2b0bb31edd7f3a509ac7c403':
  QS: Deal with null uuids in BT controller.
2014-07-17 14:16:43 +00:00
Baligh Uddin
8b9d339b33 am 9988df29: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9988df2980dbe0529eca8ba4379b061197166a55':
  Import translations. DO NOT MERGE
2014-07-17 14:16:40 +00:00
Baligh Uddin
b15d7f3d97 am da616efd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'da616efd015e372c3e02c1b9368fe66badb0341d':
  Import translations. DO NOT MERGE
2014-07-17 14:16:36 +00:00
Jungshik Jang
ae97df329c am 6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit '6d98d91f01dc77af031bf9d8537d101110ba43e5':
  Hook up system audio mode
2014-07-17 14:16:33 +00:00
Dianne Hackborn
31cfdadb56 am 8b353ef1: Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev
* commit '8b353ef1ac284d2ad306de7d6609ebc1b1053ede':
  Maybe fix issue #16167054: Wakelock is acquired and released in...
2014-07-17 14:16:30 +00:00
Vinit Deshpande
b3e7af7364 am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit '0b4d73dd5885a2ef86e14f77ff1963c42d6c59b9':
  Introduce RTT Manager
2014-07-17 14:16:26 +00:00
Chelsea Derrick
9a51a3bee8 am 52c8bd50: Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev
* commit '52c8bd50f87388f6c32b3664d46723490e7e3502':
  Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
2014-07-17 14:16:23 +00:00
Baligh Uddin
c2dd4d2713 am 6b7e527a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '6b7e527ae3433a7be5234578d923a6ed149e3e48':
  Import translations. DO NOT MERGE
2014-07-17 14:16:19 +00:00
Baligh Uddin
c72e186971 am ca0db50a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ca0db50aaa768353686fdcf76de6dfb701bf67e0':
  Import translations. DO NOT MERGE
2014-07-17 14:16:16 +00:00
Baligh Uddin
40d7d207b2 am 2b8858a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '2b8858a901e45119c78e239c2c34b3e2486ee692':
  Import translations. DO NOT MERGE
2014-07-17 14:16:13 +00: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
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
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
Sandeep Siddhartha
a433af6b73 Add code for isKeyphraseActive and some logging to help debug issues
Change-Id: I89f2090be5a5fe5f7c0da1648a0d46a093893fe2
2014-07-16 19:52:32 -07:00
Lorenzo Colitti
20ceb90373 Disable logging in NetlinkTracker.
This logging can get quite spammy in GoogleGuest, and there's
currently no reason to think it's necessary. Much of the same
information is available via "adb shell ndc monitor".

Bug: 16328180
Change-Id: I15a8348e261d6b69a4ef8bdaf8a2a431b1c2bc0d
2014-07-17 01:43:39 +00:00
Santos Cordon
98b270309a Add toString & equals helper methods to PhoneAccount.java
Bug: 16292368
Change-Id: I5dd2bcd2d65e856107ac2f80958e8b408abcec0b
2014-07-17 01:21:23 +00:00
Adrian Roos
929f4e89e0 Merge "Partially fix the keyguard scrim" into lmp-dev 2014-07-17 00:09:54 +00:00
Amith Yamasani
9034620dd5 Merge "Allow content provider access across users" into lmp-dev 2014-07-16 23:42:05 +00:00
Amith Yamasani
ebf1fd99d6 Allow content provider access across users
If the package has INTERACT_ACROSS_USERS. This had recently
regressed. Bringing back the functionality needed for multiuser
call log syncing.

Bug: 16298776
Change-Id: I4fdc3d676bb8a2bf78f5c27c41a74c0491e343cd
2014-07-16 17:47:40 -07:00
Baligh Uddin
28618a384c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-16 23:42:05 +00:00
Baligh Uddin
fa8d78019c Import translations. DO NOT MERGE
Change-Id: I499617c1385457c1f844f73b042ef5c360ad14cc
Auto-generated-cl: translation import
2014-07-16 18:13:44 -07:00
Dianne Hackborn
8c141f7948 Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev 2014-07-16 23:42:05 +00:00
Dianne Hackborn
0d192a9e27 Maybe fix issue #16167054: Wakelock is acquired and released in...
...battery history even though CPU is in suspend

There is a race in the power manager between noting a wake lock
acquire and ensuring the device is staying awake.

Change-Id: I3d76f99d73dca119b09f253f0e31448408c88a3c
2014-07-16 17:51:06 -07:00
Jungshik Jang
12307ca810 Revisit HDMI-CEC system audio mode in AudioService.
From recent feedback on HDMI-CEC system audio mode,
it would be unnecessary to enforce output from AudioService.
Instead, it would follow audio policy according to status
of HDMI-CEC system audio mode.
For that removed two params of setHdmiSystemAudioModeSupported
api of AudioManager.

In terms of speaker mute, it will be handled by removing speaker
from audio ouput instead of changing gain control. For that
added new force usage type, FOR_HDMI_SYSTEM_AUDIO_MODE and
new force config type, FORCE_HDMI_SYSTEM_AUDIO_ENFORCED.
This is used to notify change of system audio mode to
audio policy manager.

Bug: 16305986
Bug: 16002150

Change-Id: I5643ad093a651c951e12b567c6e11b88aa87cea2
2014-07-17 09:27:25 +09:00
Chelsea Derrick
4ad11abac3 Merge "Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]" into lmp-dev 2014-07-16 23:42:05 +00:00
Wenchao Tong
758bdf4a91 Add a new SystemApi, getPrivilegedConfiguredNetworks(). Part 1 [DO NOT MERGE]
This is very similar to the existing
WifiManger.getConfiguredNetworks(), but it returns real preSharedKey.
This API is only used by system application.

Bug: 15703353
Change-Id: If3eaca3286e77b780272f42a28772d1d8d39db65
(cherry picked from commit 775bf6ae5d052948bcb60eaf89defa9105d7077c)
2014-07-16 17:43:43 -07: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
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