141216 Commits

Author SHA1 Message Date
dcashman
ca76cccb61 Merge "Initial work for key rotation." 2014-07-02 18:22:50 +00:00
dcashman
55b1078e2a Initial work for key rotation.
Introduces the upgrade-keyset tag to AndroidManifest.xml. This specifies a
KeySet by which an apk must be signed in order to update the app. Multiple
upgrade KeySets may be specified, in which case one of them must be used to
sign the updating apk.  If no upgrade-keyset is specified, the current logic
involving signatures is used.

Current Key Rotation Design Decisions:
-Apps using a shared user id may not rotate keys.
-All acceptable upgrade keysets must be specified, including the key signing
the app.  This enables key rotation in one update, but also 'locks' an app if
an incorrect upgrade keyset is specified.
-Minimal changes to existing KeySet code.

Bug: 6967056
Change-Id: Ib9bb693d4e9ea1aec375291ecdc182554890d29c
2014-07-02 12:51:28 -07:00
Ihab Awad
ad4cc9ba38 Merge "Rename Telecomm "Subscription" to "Account" (1/7)" 2014-07-02 18:22:50 +00:00
Ihab Awad
9c3f18846a Rename Telecomm "Subscription" to "Account" (1/7)
Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40

Conflicts:
	telecomm/java/android/telecomm/InCallCall.java
2014-07-02 12:27:13 -07:00
Alexandra Gherghina
1e1f2e8926 Merge "Adds per-user APIs required by the Settings app" 2014-07-02 16:34:47 +00:00
Alexandra Gherghina
cb22807ffc Adds per-user APIs required by the Settings app
Bug: 15466880
Change-Id: Ic99fbf074564901b04d32b08f3a7a38555f330b3
2014-07-02 13:34:14 +01:00
Eric Laurent
be55c0d23b Merge "audio: fixed channel count determination from channel mask" 2014-07-01 23:17:33 +00:00
Eric Laurent
dbf55665c5 audio: fixed channel count determination from channel mask
Do not use popcount() to derive channel count from channel mask.

Bug: 15000850.
Change-Id: Id52fc517bedaf1c42b9cd59857e3d19c251b97bf
2014-07-01 20:15:44 -07:00
Santos Cordon
69ea13ea71 Merge "Add PhoneManager to expose functionality to phone/dialer apps." 2014-07-01 19:22:38 +00:00
Santos Cordon
f90186d93e Add PhoneManager to expose functionality to phone/dialer apps.
Eventually, this will house the TelecommManager methods.

Change-Id: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5
2014-07-02 18:01:56 +00:00
Julia Reynolds
f5116d01b2 Apply DISALLOW_CONFIG_VPN restriction to VPN.
Bug: 16008760
Change-Id: I299d5f32d9b09c3abcc32f3e889a0187880621df
2014-07-02 17:51:46 +00:00
Narayan Kamath
f29131f701 Merge "Fix native crashes when APKs can't be opened." 2014-07-01 19:11:01 +00:00
Narayan Kamath
cef0b39b92 Fix native crashes when APKs can't be opened.
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.

Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.

bug: 15563874
(cherry picked from commit ec4516470d7ce6e47769591d678c838bd3f6f388)

Change-Id: Ia35b464355467d0d36faf34fae85acbbab3f2896
2014-07-02 12:43:52 +01:00
Jinsuk Kim
160a6e5b99 Add setOption for HdmiControlService
Bug: 15845304
Change-Id: I96b285ae3938aeecdd44b2c08a178def33bd2bf2
2014-07-02 17:16:45 +09:00
Yohei Yukawa
8b4c1e953f Merge "Require coordinate transformation matrix if necessary" 2014-07-01 21:47:40 +00:00
Yohei Yukawa
b5268dcc17 Require coordinate transformation matrix if necessary
With this CL, CursorAnchorInfo.Builder#build() raises
IllegalArgumentException when an application author attempts to
instantiate CursorAnchorInfo without the coordinate
transformation matrix but with specifying some positional
parameters such as composing character rectangle.

Since any other positional members in CursorAnchorInfo are
supposed to be specified in local coordinates, the application
author must provide the coordinate transformation matrix for
such positional data.

