26626 Commits

Author SHA1 Message Date
Wale Ogunwale
8673f0c4b7 Merge "Don't leak starting window when app crashes before adding windows" into mnc-dev 2015-05-26 20:56:51 +00:00
John Spurlock
12e0b390ef Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." into mnc-dev 2015-05-26 19:41:53 +00:00
John Spurlock
1b8b22b1a4 Zen: Calendar auto-rule tracks primary calendar for corp profile.
- Track the calendar provider for the managed profile user if found.
 - Add userId to the shared data structure to disambig calendar ids.
 - Delay rule update a bit to guard against chatty updates.
 - Fix logging in calendar rule.

Bug: 21155107
Change-Id: Id2303fcc39b1fa7417b1844b7869d773ef92434c
2015-05-26 15:39:05 -04:00
Paul Jensen
7891fcb52a Merge "Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)" into mnc-dev 2015-05-26 17:33:26 +00:00
James Cook
327c364113 Merge "Cancel voice assist session on user switch" into mnc-dev 2015-05-26 16:16:35 +00:00
Lorenzo Colitti
82babcd83a Specify more information in DhcpClient PendingIntents.
- Specify the package name. This provides a bit of security, but
  not much since the package is "android".
- Specify the interface name so we can run more than one client
  at a time.

Bug: 21395858
Bug: 19704592
Change-Id: I91c9ea15285b36628b6aef0b975c16a0b08d061e
2015-05-26 12:40:12 +00:00
Wale Ogunwale
10cb5e2ac7 Don't leak starting window when app crashes before adding windows
It is possible for us to leak an app starting window if the app it
is associated with fails to start before adding any windows. This
causes the starting window to permanently be visible at the layer
it occupies.

We now remove the starting window immediately when the app token
is been removed if it is the last window in the token and it isn't
animating.

Bug: 21375344
Change-Id: Ib3da148501645a44736c639c0181c3fabe0138e8
2015-05-24 12:36:21 -07:00
Selim Cinek
d6623618b2 Fixed logspam and handling subwindows with the input consumer
Bug: 21402648
Change-Id: I4c1c73487dfd19ba452ff2077d8541547f149c3b
2015-05-23 01:57:41 +00:00
Dianne Hackborn
dd5ee4b890 Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev 2015-05-23 00:34:35 +00:00
Amith Yamasani
7870550a1b Merge "Add getPermissionGrantState method in device policy" into mnc-dev 2015-05-23 00:05:47 +00:00
Dianne Hackborn
4bb6b751fb Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.
2015-05-22 16:34:44 -07:00
James Cook
496767c142 Cancel voice assist session on user switch
Ensure any active voice interaction session is canceled when the
voice interaction service is shutdown. This ensures that the UI window
is closed when a user switches accounts.

Bug: 20501283
Change-Id: I9f3dae5afc4048482f6bedaed36dbae3c0823ebd
2015-05-22 16:16:37 -07:00
Adrian Roos
fab334081e Merge "No longer trigger immersive cling on panic" into mnc-dev 2015-05-22 21:38:24 +00:00
Adrian Roos
d02ec5989d Merge "Request transient bars after panic" into mnc-dev 2015-05-22 21:37:58 +00:00
Amith Yamasani
184b3753de Add getPermissionGrantState method in device policy
This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
2015-05-22 13:55:57 -07:00
Jean-Michel Trivi
b0eb08b521 Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev 2015-05-22 15:51:35 +00:00
Adam Lesinski
35f6c005be Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev 2015-05-22 02:08:55 +00:00
Adam Lesinski
c14c273bf8 BatteryStatsService: Only query bluetooth on demand.
Bluetooth was being queried too often, leading to more power
consumption and wakelock time.

Bug:21063567
Bug:21269307
Change-Id: Idddbab46d13016ef8528e095945b7817c12f7266
2015-05-22 02:08:19 +00:00
Jim Miller
361b2d69ee Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev 2015-05-22 01:42:25 +00:00
Jean-Michel Trivi
ccffda8359 Remove the 5 sec timeout logic for setVolumeControlStream
Bug 16983918

