17966 Commits

Author SHA1 Message Date
Nicolas Prevot
1e2f374e71 Merge "Making more ContentProviders work across users." 2014-06-20 04:43:13 +00:00
Jinsuk Kim
2a07054632 Merge "Do not have HdmiControlService report deviceEvent for TV itself" 2014-06-19 23:04:31 +00:00
Jinsuk Kim
13c030e828 Do not have HdmiControlService report deviceEvent for TV itself
DeviceEvent should be used only for the other logical device,
not the TV device itself.

Also fixed a but not updating the logical address after the allocation.

Change-Id: I80cec9d5bb4b95d003c9d1c7ea13f02d7e76b322
2014-06-20 13:28:29 +09:00
Jungshik Jang
7eca94c145 Merge "Use SystemAudioStatusAction in SystemAudioAction." 2014-06-19 23:04:31 +00:00
Craig Mautner
bb27b1c3a6 Merge "Allow a root activity to relinquish task identity" 2014-06-19 20:37:59 +00:00
Craig Mautner
9d4e9bcebb Allow a root activity to relinquish task identity
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.

The ability to set intent also includes the ability to set the
TaskDescription of the task.

Fixes bug 15675610.
Fixes bug 10428661.

Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
2014-06-19 16:40:01 -07:00
Sungsoo Lim
b0586c9228 Merge "Make getAvailability() always return true" 2014-06-19 23:04:31 +00:00
Jinsuk Kim
d1fdf0238a Merge "Report device status event in HdmiControlService" 2014-06-19 22:55:19 +00:00
Jinsuk Kim
4893c7efde Report device status event in HdmiControlService
This change allows the event listener (TIF) to get notified
of the CEC logical device status change (addition/removal),
and update the available tv inputs accordingly.

Change-Id: I7f2798ad47212120ecac8093ad281f683a3d125e
2014-06-20 07:26:17 +09:00
Jeff Sharkey
0270cfb71d Merge "Explicitly collect manifest digests." 2014-06-19 22:08:21 +00:00
Jeff Sharkey
032f2b246b Explicitly collect manifest digests.
Previously it was a side effect of collectCertificates().

Bug: 15740334
Change-Id: I2e044fdcc1c86ce730b9570bfbecf873366325e1
2014-06-19 15:49:05 -07:00
Sungsoo Lim
ab981c5653 Make getAvailability() always return true
Bug: 15745402
Change-Id: If40ecef74e5bd7124e0020fcdbcd4637b2d82d97
2014-06-19 23:58:27 +09:00
Jungshik Jang
16321b8007 Use SystemAudioStatusAction in SystemAudioAction.
SystemAudioAction includes SystemAudioStatusAction which
is required for SystemAudioAutoInitiationAction.

Change-Id: I9f2ae1ddea305e1c1e18410060842288c271cd4b
2014-06-19 20:00:52 +09:00
Jeff Sharkey
275e085d5a Stronger PackageParser contract, more split work.
Require that method callers always provide relevant paths, instead of
relying on constructor.  Move DisplayMetrics to be an overall parser
parameter, and move PARSE_TRUSTED_OVERLAY to flags.

Parse split APKs and apply deterministic ordering based on split
names.  Assert consistent package name and version code across all
split APKs in a package, and enforce unique split names and required
base APK.

Collect certificates for split APKs, enforcing they're all signed
consistently.  Better flow control and resource cleanup when
collecting certs.  Refactor validation code so it's easier to reason
about.  Cleaner maintenance of read buffer when draining stream
contents.

Change-Id: I8bc8c62095fbb933227b9e76ad8771f4b1246fe8
2014-06-18 16:04:13 -07:00
Nicolas Prevot
5b21454e6f Making more ContentProviders work across users.
If a ContentProvider makes a uri available to every app:
For an app on a different user, we grant a uri permission,
even if the ContentProvider would not normally allow granting uri permissions.

BUG:15721503
Change-Id: I0b865ae80f588137256387eba14a2e29b1129b00
2014-06-18 16:57:04 +00:00
Jinsuk Kim
a062a9339a Implement portSelect/sendKeyEvent for HdmiControlService
TIF (TV Input Framework) uses these API to switch inputs, send
keys for selected device on CEC bus. Also renamed getActiveInput
to getActivePortId to use a unified term for port/input.

Change-Id: I8196825c0d960988cc1c0bb58a628ccd8ab1957e
2014-06-18 03:53:16 +00:00
Wonsik Kim
a358b53e1d TvInputHardware: Add HDMI port ID
Bug: 15570939
Change-Id: I957804124fa5e417de8c98c6d41332609097d995
2014-06-19 10:35:33 +09:00
Wonsik Kim
d7c29189aa TvInputHardware: Integration with audio framework changes
TvInputHardwareManager detects AudioPort specified by tv_input and
connect source to sink via AudioManager.createAudioPatch().

