141188 Commits

Author SHA1 Message Date
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
Narayan Kamath
c61a7575eb am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit 'd62196cfeffe5e4d725b5388fca57a18c154a44b':
  Remove bogus 2 char limit for locales and countries.
2014-07-02 09:51:54 +00:00
Narayan Kamath
9417121243 am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.
2014-07-02 08:49:08 +00:00
Narayan Kamath
d62196cfef am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '3fa99ec77ee52164575375c7709923c94d9693a6':
  Remove bogus 2 char limit for locales and countries.
2014-07-02 08:49:04 +00:00
Narayan Kamath
104da1e495 Merge "Fix broken assumptions in LocalePicker." 2014-07-01 17:57:26 +00:00
Narayan Kamath
3fa99ec77e Merge "Remove bogus 2 char limit for locales and countries." 2014-07-01 17:52:00 +00:00
Baligh Uddin
4a4fa0a30a Import translations. DO NOT MERGE
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
2014-07-01 10:47:53 -07:00
Anish Athalye
9cd3bccdb2 Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
2014-07-01 16:39:39 +00:00
Paul Jensen
d7f67240a0 Merge "Make sure callback handler is in place before callbacks handled." 2014-07-01 16:28:20 +00:00
Paul Jensen
7221cc3bf3 Make sure callback handler is in place before callbacks handled.
When making Network requests in ConnectivityManager, make sure we install the
callback prior to a response from ConnectivityService arriving causing us to
search for the callback and inadvertently not find it.

bug:15928097
Change-Id: Ie5feb9cc8f5effc19870f54dba07218b2e11d82a
2014-07-02 13:50:53 +00:00
George Mount
7b4e0e1412 Merge "Allow activity transitions to target nav and status bar colors." 2014-07-02 05:06:31 +00:00
George Mount
238010f056 Allow activity transitions to target nav and status bar colors.
Bug 15885062

Action bar can already be targeted via android:action_bar.
Navigation bar background is now android:navigation:background.
Status bar background is now android:status:background.

Change-Id: I4604906923f3473af3beec4f865463b2fe4a5316
2014-07-02 06:58:38 -07:00
Adrian Roos
053b553f72 Merge "Fix layoutlib breakage due to I681b711f6f40a94c25b7acd3a44eb3539486afab" 2014-07-01 17:52:42 +00:00
Adrian Roos
9657804afb Fix layoutlib breakage due to I681b711f6f40a94c25b7acd3a44eb3539486afab
Change-Id: I141f49718c4d538875a68c00101c098fdd7e967b
2014-07-02 16:00:30 +02:00
Marco Nelissen
db816cef0d Merge "Make sure we clean up" 2014-07-01 14:59:07 +00:00
Brian Carlstrom
a6e06889fc Merge "Add profiler type options" 2014-07-01 14:58:13 +00:00
Baligh Uddin
9846e4c676 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 14:50:43 +00:00
Baligh Uddin
efee5db3c7 Import translations. DO NOT MERGE
Change-Id: I7ad5171c74ba22fff8602cf99b6a87f93f0f86a0
Auto-generated-cl: translation import
2014-07-01 10:45:41 -07:00
Andrew Lee
b18460ef5b Merge "Use proper name for method for setting paused image." 2014-07-01 14:48:56 +00:00
Andrew Lee
b8f4db89e6 Use proper name for method for setting paused image.
Change-Id: Ifc3ada4d3b88ae325c2e4edc0c0bdd1b9f836995
2014-07-01 17:00:30 -07:00
Ruben Brunk
f4a92fee9a Merge "camera2: Update camera metadata with legacy mode enum." 2014-07-01 23:17:33 +00:00
Robert Ly
a7f3321642 am 024d08ec: am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
* commit '024d08ec126c52fc52fbb7242fc2384c13f3a8f6':
  docs: add more notification images
2014-07-02 00:06:01 +00:00
Ruben Brunk
4a61a86b36 camera2: Update camera metadata with legacy mode enum.
Bug: 15116722

