18094 Commits

Author SHA1 Message Date
Brian Carlstrom
78e51f360d am 9e36a8cd: am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case"
* commit '9e36a8cd3e106e5a2bb0d5cce805842b61e05426':
  Treat missing package usage data as a separate case
2014-06-23 15:51:22 +00:00
Craig Mautner
75dc9900c6 am 9587ee02: am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment."
* commit '9587ee02038f20602d1ab79610e8c19b9633ab81':
  Fix frontOfTask assignment.
2014-06-23 15:03:59 +00:00
Nicolas Prevot
88cc346d06 Show the icon of the personal space.
In an intent disambiguation dialog from a managed profile,
when the intent can be forwarded to the personal space:
show the icon of the parent next to "Personal apps".
And put it at the bottom of the dialog.

Change-Id: I523222aac5dde9653e784eb26cf23cdaf018b86c
2014-06-23 12:25:07 +01:00
Jungshik Jang
b41f9df104 Merge "Add for System Audio Mode" 2014-06-19 22:58:18 +00:00
Wonsik Kim
9e922ca970 Fix native calls to null pointer
Since DEVICE_AVAILABLE event fires right after initialization, it
could happen before TvInputHal.mPtr is set, which causes calls to
null pointer. Fix the bug by allowing TvInputHal to wait for mPtr to
be set before calling native methods.

Change-Id: Id07f15130beb69f77c16bf3c735285c31ae4a3a4
2014-06-23 14:06:19 +09:00
Jungshik Jang
ea67c183fe Add for System Audio Mode
Note that this is skeleton change and do not merge
till get full review from outside of CEC team.

This change introduce four apis for System Audio Mode

1. boolean canChangeSystemAudioMode()
  -  Whether to change system audio mode or not.

2. setSystemAudioMode(boolean enabled, IHdmiControlCallback callback);
  - Change system audio mode.

3. add/removeSystemAudioModeChangeLister.
  - Register/deregister listner for AudioModeChange.

4. getSystemAudioMode()
  - Whether to system audio is enabled or not.

Change-Id: I1e82365155a9f7f6c3ac5d9db4871cf6bad46865
2014-06-23 13:32:43 +09:00
Wink Saville
67e0789cd3 Mobile_radio in battery history is not accurate
Invoke TelephonyManager#listen to connect mPhoneStateListener to receive
the notifications.

Bug: 15568103
Change-Id: I5a3fa6347704e96ceb34289f74ba6e3157bbb333
2014-06-22 14:41:22 +00:00
Craig Mautner
5afcd4df22 resolved conflicts for merge of aaadf922 to master
Change-Id: I8b89a326453fc8827a84eb9516271d2bf3b71e2c
2014-06-21 18:11:33 -07:00
Dianne Hackborn
3251b90752 Add some wifi tracking to battery stats.
Now track supplicant state and wifi signal strength.
Output looks like this:

         +12m45s235ms (1) 095 +wifi_full_lock +wifi_running wifi_signal_strength=3 wifi_suppl=scanning
         +12m46s095ms (1) 095 -wifi_full_lock wifi_suppl=associated
         +12m46s469ms (2) 095 wifi_suppl=completed +proc=u0a74:"com.google.android.videos"
         +12m52s103ms (1) 095 +wifi_full_lock wifi_suppl=disconn

Also modify history dump so that when we hit a RESET or START
command, we clear our previous history data, so the next event
will include new data.  This means if you are scanning through
the output, you must at this point clear any binary stats you
have like "running" or "wake_lock" or else you will continue to
think they are on until whatever point later they get turned on
and then back off.

And a small bug fix in proc stats that would cause the system
process to crash.

Change-Id: Ibec416a1ef786d428bd0d1d86e6e3296c41f7648
2014-06-20 16:01:21 -07:00
Jason Monk
858aef2942 Merge "Add lock-to-app mode" 2014-06-20 00:24:32 +00:00
Jason Monk
62515beee6 Add lock-to-app mode
Added a dialog that shows when app has not been authorized by
DevicePolicyManager.isLockTaskAuthorized.  This allows any app
to trigger lock-to-app mode.  This same dialog is used when
startLockTaskOnCurrent is triggered by the recents long-press.

Can exit the mode by long-pressing recents again.

Keyguard is disabled when lock-to-app is active.

This CL also prevents apps from finishing when they are the root
task in a lock task TaskRecord.

Change-Id: Ib54d858e570cccf6bfd986958868e15f49bcef75
2014-06-20 16:17:38 -04:00
Ji-Hwan Lee
80bec97846 am 8931c9c9: Register PackageMonitor when system services are ready
* commit '8931c9c9ec392a1f2a7e59a516714f86cf9569aa':
  Register PackageMonitor when system services are ready
2014-06-20 21:49:28 +00:00
Ji-Hwan Lee
0ceb7e4755 Register PackageMonitor when system services are ready
Bug: 15767453
Change-Id: I191b20dfa31eee0e37ba7df67cbf906ccbfc0f4e
2014-06-21 06:30:49 +09:00
Christopher Tate
ee4bd76a33 Merge "Fix BackgroundDexOptService scheduled job" 2014-06-20 20:43:34 +00:00
Christopher Tate
1b8b3aa265 Fix BackgroundDexOptService scheduled job
1) use the right package name in the ComponentName
2) use a unique-within-package job ID

Also put the full component name in dumpsys, not just the package name

Change-Id: Icf6edabf45573ba72a1adf86b6f83baba57fc593
2014-06-20 13:40:09 -07:00
Craig Mautner
5c99167634 Merge "Fix index out of bounds exception" 2014-06-20 00:24:32 +00:00
Craig Mautner
4132620f92 Fix index out of bounds exception
When removing the last activity in a stack.

Fixes bug 15776859.

Change-Id: Id507aa7864482ff1ff769833445d937b19de2bcd
2014-06-20 14:38:21 -07:00
RoboErik
ef3c9e9b05 Add volume handling APIs to sessions
This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
2014-06-20 13:39:41 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
2014-06-20 10:28:37 -04:00
Nicolas Prevot
1e2f374e71 Merge "Making more ContentProviders work across users." 2014-06-20 04:43:13 +00:00
RoboErik
6f0e4ddd66 Remove more dead audio service code
Hit a snag in remote volume changes. Trying off this round of
removal so I can work on fixing remote volume handling in a
separate CL.

Change-Id: I49b1ba4b75d770ba7c77da081755f3210a9e9483
2014-06-20 11:35:20 -07: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
Alexandra Gherghina
6e2ae2590d Adds cross-profile intent filters for the Settings app
Bug: 15466742
Change-Id: Id9af588f2f3d51a562ef2a06fe7404c96123cc2e
2014-06-19 18:04:45 +01:00
Jay Civelli
800631affd Reenabling permission check for TrustAgent.
Now that master is using Manchego, the permission check for TrustAgent can
be reenabled.

Change-Id: I3c05a97de965684bef460ab3e3289657f9542af3
2014-06-19 08:32:18 -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
Griff Hazen
a2d30107c4 am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev
* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
  DO NOT MERGE Reduce chance of notification listener dropped messages.
2014-06-18 03:18:24 +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
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
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