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
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
Baligh Uddin
4a4fa0a30a
Import translations. DO NOT MERGE
...
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
2014-07-01 10:47:53 -07: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
ztenghui
0923be20e1
Test scaleType for both bitmap and vector drawables.
...
Change-Id: I3c75963a624cd87a47a9eff68f9e113b8c147210
2014-07-01 23:14:12 +00:00
Yuhao Zheng
181410047f
Merge "Add two Passpoint fields to WifiConfiguration"
2014-07-01 16:34:37 +00:00
Yuhao Zheng
5f9385f7ea
Add two Passpoint fields to WifiConfiguration
...
We need two new fields in WifiConfiguration for Hotspot 2.0:
requirePMF & updateIdentifier
Change-Id: I288fee7a413286c48eedd034a5aca60a40b831a8
2014-07-01 16:51:16 -07:00
Robert Ly
f077e7b719
Merge "docs: add more notification images" into klp-modular-dev
2014-07-01 14:48:56 +00:00
Robert Ly
528f2aafb3
docs: add more notification images
...
Change-Id: Ia71ef7783c89da319a9179a4f1c4ab197df818c5
2014-07-01 16:52:56 -07:00
Yorke Lee
ca9239bd3a
Merge "Fix build break"
2014-07-01 14:48:56 +00:00
Yorke Lee
5056d5d34d
Fix build break
...
Fix api/current.txt
Change-Id: Ib73558530d984613916ad41b488042af4cd6e08d
2014-07-01 15:43:05 -07:00
Jeff Davidson
b096bdceaf
Add a SCORER_CHANGED broadcast.
...
Sent whenever the active network scorer is changed.
Bug: 16007033
Change-Id: Ib71e89e2cc98fa424db7e489445ec03edefb6880
2014-07-01 15:43:02 -07:00