Change-Id: I2b0fd0f146a2b95fe4fa1324837d8cfee667208c
2014-07-02 16:03:16 +09:00
Winson Chung
c6011deffc Fixing some bugs in Recents keyboard behaviour.
- Ensuring that we don't allow meta-tab to trigger Recents (since meta is a system key now)
- Adding dpad keys support to traverse stack
- Adding workaround for cases where tasks wouldn't be focused depending on how you launch Recents

Change-Id: I4101ced7e47e0d1659d5fa236214be5697c00560
2014-07-02 03:24:53 +00:00
Jungshik Jang
ca5be9a8fb Remove SystemAudioAutoInitiationAction when SystemAudioActionFromAvr started.
Bug: 15845309
Change-Id: I1eefeca3aab117f2def08fe9fbbea81987ef11a8
2014-07-02 11:51:21 +09:00
Roozbeh Pournader
44cecbc208 Update to extended Roboto fonts.
The new fonts have complete coverage of Latin, Greek, and Cyrillic
characters in Unicode 7.0, including combining marks and related
punctuations.  Various phonetic transcriptions and romanization systems are
now supported, as well as several minority and historical langauges.

A visible .notdef glyph has also been added.

Bug: 2802862
Bug: 4673396
Bug: 6629748
Bug: 7503539
Bug: 10728157
Bug: 11199883
Bug: 14408876
Bug: 15734816
Change-Id: I7a4986bfbd710ec5cc80792a3f7598dae110e5f9
2014-07-01 19:38:32 -07:00
Eric Laurent
7edabadf78 Merge "AudioManager: add isVolumeFixed() API" 2014-07-01 23:33:37 +00:00
Eric Laurent
ba207e76b2 AudioManager: add isVolumeFixed() API
Indicates if the device implements fixed volume policy.
In this case, volume control APIs are not operational.

Bug: 11430859.

Change-Id: Ia82bdfe5b38d6b2ce132f00a493e6a04cb794ea0
2014-07-01 19:03:04 -07:00
Dianne Hackborn
497175beff Rework network stats to use proc state for fg/bg.
Switch to using the process state to determine whether a
process should be foreground or background, instead of the
boolean foreground given by the activity manager.

This is for battery save mode, where we can now allow more apps
to havenetwork access: everything whose process state is at
least IMPORTANT_FOREGROUND, which allows music playback
and other use-visible things to continue to have network
access.

Note this also impact the traditional background data disabled
state, where now we allow anything top or better to have
network access.  This automatically includes all persistent
processes, the current top activity, and any other processes
hosting the top activity or being used by the top activity.
So it broadens the set of apps that get network access, but I
think this increases it to a reasonable set of things that may
actually be needed for the foreground app to work correctly.

Change-Id: Icb609a2cea280dc3fa3e83417f478ed77f3685aa
2014-07-01 18:34:58 -07:00
Adam Powell
2141cb5397 Merge "Fix checking for compatibility between window title features." 2014-07-01 23:17:33 +00:00
Adam Powell
166c8e3e26 Fix checking for compatibility between window title features.
New features that have nothing to do with titles were tripping the,
"is this compatible with custom titles" feature check in
PhoneWindow. Define a better way of checking for this for when we
add new window features in the future.

Bug 13789588

Change-Id: Ie1cacffb113958dac5142a5a39f548df53b47299
2014-07-02 01:09:45 +00:00
Adam Powell
b3e411458c Fix a copy/paste bug in Toolbar.
Bug 15868762

Change-Id: Ie2a0c492f9d7baa05d520cd2fee652245ab4b61b
2014-07-01 17:42:34 -07:00
Sailesh Nepal
ade3f25a48 Make RemoteConnection.getState public
Change-Id: Iead485345d01d47e346da014fdb9979def25c372
2014-07-02 00:33:45 +00:00
Robert Ly
098e5d3f79 am 2e3b9d30: am 9b3bfb10: docs: updated expandedtext_combo
* commit '2e3b9d30d4e16ecc0b3e4a04252b23afe55dda8c':
  docs: updated expandedtext_combo
2014-07-02 00:27:34 +00:00
Robert Ly
2e3b9d30d4 am 9b3bfb10: docs: updated expandedtext_combo
* commit '9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
  docs: updated expandedtext_combo
