1839 Commits

Author SHA1 Message Date
George Mount
70778d7d53 Stop temporary window from showing with activity transitions.
Bug 15424905

When creating a new process, a temporary window would show,
even when within the same task. This CL prevents the temporary
window from showing when using
ActivityOptions.makeSceneTransitionAnimation(...)

Change-Id: I93c40ba0b41ed90ebe6e9802d1236f8c81d60abe
2014-07-01 16:33:45 -07:00
Nick Kralevich
3edb62a5ad am db32fb64: am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit 'db32fb646d90abb5e2281bd145d9d9615c65cbed':
  Allow different SELinux policies for third party apps.
2014-07-01 21:21:55 +00: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
Dianne Hackborn
a165e14d2f Merge "Issue #15986092: Add power tracking of flashlight." 2014-07-01 14:40:15 +00:00
Dianne Hackborn
abc7c49913 Issue #15986092: Add power tracking of flashlight.
Not yet hooked up.

Change-Id: Id95e44ecc365e9f38169c0a629b0a48ddb29aa06
2014-07-01 10:02:45 -07:00
Dianne Hackborn
be7c50e0a1 Add network access blocking when in battery save mode.
The network policy manager now monitors battery save mode and,
when in battery save, uses its facility to block access to metered
networks to block access to all networks.  That is, it tells the
network management service that all networks have an (infinite)
quota, and puts various app uids to be restricted under quota
interfaces as appropriate.

This new network blocking needs a new facility to be able to white
list apps, such as GmsCore.  To do this, I refactored the package
manager's permission configuration stuff into a separate SystemConfig
class that can be used by others, and it now has a new tag to
specify package names that should be white-listed for power save
mode.  These are retrieved by the network policy manager and used
to build a whitelist of uids.

The new general config files can now go in system/etc/config,
though currently everything still remains in the permissions dir.

Still left to be done is changing the semantics of what uids are
allowed in this mode, to include all perceptable uids.  (So that we
can still do things like background music playback.)  This will be
done in a follow-on CL.

Change-Id: I9bb7029f61dae62e6236da5ca60765439f8d76d2
2014-07-01 09:22:57 -07:00
Jungshik Jang
a13da0d591 Add api, setArcMode, used to turn on/off ARC.
Usual TV can switch on and off of ARC feature in its settings page.
Along with it, removed locking block from the code,
because arc flags are accessed by actions and internal services.

Change-Id: I737ac0c2671b537551eaac202d2065cc99c6d0a0
2014-07-01 17:25:06 +09:00
Amith Yamasani
f2d4fa8c78 Merge "Store and retrieve default Guest settings" 2014-06-26 23:14:58 +00:00
Amith Yamasani
e4afaa3a3d Store and retrieve default Guest settings
Save the default guest restrictions for use when a guest is created.

Bug: 15761405
Change-Id: I28db7d823944b0b47527a4909c10cc856c842a62
2014-07-01 10:29:46 +05:30
Jeff Brown
8fef877310 Merge "Make MediaSessionToken an inner class of MediaSession." 2014-06-30 22:24:07 +00:00
Ram
3e0e3bc617 MS: Adding Support for Emergency APN in Telephony Framework
(base/telephony)

Replacement for https://partner-android-review.googlesource.com/#/c/171175/

Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb
Conflicts:
	core/java/android/net/ConnectivityManager.java
2014-07-01 02:00:51 +00:00
Jeff Brown
dba34ba35c Make MediaSessionToken an inner class of MediaSession.
Also add some missing AIDLs to the framework makefile to ensure
they are included in the SDK.

Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
2014-06-30 16:05:25 -07:00
Jinsuk Kim
92b77cf9cb Refactor handling sequences in HdmiControlService
- Rewrote some methods to match more closely to the handling
  sequences in guideline
- Added setControlEnabled() API in the aidl
- Handled <Routing Control> command
- Handled some scenarios invoking RoutingControlAction

Change-Id: I5db0c6fc775cef709c2e0f338b85937deebf2a54
2014-07-01 07:28:41 +09:00
Jaewan Kim
9ca56821ea Merge "Implement dump for TvInputManagerService" 2014-06-26 23:14:58 +00:00
Jaewan Kim
e14c3f4fc4 Implement dump for TvInputManagerService
Bug: 15483593
Change-Id: I821522513fb761418a372c1192f92ccf3acab486
2014-07-01 11:02:30 +09:00
Winson Chung
2f55f32f7b Merge "Using base intent to check the calling app instead of uid. (Bug 15940115)" 2014-06-26 23:50:27 +00:00
Winson Chung
312bc5430a Using base intent to check the calling app instead of uid. (Bug 15940115)
Change-Id: I571f1d3f90707046cca0eaaae3e8e958444cc971
2014-06-30 16:24:10 -07:00
Nicolas Prevot
80f74b5449 Splitting the different authorities of a content provider
So that sharing from contacts works across user.
When getting a contentProvider, checking that read/write permissions are not null,

