18013 Commits

Author SHA1 Message Date
Nicolas Prevot
3cd9b0d5ef Merge "Small fix related to cross-profile intents." 2014-06-24 06:38:28 +00:00
Jungshik Jang
e9cf1583c7 Rename canChangeSystemAudioMode on HdmiCecLocalDeviceTv with hasSystemAudioDevice.
Change-Id: Id9ddcf377b30ef86ceb7c3933f2a89f1d95ab842
2014-06-24 16:19:56 +09:00
Jungshik Jang
a5b7414970 Introduce @ServiceThreadOnly and @IothreadOnly to HdmiControlService
Many of hdmi service modules assumes that it runs on
service thread without any lock. But it's a bit
hard to distinguish whether a method runs on
service thread or not even though there is run-time
assertion (runOnServiceThread()) is top of method.
@ServiceThreadOnly interface documents that a method should
run on service thread while @IoThreadOnly documents
that a method should run on io thread.

Change-Id: Ia4a6a48675d2302fb2cb7a8a807fcf112da5d4e7
2014-06-24 16:14:05 +09:00
Jungshik Jang
d4c1154353 Merge "Add thread safe cec device info list." 2014-06-24 01:59:00 +00:00
Jungshik Jang
fa8e90db6a Add thread safe cec device info list.
This change keeps separate data container for thread safe access to
infos of all cec devices.

Change-Id: Ia1ad5deef2258e53ade73da784beb0372fd94282
2014-06-24 16:06:35 +09:00
Robert Greenwalt
2c7bf2cb46 Clean up and add some Network logging.
Dumps the netid for the Network and adds that to the NetworkAgentInfo.

Change-Id: Id9fbcc55ca55bf1a020f747f0c44902efb1b5f87
2014-06-23 17:40:12 -07:00
RoboErik
51fa6bcb22 b/15757378 Expose APIs for listening to active sessions
This allows apps that are registered notification listeners to
listen to the set of active sessions.

Change-Id: I1e108951a5049d138208e88b155c0ec9b95fbdb0
2014-06-23 16:29:52 -07:00
Craig Mautner
43015f241e Merge "Return to recents when coming from recents" 2014-06-23 21:44:43 +00:00
Craig Mautner
84984faf53 Return to recents when coming from recents
If a task is launched from recents then backing all the way
out of the task will return you to recents. Entering the task
in any other way (home, another activity, nav bar) will reset
this behavior.

Fixes bug 15703876.

Change-Id: I98dc36e4dbcb238d59e2175832076de7225bfdd9
2014-06-23 15:04:23 -07:00
Craig Mautner
13f6ea78b0 Avoid unnecessary timeouts.
And fix a couple of other inefficiencies.

Fixes bug 15444410.

Change-Id: Idad95d4e4d70bc7d2965e1bd6ff3d3135b73dd9c
2014-06-23 15:01:27 -07:00
Nicolas Prevot
a29e43a364 Small fix related to cross-profile intents.
Change-Id: Ie489d1f83fd23190ffdc1e1abb4f0cfffebeac8d
2014-06-23 14:17:40 +01:00
Jungshik Jang
7f0a1c54a8 Fix missing param to system audio mode action.
Change-Id: I3a4aa3dcdcf8378b51e86367f9bca1fc87a28603
2014-06-23 16:00:07 +09:00
Alexandra Gherghina
aeb0ed7467 Merge "Adds cross-profile intent filters for the Settings app" 2014-06-20 04:43:13 +00:00
Jay Civelli
23a0bf3c7f Merge "Reenabling permission check for TrustAgent." 2014-06-21 03:15:09 +00:00
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
Brian Carlstrom
9e36a8cd3e am 1b98ccf2: am 0924ef65: Merge "Treat missing package usage data as a separate case"
* commit '1b98ccf275d93197c1aa746d5c492a57cd62be7f':
  Treat missing package usage data as a separate case
2014-06-23 15:47:45 +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
Craig Mautner
9587ee0203 am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment."
* commit 'a2121e497c2e82676b4bf5dc35b0015c38ddc5ab':
  Fix frontOfTask assignment.
2014-06-23 15:00:10 +00:00
Craig Mautner
aaadf92210 am 90c9fffc: Merge "Do not delete stack if empty task is being reused." into klp-modular-dev
* commit '90c9fffc956589f06d4a0c45a893c5db6a85fabc':
  Do not delete stack if empty task is being reused.
2014-06-21 20:15:36 +00:00
Brian Carlstrom
0924ef6592 Merge "Treat missing package usage data as a separate case" 2014-06-21 03:13:40 +00:00
Danny Baumann
ec4e780e5c Fix frontOfTask assignment.
If all activities of a given stack were finishing, no activity was
marked as front-of-task. This confused ActivityManager, so make sure
there's always exactly one activity marked as front-of-task.

Change-Id: I087cbe10280d4a60aa5ccfaefe24a223523fb3f2
2014-06-23 08:43:37 +02:00
Brian Carlstrom
0547ce55eb Treat missing package usage data as a separate case
Bug: 15520936
Change-Id: I8e1c6921973f84af7ee94de91721cc4a3436ebaf
2014-06-20 12:53:19 -07: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
Craig Mautner
362449af58 Do not delete stack if empty task is being reused.
If a task is being cleared due to Intent flags and that clearing
was causing the last activity in the last task on a stack to be
deleted, then we were deleting the stack. Immediately after
this we were refilling the task with the same activity but the
stack had already been deleted.

This fix preserves the task and stack when it is only being
cleared for the new activity.

Fixes bug 15611901.

Change-Id: I7bcfa826d0852d9c640daa73fe1324b89471fecd
2014-06-20 14:04:39 -07: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