19527 Commits

Author SHA1 Message Date
Jae Seo
9cc28e5175 TIF: Create TvInputState only once per each input
Also removed mClientTokens which is no longer used.

Bug: 16970763
Change-Id: I4fc276241c33f88ed932ce6c703bdb3f771eb7d4
2014-08-13 11:06:53 -07:00
Robert Greenwalt
57e383b1cc Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev 2014-08-13 23:16:37 +00:00
Robert Greenwalt
fb68f8fbe0 Don't send NetworkMonitor bcast until systemReady
bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b
2014-08-13 13:43:32 -07:00
Winson Chung
eb0cefa965 Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev 2014-08-12 23:14:48 +00:00
Winson Chung
60a729c8e9 Adding scrim to task views. (Bug 15704955)
- Fixing issue with focus animations not happening for new views

Change-Id: I3134f25becf06db343aa30ea80cb33514cd99d06
2014-08-13 15:55:15 -07:00
destradaa
2d8964cca7 Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev 2014-08-12 23:14:35 +00:00
destradaa
ff8e6093fa Update FlpHardwareProvider native layer, to stop raising FatalErrors.
b/16800814

Change-Id: Ic619f37c02c7e4dddc4ef06369f8730cbd66e6bd
2014-08-12 19:05:33 -07:00
Jorim Jaggi
84a3e7aacf Use different unlock animation when going to full shade
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).

Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
2014-08-14 12:29:25 +00:00
Jae Seo
e253fabbc7 Merge "TIF: Temporarily disable permission check for parental controls" into lmp-dev 2014-08-12 23:14:35 +00:00
Jae Seo
550c4b0d4d TIF: Temporarily disable permission check for parental controls
Bug: 16979343
Change-Id: I00ff70194faaf7218151388dc10ce8e4dd3d2728
2014-08-12 17:50:37 -07:00
Adrian Roos
2bb8bfd1e8 Dismiss bouncer when onTrustInitiatedByUser fires
Also modifies the SampleTrustAgent to allow testing of the feature
and adds the initiatedByUser flag to the dumpsys output.

Bug: 16840500
Change-Id: I4c08ddcdcbd0ab02c694a1873f73cb9a250f98d7
2014-08-13 17:24:36 +00:00
keunyoung
2c1c74afca Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 2014-08-12 23:14:35 +00:00
keunyoung
c093bf2645 rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
2014-08-13 18:58:03 +00:00
Adrian Roos
9dbe190099 Trust: Insecure unlock also removes disable-trust-on-boot restriction
Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
2014-08-13 19:31:29 +00:00
destradaa
da97066d5a Merge "Add additional logging around AGPS IP Address handling." into lmp-dev 2014-08-12 23:14:35 +00:00
destradaa
931a37f992 Add additional logging around AGPS IP Address handling.
The additional logging is expected to help troubleshoot and prevent the issue tracked by the
following bugs:
b/16875580
b/16961654

Change-Id: Ibee7fe0774efa3db77ab53af96c128ced186b40e
2014-08-12 17:51:01 -07:00
Jae Seo
0204938659 Merge "TIF: Change the directory of the state file" into lmp-dev 2014-08-12 23:14:33 +00:00
Jae Seo
8211dda34d TIF: Change the directory of the state file
Changed it from /data/system/tv/{userId} to the directory obtained from
Environment.getUserSystemDirectory(userId).

Bug: 17018435
Change-Id: Ib9704a974c4397149ca4b50670cf11346b818de3
2014-08-14 10:50:25 -07:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
2014-08-13 15:00:21 -07:00
Paul McLean
a5e2e5e48a Merge "Fix ALSA initialized wait for input-only USB Audio devices" into lmp-dev 2014-08-12 23:14:35 +00:00
Paul McLean
c7f084f61c Fix ALSA initialized wait for input-only USB Audio devices
Bug 17012266

Change-Id: I09427bb924f895bf66af9ef7ad4f0882746d03c4
2014-08-14 07:42:49 -07:00
Jason Monk
815e057b9b Switch exiting screen pinning to recents+back
When accessibility is on, still use just recents.

While here fix strings to be less wrong.  Still need finalization.

Bug: 16649417
Change-Id: I94debe9471d5132f1f662543cc98cbde638c758d
2014-08-14 20:06:41 +00:00
David Christie
d4edf4cb01 Disable GPS when battery saver is on and screen is off.
Bug: 15348895