2014-07-02 00:22:10 +00:00
Robert Ly
9b3bfb1085 docs: updated expandedtext_combo
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
2014-07-01 17:03:40 -07:00
Robert Ly
024d08ec12 am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
* commit 'f077e7b719419271b5fd666c22b7d19177d6c325':
  docs: add more notification images
2014-07-02 00:00:59 +00:00
Brian Carlstrom
bd71bf1814 am 8922ddba: am a6e06889: Merge "Add profiler type options"
* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options
2014-07-01 22:37:18 +00:00
Brian Carlstrom
8922ddbab1 am a6e06889: Merge "Add profiler type options"
* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options
2014-07-01 22:32:01 +00:00
Chris Craik
86b55c52c7 Fix klp-modular-dev-plus-aosp build
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
2014-07-01 15:24:37 -07:00
Nick Kralevich
db32fb646d am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
  Allow different SELinux policies for third party apps.
2014-07-01 21:16:14 +00:00
Nick Kralevich
d172419e9a am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
  Allow different SELinux policies for third party apps.
2014-07-01 21:13:12 +00:00
Nick Kralevich
9b1a7d4570 Merge "Allow different SELinux policies for third party apps." 2014-07-01 19:16:01 +00:00
Robert Craig
83b54ecab7 Allow different SELinux policies for third party apps.
Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.

This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.

Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-07-01 13:53:11 -07:00
Anish Athalye
677490eac4 Merge "Fix line breaking for clusters in narrow views" 2014-07-01 19:15:58 +00:00
Marco Nelissen
1ed64c65a7 am 899c15ef: am db816cef: Merge "Make sure we clean up"
* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up
2014-07-01 18:21:41 +00:00
Marco Nelissen
899c15ef20 am db816cef: Merge "Make sure we clean up"
* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up
2014-07-01 18:15:28 +00:00
Baligh Uddin
b77da19e59 am b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b9246ef52c7f8ea7c4888c0f45005a49792a8614':
  Import translations. DO NOT MERGE
2014-07-01 18:14:47 +00:00
Baligh Uddin
5b3e66d0f6 am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '9846e4c676e9b1b656081bab3f9cb304f8cc3cdf':
  Import translations. DO NOT MERGE
2014-07-01 18:14:40 +00:00
Baligh Uddin
3bb733baa2 am 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE
* commit '4a4fa0a30a4d53816fcb56545054d624f3243cb6':
  Import translations. DO NOT MERGE
2014-07-01 18:14:36 +00:00
Nicolas Prevot
71420b8954 Merge "Returning badged icons for components of corporate apps." 2014-07-01 17:52:42 +00:00
Nicolas Prevot
7f7b0c759e Returning badged icons for components of corporate apps.
So, corporate apps in disambiguation dialogs are badged.
And updating the way we show the icon of the personal space to this new design.

BUG: 14377051

Change-Id: Idc707773a64a8feb2d9d4df88c425d5100542636
2014-07-02 12:09:51 +01:00
Przemyslaw Szczepaniak
c25427a6df Merge "Add support for audio session id in the TTS" 2014-07-01 17:52:42 +00:00
Przemyslaw Szczepaniak
5cbf17ca05 Add support for audio session id in the TTS
+ #playEarcon & #queueAudio respects request Volume/Pan settings.

Bug:15432115
Change-Id: I136afef77afbc56c34810c64123f7be4b431d378
2014-07-02 11:28:24 +01:00
Narayan Kamath
4fe15b23dc am 4161316f: am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '4161316f256c9cc047405a902bcfc17b3738b659':
  Fix broken assumptions in LocalePicker.
2014-07-02 10:11:12 +00:00
Narayan Kamath
46b6a1b4d0 am c61a7575: am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit 'c61a7575eb0e3d1788ce1946da81d6c5e6812b9c':
  Remove bogus 2 char limit for locales and countries.
2014-07-02 10:11:00 +00:00
Narayan Kamath
4161316f25 am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '94171212431a45346e40fd97bbe72422e71f04be':
  Fix broken assumptions in LocalePicker.
2014-07-02 09:54:22 +00:00