- Adds enum for a device running in compatibility mode.  When running
  in compatibility mode, the Camera2 API is emulated using the
  deprecated Camera API, and many capabilities will not be supported.

Change-Id: I94f31775699447a82d53b7f2a6f9fbdc0a5afb3f
2014-07-01 23:59:23 +00:00
Ruben Brunk
3c8fa3b356 camera2: Fix configured surface check in Legacy shim.
Bug: 15116722

- Switch to checking IBinder pointer when making sure
  requested output surface has been configured (same as
  the camera service).
- Needed to use TextureView in TestingCamera2.

Change-Id: If8831a9b2f9ec3e81cc8348e067a57cca2d46440
2014-07-01 23:55:42 +00:00
Martijn Coenen
d46eba18be Merge "Add new IPC for direct Beam invoke." 2014-07-01 16:34:37 +00:00
Martijn Coenen
dbedb4cc0f Add new IPC for direct Beam invoke.
Used by BeamShareActivity when Beam is invoked
through the share menu. Also made these IPCs
one-way as they can run asynchronously.

Bug: 15939863
Change-Id: I7d048947c96c697e6b04bbda2ec3fbf28cccc29b
2014-07-01 23:01:04 +00:00
Sujith Ramakrishnan
cc32bd83e4 Add support for mouse-based text selection.
Incorporate patch from Logitech (donated under AOSP license) to the
framework to add mouse-based text selection to ArrowKeyMovementMethod.

Bug: 14652753

Change-Id: Iab264bb954b72ccedfada763eba8f13ef37a4578
2014-07-01 15:57:45 -07:00
Brian Carlstrom
7de699fb68 am bd71bf18: am 8922ddba: am a6e06889: Merge "Add profiler type options"
* commit 'bd71bf1814ffa484e56aafc1f7c155148eda773f':
  Add profiler type options
2014-07-01 22:47:41 +00:00
Chris Craik
3e63034869 am 86b55c52: (-s ours) Fix klp-modular-dev-plus-aosp build
* commit '86b55c52c77bc11ebfe2372e6419a63a1a09be87':
  Fix klp-modular-dev-plus-aosp build
2014-07-01 22:47:36 +00:00
Martijn Coenen
c2a32dd7d3 Merge "Fix NPE in TaskRecord." 2014-07-01 16:39:45 +00:00
Martijn Coenen
d4a69704be Fix NPE in TaskRecord.
setIntent() calls toString() when in verbose
mode, which NPEs on an uninitialized mActivities.

Change-Id: Idccfe857bedc6cac18c590b0f2858166c0a665df
2014-07-01 23:06:07 +00:00
Dianne Hackborn
f4061618b1 Merge "Fix issue #16013164: Externally Reported Moderate:" 2014-07-01 19:25:54 +00:00
Dianne Hackborn
133b9df951 Fix issue #16013164: Externally Reported Moderate:
AppOpsService.setMode() allows setting mode for own uid without permission

Change-Id: Ic60a10f0e95f19658c61567826dff28b657efe73
2014-07-01 16:34:48 -07:00
Alan Viverette
349a9bd760 Use shape drawable for button asset, enable shadows
BUG: 15316437
Change-Id: I8c2ddce50fcf8082c8ba01350606d6f344e03306
2014-07-01 23:32:12 +00:00
Svetoslav
564560e46d Installed and enabled print services not working after boot.
Due to system server changes the print manager services did not
receive the expected callbacks in correct order. This lead to
installed and enabled print services not working until toggled
from settings.

bug:16018217

Change-Id: I8d53d8d8f06507ee135cebe5201f00910a4cb364
2014-07-01 16:30:43 -07:00
Brian Attwell
b6efe90b38 Allow ToolbarWidgetWrapper insetStart = 0
Change-Id: I8564cfe07b082e6edb3dc1569b3020f88d286d61
2014-07-01 23:20:30 +00:00
Alan Viverette
d361a4f98b Use touch hotspot in drag-to-open, fix forwarding cancellation
BUG: 14230395
Change-Id: Ibea615bcd6a2e57fca8b49ffea23f0df951d497c
2014-07-01 23:16:49 +00:00