Change-Id: Ib4f0419aebd9ec4e742ef08c9ed9348fde62cc11
2014-06-30 17:44:10 +01:00
Julia Reynolds
37271629b5 Merge "If DISALLOW_REMOVE_USER is enabled, UserManager.removeUser should not remove users." 2014-06-26 18:35:29 +00:00
Jungshik Jang
5e3916a6f1 Start ARC initiation action when if avr is connected to ARC enabled port.
Change-Id: Ia9efbd1e86a1ed560500034925ccc31c61372fee
2014-06-30 14:59:21 +09:00
Jungshik Jang
852ce1a782 Merge "Call wrapUpAndFinish even if no devices are detected." 2014-06-26 23:14:30 +00:00
Jungshik Jang
ad2eefe979 Call wrapUpAndFinish even if no devices are detected.
HotplugDetectionAction can be started only when wrapUpAndFinish
is called in DeviceDiscoveryAction. But current implementation
does nothing if no devices are detected.

Change-Id: I985382a9f9d668196a47dafe74743ffc6b1c95b3
2014-06-30 10:25:20 +09:00
Jungshik Jang
8fa36b110b Implement volume control action in cec service.
Hdmi CEC's volume control is based on key event handling
but in android we can only get delta of volume change.
VolumeControlAction simulates key event action from
delta of volume change. However, it's highly dependent
on <Report Audio Status> message coming from AVR.
This implementation waits 900ms for <Report Audio Status>
message and if no message arrives it finishes action.
Instead, HdmiCecLocalDeviceTv consumes it after action
termination so that Tv can reflect system audio's
volume all the time.

Change-Id: I0442d31721365acdc009c8fa1c1e0a4361e4a1cc
2014-06-27 09:59:39 +09:00
Craig Mautner
97f82fda0b Merge "Add logging to TaskPersister restore." 2014-06-27 15:56:14 +00:00
John Spurlock
eb8d1be6ac Add a BIND_DREAM_SERVICE signature-level permission.
Starting in api 21, will be required to bind to a
declared dream or doze service.

Also added to aapt dump badging output.

Bug:15862654
Change-Id: Ifa0a594eeecf21e6146176c7810a847e1d08fe3b
2014-06-27 18:33:42 -04:00
Craig Mautner
77b04267c6 Add logging to TaskPersister restore.
Solve tasks not being restored.

Fixes bug 15935752.

Change-Id: Ia3dd50072ac8255bcc37812a0639545b60f5d06f
2014-06-27 15:28:01 -07:00
John Spurlock
25e2d24f24 Add optional package filtering to notification dumpsys.
$ adb shell dumpsys notification p <fragment>

Change-Id: Iddcc45066187e0e9d5812275de132dd6bba2a135
2014-06-27 15:36:30 -04:00
Christopher Tate
bc5ddd69dd Change permission guard on bindBackupAgent()
Bug 15829193

Change-Id: Ief86fdfb0ef73e2a5a5d34af950726c4d5c0a167
2014-06-27 19:05:51 +00:00
RoboErik
f77b99f08a clear calling identity when changing volume
bug: 15925039

Change-Id: I8596266109fd65d7c2de5718ccdda937694befba
2014-06-27 18:47:18 +00:00
Jason Monk
3ada97b002 Merge "Fix crash in starting lock task" 2014-06-26 18:34:16 +00:00
Jason Monk
a4e946bb6f Fix crash in starting lock task
Sometimes when coming from a dialog the current activity has changed,
which causes AM to crash and take down the framework.  Instead don't
check the current activity as the user has confirmed the operation
so it is not coming from the background.

Change-Id: I0daeabcfcf814c52bcc7907a624fe6e9453c427f
2014-06-27 10:11:56 -04:00
Julia Reynolds
75175025f8 If DISALLOW_ADD_USER is enabled, do not allow users to be created.
Bug: 15910634
Change-Id: I7e14bf7d71001f218402a5d90e2aadc54fcfd875
2014-06-27 09:13:23 -04:00
Narayan Kamath
152d5cd30b am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."
* commit '22a32d883794a7a96ff5ffb4830ea59065b3ebda':
  Explicitly list out the list of cache subdirs to prune.
2014-06-24 12:19:10 +00:00
Jinsuk Kim
a09489c39e Merge "Handle incoming active source-related commands for HdmiControlService" 2014-06-24 01:52:26 +00:00
Jinsuk Kim
8333571bd5 Handle incoming active source-related commands for HdmiControlService
Handles incoming commands <Active Source>, <Inactive Source>, <Request
Active Source> that concern the active source update/report.

