1793 Commits

Author SHA1 Message Date
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
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
Adrian Roos
dded065c86 Merge "Trust Agents: Add facility to request credential entry" 2014-06-24 06:38:28 +00:00
Adrian Roos
2c12cfa1d5 Trust Agents: Add facility to request credential entry
Bug: 15871777
Change-Id: I43c80151f6403ff62961aeb3dc7aafe049e18a62
2014-06-25 23:28:53 +02:00
Alexandra Gherghina
828d11df52 Fix uninitialized variable warning
Change-Id: Ib1d4a4e1431388a839f9ef8027b439f57922b025
2014-06-25 14:20:09 +01:00
Winson Chung
c286444f14 Merge "Use Task last active time to ensure we don't reload items for the cache." 2014-06-25 17:34:05 +00:00
Andres Morales
d96e4948da Merge "interface for nfc handover supplicant commands" 2014-06-25 17:34:05 +00:00
RoboErik
d09bd0c6eb Move VolumeController into AudioService
VolumeController was a hidden class only used by AudioService and
MediaFocusControl. Since we added a public VolumeProvider class
moving VolumeController to avoid confusion.

Change-Id: I6838daf9b83846e1393b1a8502d3b10345a4799a
2014-06-25 14:36:51 -07:00
RoboErik
19c9518f6a b/15729204 Pipe sessions through to VolumePanel
When remote volume is changed via volume buttons we need to notify
the system UI so it can show the slider. This also passes it the
controller to use so adjustments to the slider are sent back to
the correct session.

Change-Id: If5847bcd5db16c56e0e9904b88c94e5b28954c41
2014-06-25 14:36:51 -07:00
Winson Chung
f1fbd77cf0 Use Task last active time to ensure we don't reload items for the cache.
Change-Id: I29206de0453f5d7d1370b27a27ef6d3594eff8e7
2014-06-24 18:09:00 -07:00
John Spurlock
bf37099250 Create a basic doze dream in SystemUI.
The doze dream is not configured by default.

When configured, the doze dream does not show anything by default.
It teases a dark version of the keyguard (showing only the time
and notifications) when a notification arrives or significant motion
is detected.

Bug:15863249
Change-Id: Icfceb054d35d6fd4d9178eda7480e2464873ca4b
2014-06-25 13:33:09 -04: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
Craig Mautner
3b6e53fc00 Merge "Don't set return to recents on every resume" 2014-06-23 21:50:10 +00:00
Craig Mautner
76e2a765b4 Don't set return to recents on every resume
Checking for previous task to be the Recents activity every time
through resumeTopActivityLocked() leads to missetting the
mTaskToReturnTo to Recents for Recents. Instead check for
Recents launching a task in moveTaskToFront and startActivity.

Fixes bug 15832448.

Change-Id: Ib64fe26f3fd3fdcd878edafb041928ec02757e63
2014-06-24 09:05:43 -07:00
Dianne Hackborn
04d480e1c3 Merge "Fix some problems with proc stats collection." 2014-06-24 17:32:43 +00:00
Dianne Hackborn
306af678a5 Fix some problems with proc stats collection.
Also start debugging why we aren't being able to open
/proc files.

Change-Id: I4655904691ac22108c29858cbd01153a251ccbf5
2014-06-24 15:41:03 -07:00
Narayan Kamath
67565a09f5 am 152d5cd3: am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune."
* commit '152d5cd30bdfd88b0903b205d38c6966cbded5a8':
  Explicitly list out the list of cache subdirs to prune.
2014-06-24 12:32:50 +00: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
Nicolas Prevot
3cd9b0d5ef Merge "Small fix related to cross-profile intents." 2014-06-24 06:38:28 +00: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
Christoph Studer
9e58b3c61c Merge "Remove notification APIs from StatusBar service" 2014-06-24 06:38:28 +00:00
Christoph Studer
e71fefcc8b Remove notification APIs from StatusBar service
Bug: 15324972
Bug: 15436573
Change-Id: I838370a23fb07cb876e08c41ef11653f2658719e
2014-06-24 16:47:56 +02: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
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
9587ee0203 am a2121e49: am 5957d6a8: Merge "Fix frontOfTask assignment."
* commit 'a2121e497c2e82676b4bf5dc35b0015c38ddc5ab':
  Fix frontOfTask assignment.
2014-06-23 15:00:10 +00: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
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
Alexandra Gherghina
aeb0ed7467 Merge "Adds cross-profile intent filters for the Settings app" 2014-06-20 04:43:13 +00: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
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
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