1862 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
Julia Reynolds
3690ea1aa1 Merge "Apply the tethering user restriction to connectivity service." 2014-07-01 16:34:37 +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
Julia Reynolds
fc6b2a0be3 Apply the tethering user restriction to connectivity service.
Bug: 15852213
Change-Id: Ib2df696189981ed1b31955257047fac3ee403965
2014-07-02 16:46:54 +00: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
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
Jungshik Jang
ca5be9a8fb Remove SystemAudioAutoInitiationAction when SystemAudioActionFromAvr started.
Bug: 15845309
Change-Id: I1eefeca3aab117f2def08fe9fbbea81987ef11a8
2014-07-02 11:51:21 +09: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
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
Julia Reynolds
df0697e392 Merge "Apply ENSURE_VERIFY_APPS restriction to PackageManagerService." 2014-07-01 16:28:20 +00:00
Robert Greenwalt
2771181c9b Simplify the network transition wakelock.
Make it all internal to ConnectivityService - we know when a network
is lost, so grab a wakelock then.
Moves the call out of WifiStateMachine which was grabbing at bad times
like every dhcp renewal or corp-network roam.  These would always
go the full 1 minute and chew up battery.

bug:15595155
Change-Id: I80157a818cc149072cc7706d78c1e79c6e679ab3
2014-07-02 09:26:43 -07:00
Julia Reynolds
6728239cfe Apply ENSURE_VERIFY_APPS restriction to PackageManagerService.
Bug: 15986973
Change-Id: I9e8dae15cb866a3bb16e91fc49086fe1633f0bf8
2014-07-02 13:04:35 +00:00
Adrian Roos
fa10423fa0 Add stable insets for stable system windows
Adds a new kind of inset that only accounts for stable system
windows like the system or navigation bar.

Bug: 15457292
Change-Id: I681b711f6f40a94c25b7acd3a44eb3539486afab
2014-07-02 12:34:05 +00:00
George Mount
5654e2ba16 Merge "Stop temporary window from showing with activity transitions." 2014-07-01 23:17:33 +00:00
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
Jason Monk
1c7c319bb8 User restriction for disallowing window creation
Block any types of windows that could by used by apps to create
views on top of a locked app.  This can be used by device admins
in conjunction with lock task mode.

Added a way for system (and priv apps) to bypass user restrictions
for specified op codes.

Bug: 15279535
Change-Id: I2381530ef6226a5bb32a99bb4030baafb39bf564
2014-07-02 09:02:46 -04: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
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
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
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