Change-Id: I65174615d882ea433105862b1ecc50c512979ef9
2015-05-21 18:23:57 -07:00
Dianne Hackborn
8b20cdb27b Merge "Add API to track usage time of apps." into mnc-dev 2015-05-22 01:12:44 +00:00
Jim Miller
16ef71f4f5 Fix crash in fingerprint and problem where directory has wrong selinux label
Fixes bug 21373942

Change-Id: I860656b0c9e26c038d03d9872c490466dc62d4e7
2015-05-21 17:48:59 -07:00
Adrian Roos
c5d8fbcd2e No longer trigger immersive cling on panic
Instead we now request transient bars.

Bug: 19282730
Change-Id: I75de4515e2df1964de8a52d3983540f7bb5379e8
2015-05-21 17:40:51 -07:00
Adrian Roos
5347d0185b Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev 2015-05-22 00:09:12 +00:00
Filip Gruszczynski
91e5b0f598 Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev 2015-05-22 00:02:48 +00:00
Dianne Hackborn
b5a380d409 Add API to track usage time of apps.
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.

The time interval tracked is from when the app launches the
activity until the user leaves that app's flow.  They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries.  For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.

The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow.  For example, use the notification shade, launcher, or
recents to launch or switch to another app.  Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.

The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.

Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
2015-05-21 16:45:29 -07:00
Craig Mautner
15dddf3891 Merge "For getHomeActivity() only return current user." into mnc-dev 2015-05-21 23:40:27 +00:00
Adrian Roos
ddc8b27878 Request transient bars after panic
Bug: 19282730
Change-Id: Ib621a837ba06847a02333e1786ea50e5d854c7d7
2015-05-21 16:28:27 -07:00
Craig Mautner
db49fec8aa For getHomeActivity() only return current user.
Previously getHomeActivity() returned the topmost home activity
independent of which user was currently running. That defeated the
purpose of the method. This fix returns the home activity of the
current user or null if one has not yet been created.

Also remove some cruft that accumulated.

Fixes bug 21055376.

Change-Id: Ic1d58129aedbe3624f8a9d12c05c84674687b0a4
2015-05-21 15:33:30 -07:00
Jorim Jaggi
7d85ea93e9 Always tell Keyguard about occluded state
If there was a window with FLAG_DISMISS_KEYGUARD first, when the
device was unlocked, mWinDismissingKeyguard was set to that window.

Now, a window with FLAG_SHOW_WHEN_LOCKED came on top, so we set the
Keyguard as occluded, but we didn't reset the window that is
dismissing Keyguard.

After that, the old window with FLAG_DISMISS_KEYGUARD was the focused
window again. However, since we didn't reset mWinDismissingKeyguard,
we ended up with DISMISS_KEYGUARD_CONTINUE, and lockscreen was not
occluded anymore. However, we never really told Keyguard about it
because DISMISS_KEYGUARD_CONTINUE was set instead of
DISMISS_KEYGUARD_START.

The first fix of this bug is to always tell Keyguard about the
current occluded state. The second fix is to reset
mWinDismissingKeyguard in case a window SHOW_WHEN_LOCKED comes on top.

Bug: 20102975
Change-Id: I7c778df09a1e393b9eeaf51fd2013012cb40fea9
2015-05-21 21:20:14 +00:00
Adrian Roos
3e8dd514a0 Prevent ImmersiveModeCling from eating all touches
Bug: 21330248
Bug: 19282730
Change-Id: I3982aa9582341032a41670fdf82e0321b84178d2
2015-05-21 13:27:58 -07:00
Selim Cinek
f98702eae0 Protecting against the correct flag for the input consumer
Also allow hiding the navbar if immersive or immersivesticky.

Bug: 21089476
Change-Id: I540e668746056a0e4bb077898792afd225e4e19e
2015-05-21 18:49:27 +00:00
Craig Mautner
4a3b824b23 Add debug for bug 21055376.
Change-Id: I1e93fb225f2639af031cdfa748a7898f31ad5a94
2015-05-21 11:12:51 -07:00
Narayan Kamath
6bd37924b6 Merge "Fix application moves." into mnc-dev 2015-05-21 17:23:17 +00:00
Eric Laurent
97de0c9a29 Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev 2015-05-21 16:13:04 +00:00
Narayan Kamath
cd251fa382 Fix application moves.
We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.