Change-Id: Iae2c3898ff48dc4d22e0ff872d7417ef6945c5e3
2014-08-12 16:02:33 -07:00
Jean-Michel Trivi
81f871e2b9 Add support for AudioAttributes in android.media.Ringtone
Deprecate use of stream types.
Map deprecated API to AudioAttributes.
Add new methods to specify AudioAttributes on a Ringtone instance.

Bug 16790748

Change-Id: Ifb3c2e838e1f119614459ad7d71d83a4d7c9ffdb
2014-08-12 15:53:15 -07:00
Jorim Jaggi
8de4311c51 Lockscreen launch animations
- Get rid of ActivityManager.dismissKeyguardOnNextActivity, which was
  used for two different things: Dismiss keyguard from somewhere else
  (not really necessary anymore), wait to actually dismiss keyguard
  after the window behind is drawn. Instead, introduce
  keyguardWaitingForActivityDrawn(), and change the semantics where
  necessary.
- Make wallpaper_close_enter consistent with task_open_enter and the
  Keyguard launch animation.
- Close the panel even on lockscreen when launching a notification.
- Block notification shade updates during the collapsing motion so
  notification don't play the disappear animation immediately after
  having launched a notification.

Bug: 15991916

Change-Id: I133c177b84e926c87c1a404ba93d633593fec3ab
2014-08-12 22:47:52 +00:00
Diego Pontoriero
d45afac287 Change CARRIER_SETUP hook in ConnectivityService to use Aeroshell API
for determining carrier app instead of MCC/MNC.

Related ConnectivityService change: http://ag/374479

Related Aeroshell change to SetupWizard: http://ag/520857

Bug: 16457806
Change-Id: I78eb2a25d578400c2de6bae4af3d6e8e1ee4d0c7
2014-08-12 13:15:20 -07:00
Winson Chung
33fe1ed56d Merge "Clearing tasks along with application data. (Bug 16952119)" into lmp-dev 2014-08-12 19:26:20 +00:00
Robert Greenwalt
70236bf4f1 Remove extraneous clearing of inet condition
This was old code I missed in previous inet condition refactor
and caused us to show "not connect" icon any time we connected
to a secondary network (mms/supl/etc).

bug:16896743
Change-Id: I0fa62e09bb0b7c0ee0864bb1f95967eac5f60d3e
2014-08-12 14:51:48 -07:00
Winson Chung
93baa0ed9b Clearing tasks along with application data. (Bug 16952119)
Change-Id: Ie986712a7d7d0911b6de7a4b34b7d03bf7874d6f
2014-08-12 14:21:01 -07:00
Jorim Jaggi
76a1623afc Preparations for lockscreen launch animations
- Update unlock animations to new spec to make the consistent with
  lockscreen launch animations.
- Introduce disappearing motion for security views which runs before
  we actually dismiss Keyguard.
- If a window is running the un-force-hide animation, treat as it
  would have the wallpaper flag set so the wallpaper stays until
  the animation is completely done.
- Run an animation on the wallpaper if the wallpaper is going away.

Bug: 15991916
Bug: 16234603
Bug: 15326120
Change-Id: I063aa4f269ddcf75b9a705e90f0c3056b541b642
2014-08-12 20:52:26 +00:00
Adam Lesinski
9a0b289f06 Fix NPE in UsageStats for new User
Bug:16946585

Change-Id: Ibd0d674681f3f49087305cea33ce7292f5d2229d
2014-08-12 20:25:37 +00:00
Winson Chung
fee26771cf Ensuring that we update the calling uid/package when updating a task's original intent. (Bug 16676636)
Change-Id: I5d75a912e86e83f05717cb19e9b6edb02eb053e6
2014-08-12 11:11:25 -07:00
Alexandra Gherghina
7c97bbc39f Bugfix: adds extra null check
Bug: 16976436
Change-Id: Id51fd3125b4e68ff7c0ec37ec031fcb8ff882ed4
2014-08-12 17:22:20 +00:00
Jungshik Jang
867b4e0c55 Set active port path to HdmiControlService
Set active port path to HdmiControlService so that the service
can handle proper event patch between cec and mhl devices.