Bug: 15177175
Change-Id: I2252eb0df2d8287889ed28cc7d76dc1a659fd08b
2014-06-19 10:35:33 +09:00
Jungshik Jang
bce527139a Merge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction" 2014-06-17 22:26:08 +00:00
Jungshik Jang
187d01765b Add SystemAudioAutoInitiationAction and SystemAudioStatusAction
Once all device discovery action is done if there is audio amplifier
on device list, it should trigger system audio initiation action.
On or off of system audio is decided by Tv's last audio setting
(speaker). If system audio was the last audio setting, it will
try to turn on system audio; otherwise will turn it off.

In other hands, SystemAudioStatusAction is added to update
system audio status (mute or volume) after
SystemAudioAutoInitiationAction. In fact, RequestArcAction has
almost same code as it has and will refactore RequesArcAction
in the following changes.

Change-Id: I3d591242e79549cb73e14546f0d057ba08f878ef
2014-06-18 11:37:11 +09:00
RoboErik
d3c8642dae Remove some more old code and fix Media command
Removes some more hidden apis from AudioService/Manager. This also
fixes up Media.java to support commands for the new service to help
with debugging. Also fixes a couple bugs that were found while fixing
up Media.

Change-Id: I68e4aa80a4de430b98236aafc883664b9432c62b
2014-06-19 10:37:00 -07:00
Kristian Monsen
995fabd054 Merge "Always call super when not sending the key event anywhere else" 2014-06-17 21:43:29 +00:00
Kristian Monsen
83526c181e Always call super when not sending the key event anywhere else
Fix for bug 13171440

Change-Id: I1601e749f0114a6faebcdaeb5ac8993d668b54a8
2014-06-18 18:33:34 -07:00
Jorim Jaggi
16b414f46f Merge "Fix bug when Keyguard gets hidden." 2014-06-17 22:59:52 +00:00
Jorim Jaggi
53c68a44ac Fix bug when Keyguard gets hidden.
We make sure in Keyguard that we only hide ourselves in
startKeyguardExitAnimation ourselves when we requested a hide.

In addition, this change also fixes a bug in WindowAnimator that
it should only call startKeyguardExitAnimation when Keyguard actually
requested a hide.