This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.

bug: 21337469

Change-Id: I3e9dfd5db1c928847f9d527dc15d29a05ff40e7d
2015-05-21 14:22:21 +01:00
Paul Jensen
1a81c39a93 Null-check argument to ConnectivityManager.releaseNetworkRequest(PendingIntent)
Do this in ConnectivityService to prevent crashing framework.

Bug:21329396
Change-Id: Ifd9c970cd0da392d0bd5da9a9ae845fdf0b559b3
2015-05-21 08:15:08 -04:00
Jae Seo
184016aac0 Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev 2015-05-21 05:27:09 +00:00
Jae Seo
76976fae6f TIF: Build the list of available TV inputs as the current user
Bug: 21313985
Change-Id: I8aa881570915d14d63e4ac0b8034044f8736443b
2015-05-20 21:52:28 -07:00
Filip Gruszczynski
c7becb7ee7 resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.

Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
2015-05-20 20:15:29 -07:00
Christopher Tate
62d1e1ef7e Scan at boot time to detect newly-present full backup candidates
OTA or similar might have caused an app to appear without the usual
notifications being sent.  Make sure we pick up those apps as
appropriate for full-data backup.

Bug 19462310

Change-Id: Ic17bc72b14cc7599ae8ea540548fda932606b8f2
2015-05-21 01:32:39 +00:00
Jim Miller
0a17fb4e56 Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev 2015-05-21 00:57:44 +00:00
Eric Laurent
0867bed9dd AudioService: indicate system ready to AudioFlinger
Indicate when JAVA services are ready to AudioFlinger so that
calls to power manager and scheduling service can be enabled.

Bug: 11520969.
Change-Id: Id977cab3208c34709011703d2dfdcf552e60371b
2015-05-20 17:39:21 -07:00
Amith Yamasani
4c02d38e97 Merge "Use screen-on time and wallclock time for idleness calc" into mnc-dev 2015-05-21 00:10:13 +00:00
Craig Mautner
116c9ed607 Merge "Avoid resuming activity before launch." into mnc-dev 2015-05-21 00:02:02 +00:00
Filip Gruszczynski
47249f2a9e am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-dev
* commit 'cb89ac84c621e047d81873428325dfd747b90a6b':
  Support for devices with a chin.
2015-05-20 22:54:14 +00:00
Filip Gruszczynski
cb89ac84c6 Merge "Support for devices with a chin." into cw-d-mr1-dev 2015-05-20 22:41:44 +00:00
Amith Yamasani
547116ea62 Use screen-on time and wallclock time for idleness calc
12 hours of screen-on time and 2 days of wallclock time
must elapse before considering an app idle.

Bug: 20066058
Change-Id: Ie7b584b40e644d868aa2708876723c3391fd432e
2015-05-20 15:40:37 -07:00
Craig Mautner
432f64ee96 Avoid resuming activity before launch.
The locktask logic would always bring a locked task to the front and
then resume it when locking. When a task is to be locked at launch that
would cause it to resume immediately before onLaunch was called. Which
would cause havoc because the token was not yet in
ActivityThread.mActivities. This lead to premature finish() calls and
looping restarts.

This change causes the resume to only be called when an app calls
startLockTask. Otherwise the resume call is skipped.

Plus additional locktask debug logging.

Fixes bug 21031298.

Change-Id: I756b0d607827d0ec7a123377db04d9377c41776d
2015-05-20 15:36:34 -07:00
Cedric Ho
d9b0c913f7 am 782def77: am 80cf2210: Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
* commit '782def772adacaf029d7d9850605923066665424':
  Add config_forceVoiceInteractionServicePackage to allow a device to config its VoiceInteractionService package and ignore the regular setting.
2015-05-20 22:22:23 +00:00