Bug: 16215362
Change-Id: I2bd703916a422429b1029067fa3422e24de39274
2014-08-12 14:23:21 +09:00
Jinsuk Kim
502d8b3beb Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev 2014-08-11 19:42:53 +00:00
Jeff Davidson
328e679b21 Merge "Security-related cleanup for network scoring." into lmp-dev 2014-08-12 00:32:51 +00:00
Jinsuk Kim
bcfa0677d4 CEC: Make sure CEC switch info is always updated
The CEC switch information was not updated as expected if
Device Discovery action is in progress. Refactored to have the
update routine gets called regardless of the presence of action.

Conflicts:
	services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

Bug: 16931883
Change-Id: I629e8b646bef54599c1a706bf1c797ecebf8616b
2014-08-12 07:54:58 +09:00
Jeff Davidson
ac7285dc1e Security-related cleanup for network scoring.
-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.

-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.

Bug: 14117916
Bug: 16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
2014-08-11 15:46:20 -07:00
RoboErik
1f7a39fee1 Merge "Fix registering global priority sessions" into lmp-dev 2014-08-11 18:20:32 +00:00
RoboErik
4d26598677 Fix registering global priority sessions
We were never setting a global priority session due to a change in
the way sessions were registered. This makes sure a global session
gets set correctly.

bug:16930866
Change-Id: I859846c9265e98bb1a37ff9d22808137e787ce18
2014-08-11 16:50:18 -07:00
Jeff Sharkey
93f871126c Merge "Hack and ship: NetworkStats edition." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
eb2c2c790c Hack and ship: NetworkStats edition.
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
2014-08-11 18:40:23 -07:00
Jeff Brown
6d2a9492e2 Eliminate power manager latency for boot completed.
The power manager disables the power button until boot completed
occurs.  If there are many pending broadcasts in the queue, it
may be possible for BOOT_COMPLETED to be delayed for several
seconds after boot.

To avoid the delay, introduced a new boot phase which is
sent to system services immediately when boot completed happens.

Bug: 13398280
Change-Id: I1833d2ffb20305009dd76363b43e534034f1d0a2
2014-08-11 17:13:03 -07:00
Jungshik Jang
7df52862da Hook up native mhl api to HdmiControl Service.
This change hooks up all apis defined in mhl hal to
java layer's HdmiMhlController and HdmiControlService.
Along with HdmiMhlController, this change includes followings.

1. HdmiMhlLocalDevice
A logical container for a mhl device connected to specific hdmi port

2. HdmiMhlFeatureAction
A base feature action class for mhl's state behaviors like RAP and RCP.

Bug: 16215362

Change-Id: If177999853f60b68bd079549660a3f4982cb9d9e
2014-08-12 11:05:42 +09:00
Jinsuk Kim
91e25eda41 Merge "Move input change event handling out of TVInputManager" into lmp-dev 2014-08-11 19:42:53 +00:00
Jinsuk Kim
d38bf476f6 Move input change event handling out of TVInputManager
HDMI input change event should be handled best in TIS implementation
of HDMI input since the input change request from TV/other device
needs to be properly coordinated. This requires the listener be
moved the input service.

Provided an interface in HdmiTvClient for the input service to access
the API through getSystemService(Context.HDMI_CONTROL_SERVICE).

Conflicts:
	services/core/java/com/android/server/tv/TvInputHardwareManager.java

Bug: 15570939
Change-Id: Ie2ad10d77907de3d4501f9c892ca553b75365467
2014-08-12 08:27:32 +09:00
RoboErik
7aef77bbf5 Remove sessions listeners that are disabled
Removes sessions listeners when their notification listener is
disabled. Also updates the dump for media sessions.

bug:15549450

Change-Id: Ibe51a4a42ef333e75a09f0fffa0f2b9b8939b85c
2014-08-11 22:32:55 +00:00
Yuncheol Heo
e5910f70fc Merge "Use the system property for the HdmiControlService configuration." into lmp-dev 2014-08-11 19:42:53 +00:00
Yuncheol Heo
7d9acc7a3e Use the system property for the HdmiControlService configuration.
- We've used the system resoure overlay for this purpose, but we found
  that it's hard for OEM which uses PDK to override this.  Since the
  resource was already compiled and provided as a binary, so it's hard
  to change it.

Bug: 16965963
Change-Id: I868305d6f76c128d79c00ab6a8023656cd476c62
2014-08-12 15:55:52 +09:00