Bug: 15676717
Change-Id: I2279cccb9916985b7e9a2f41137878be5782cb9c
2014-06-17 15:28:05 -07:00
Robin Lee
aab72f3b0a Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs""" 2014-06-17 21:55:55 +00:00
Robin Lee
306fe08ce2 Revert "Revert "Publish DevicePolicyManager CA certificate APIs""
This reverts commit 792b270dbdc980cfe04e8d461bf00a1f45b5e936.

Change-Id: I18c7e0eca39868230cd8e4f4bbeb3c44ff9e8b78
2014-06-19 14:04:24 +00:00
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs"
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00:00
Nicolas Prevot
e7cd37e613 Merge "Introducing crossProfileIntentFilters that skip the current profile." 2014-06-17 21:55:55 +00:00
Nicolas Prevot
63798c596d Introducing crossProfileIntentFilters that skip the current profile.
For these crossProfileIntentFilters, the activities in the current profile cannot
respond to the intent.
Only activities in the target profile can respond to the intent.

BUG: 14936725

Change-Id: I5e2704c2b56ff50a8339dd49284956391d7fad7e
2014-06-18 14:13:19 +01:00
Christopher Tate
80888cb206 Merge "Fix job service validation in secondary users" 2014-06-18 19:24:54 +00:00
Christopher Tate
5568f54e14 Fix job service validation in secondary users
Bug 15714663

Change-Id: I101bcc979f30062bec36f462522227b857b58054
2014-06-18 14:02:46 -07:00
Christopher Tate
42892f8aa5 Merge "Don't end lock task mode when not in lock task mode" 2014-06-17 21:43:29 +00:00
Christopher Tate
3bd90617ec Don't end lock task mode when not in lock task mode
Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e
2014-06-18 16:37:52 -07:00
Dianne Hackborn
f329d050b8 Merge "Add kernel and native memory data to procstats." 2014-06-19 22:33:55 +00:00
Dianne Hackborn
f7097a5b69 Add kernel and native memory data to procstats.
We now collect memory use data in the kernel and native
application for aggregation in procstats.  This should
allows us to do aggregated summaries of how memory use
is distributed across the system -- how much is free vs.
how much is in use.

Fix a bug in how we were tracking per-app version codes:
apps that used a shared user id to have multiple packages
run in the same process could get their version codes
cross-wired.  Now we keep track of version codes in the
list of packages associated with a process.

Bumped the checkin version code to 5, so that we can
distinguish checkins that have this corrected data.

Also fix a bug in battery stats monitoring radio state.

Change-Id: I1c849f2df442df679a34ad7b0ca0c5870bfac8df
2014-06-19 16:37:23 -07:00
Jason Monk
fbe6be4f65 Merge "Notify any profile/device owners of lock task" 2014-06-17 21:07:42 +00:00
Jason Monk
35c62a4668 Notify any profile/device owners of lock task
Add a method for DeviceAdminReceivers of profile/device owners to
be notified that lock task mode has entered or exited for an app
they have whitelisted.

Change-Id: Id124287d41564bbfccdacccf1977b7acb3ddec3f
2014-06-18 14:56:24 -04:00
Julia Reynolds
779d2cffbc Merge "Rename apps User Restriction." 2014-06-17 21:03:08 +00:00
Julia Reynolds
36fbc8d645 Rename apps User Restriction.
Change-Id: I9f81a6b94ba06b593e7213967df51c7cb30a7b31
2014-06-18 10:36:15 -04:00
Wink Saville
b576cec262 Merge "Empty triangle displayed for radio signal but calls & data work" 2014-06-17 21:03:08 +00:00
Wink Saville
eeacf93747 Empty triangle displayed for radio signal but calls & data work
TelephonyRegistry: when default sub id is requested set isLegacyApp to
true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the
TelephonyRegistry.Record.subId will be updated.

SubInfoRecord: Add SubInfoRecord toString for easier debugging

SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId)
as this allows explicit setup of phoneId and subId and does not rely on
a phone's subId being set.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
2014-06-18 01:07:10 -07:00
Jae Seo
5c80ad2077 Clean up the EPG data when a TV input package is removed
Also removed an unused parameter from sendSessionTokenToClientLocked().

Bug: 14981342
Change-Id: I5bcf6050386a2bc3e216f44420390c4b78282af4
2014-06-18 10:10:07 -07:00
Jim Miller
05d38d28b6 Merge "Hide IFingerprintService and IFingerprintServiceReceiver" 2014-06-17 20:55:27 +00:00
Jim Miller
06e658f324 Hide IFingerprintService and IFingerprintServiceReceiver
The @hide was being ignored because they were being used by the
constructor.  Fixed by making the FingerprintManager constructor
hidden.

Change-Id: I3cd409df5055579f5004b08d00d5d951b8e5afd3
2014-06-17 18:38:14 -07:00
Jeff Brown
2139276ce8 Refactor BatteryService to new pattern.
Apply SystemService pattern to BatteryService.

Change-Id: I4971b2da8d2aed4d14440fb65863a8b916bab03c
2014-06-17 18:20:42 -07:00
Jeff Brown
2c43c339de Resolve boot time dependencies related to the power manager.
This change fixes a bug where native daemons may try to communicate
with the power manager before it was fully initialized due to a race
between publishing the binder service and completing init().

The solution was to simplify the dependencies related to the power
manager.  It turns out that most services that were passed in
init are not actually needed until systemReady.  What remained
was a dependency on the activity manager to check permissions for
incoming calls.  So now we start activity manager first.
However, the activity manager also depends on power manager for
wakelocks.  To break the cycle, we now defer initializing the activity
manager's wakelocks until after the power manager has been started.

Cleaned up a bunch of boot-time service dependencies so that we
can have better confidence that they are correctly maintained.

Bug: 13884219
Change-Id: If08e2d7ccd44e7026a72441bb6bd5afd7bb9fffe
2014-06-17 18:20:42 -07:00
Jim Miller
a7596147b4 First pass at FingerprintService integration with HAL.
Move FingerprintService to framework services directory
Fix merge conflicts.

Tested: scanning, enrolling, removing.

Change-Id: I58b2b902cb671dc82cdaa54a195ba5f1a154622c
2014-06-17 14:03:37 -07:00
Jeff Sharkey
8fb63d5a5a Merge "Plumb split APKs into public API." 2014-06-17 20:55:27 +00:00
Jeff Sharkey
8a4c9721a9 Plumb split APKs into public API.
Introduces new ApplicationInfo fields to surface zero or more split
APKs for an application.  Splice these APKs into both the class
loader and resource system.  Cleaner building of these paths.

Run dexopt() on all split APKs found after a parse, and populate
into ApplicationInfo.

Change-Id: I4a376bf4492d84ea95aafa866e106ea43a43e492
2014-06-17 14:38:44 -07:00