Defined mPrevPortId which is used to allow switching back to the input
set previously by <Active Source> or deviceSelect() when receiving
<Inactive Source>.

Also fixed a bug sending <Active Source> with wrong parameters.

Change-Id: I47fd804755c5c6beca38ddb21bb388a455d74f63
2014-06-27 07:06:33 +09:00
Winson Chung
2cb86c7231 Saving last TaskDescription for TaskRecord.
Change-Id: I531e0fc661fdedeb78bee7d5472668de8e9c2104
2014-06-26 12:37:28 -07:00
RoboErik
e9466805e5 b/15892295 If playback is active don't play a beep
The old code removed the flag for playing a beep when changing volume
with active playback. This will do the same thing.

Change-Id: I708db66a1575d314b941166d4a6ca05d0a796dae
2014-06-26 18:47:16 +00:00
Paul Jensen
7ecb42fb65 Enforce ConnectivityManager.releaseNetworkRequest callers own the NetworkRequest
Enforce that callers of ConnectivityManager.releaseNetworkRequest() are the
creators of the NetworkRequest being released by matching UIDs.

Change-Id: I439468c054bacc035e2db2c4967b24d183e78e9c
2014-06-26 18:07:12 +00:00
Jeff Davidson
a3b9ca5ade Merge "Use/expose the receiver's label as the scorer name." 2014-06-26 08:19:24 +00:00
Jeff Davidson
c741553644 Use/expose the receiver's label as the scorer name.
Allows scorer apps to set a custom name for the scoring functionality,
even if the app has other non-scoring responsibilities, in which case
the application's label would be too generic.

Bug: 15775300
Change-Id: I61a7d1966742d463508e6801b7845ced8392db84
2014-06-24 09:24:19 -07:00
Lorenzo Colitti
c0b9efa49e Merge "Teach LinkProperties whether it's provisioned or not." 2014-06-24 01:52:26 +00:00
Jaewan Kim
226a51958d Update service connections when TV input list is updated
Bug: 15738607
Change-Id: Ie2d24d0c36308e6757b7d6939d79874c3bdd7211
2014-06-26 02:00:32 +00:00
Lorenzo Colitti
76ea6c68d3 Teach LinkProperties whether it's provisioned or not.
In IPv4, a link is provisioned when DHCP succeeds. In IPv6, a
there is no such signal, because addresses and DNS servers can
be notified by the kernel at different times.

Add an isProvisioned method that returns true if we believe that
enough information has configured to use a network. For IPv6,
this requires an IP address, default route, and DNS server. For
IPv4, this requires only an IPv4 address, because we support
static configuration that doesn't have a default route or DNS
server.

To do this we use the existing hasIPv4Address method, rename the
all-but unused hasIPv6Address method to hasGlobalIPv6Address
(which is what we want anyway) and add new hasIPv[46]DefaultRoute
and hasIPv[46]DnsServer methods.

Bug: 9180552
Change-Id: Ib2f5ff8af920f7b6f1edf0e2afaaa0edce9bc72d
2014-06-26 03:23:31 +09:00
Alexandra Gherghina
828d11df52 Fix uninitialized variable warning
Change-Id: Ib1d4a4e1431388a839f9ef8027b439f57922b025
2014-06-25 14:20:09 +01:00
Alexandra Gherghina
d4ee3952a3 Merge "Skip forwarding launcher intents" 2014-06-24 06:38:52 +00:00
Jeff Brown
bf58d9b727 Minor cosmetic tweaks.
Change-Id: I626bad7177659b5670c2864d7bc78033a0ee16e7
2014-06-24 21:19:50 -07:00
Alexandra Gherghina
fa4533f3a0 Skip forwarding launcher intents
If we forward intents when looking up launcher icons, we end up
having an icon for a disambig activity instead of the apps for that user.

Bug: 15769854
Change-Id: Ia57525466dba57b6669b2b5cedf98f202d08f586
2014-06-24 19:25:15 +01:00
Jungshik Jang
5ef8580b52 Merge "Notify ARC status update to AudioService." 2014-06-24 01:52:26 +00:00
Jungshik Jang
a858d221ff Notify ARC status update to AudioService.
Whenever ARC status is updated it should be notified to
AudioService so that it reroutes audio output to others.

Bug: 15841544, Bug: 15844022, Bug: 15844112

Change-Id: I06674ee4dd22c0f9be08e33fbacdd785578ba55f
2014-06-25 16:32:19 +09:00
Jungshik Jang
e9cf1583c7 Rename canChangeSystemAudioMode on HdmiCecLocalDeviceTv with hasSystemAudioDevice.
Change-Id: Id9ddcf377b30ef86ceb7c3933f2a89f1d95ab842
2014-06-24 16:19:56 +09:00