8999 Commits

Author SHA1 Message Date
Dianne Hackborn
08e14da78d am a597200a: am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
* commit 'a597200a60a8b2ab63498700a0b7b0a9ea948c93':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
2015-05-23 01:09:15 +00:00
Dianne Hackborn
a597200a60 am 54d803c0: am dd5ee4b8: Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
* commit '54d803c0274137998c7dbb9d7b8af58de13be5b6':
  Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
2015-05-23 00:58:27 +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
Adrian Roos
38c94199bf am fa37dfff: am 7dc7e2c5: am fab33408: Merge "No longer trigger immersive cling on panic" into mnc-dev
* commit 'fa37dfff5d23e8b7c5320f10613e3276ec3c3ef2':
  No longer trigger immersive cling on panic
2015-05-22 22:29:37 +00:00
Adrian Roos
35ee80638b am d969ab42: am 7faee35d: am d02ec598: Merge "Request transient bars after panic" into mnc-dev
* commit 'd969ab422331a713293c5a3e3979a7c8c667e00f':
  Request transient bars after panic
2015-05-22 22:29:32 +00:00
Adrian Roos
fa37dfff5d am 7dc7e2c5: am fab33408: Merge "No longer trigger immersive cling on panic" into mnc-dev
* commit '7dc7e2c59eef0399332911d82472f6a1bb45252f':
  No longer trigger immersive cling on panic
2015-05-22 22:11:04 +00:00
Adrian Roos
d969ab4223 am 7faee35d: am d02ec598: Merge "Request transient bars after panic" into mnc-dev
* commit '7faee35da1f1f08b382b19a560283abd82fc73c3':
  Request transient bars after panic
2015-05-22 22:10:58 +00: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
Stuart Scott
a3eb21bee7 Merge "Network Reset should have a lockdown like Factory Reset." 2015-05-22 21:28:09 +00:00
Stuart Scott
94b038bbb2 Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
2015-05-22 11:29:28 -07:00
Maxim Bogatov
7379531588 Merge "Limit large font accessibility setting to user profile." 2015-05-22 17:25:12 +00:00
Jean-Michel Trivi
32a56b8f83 am 8330bd51: am b0eb08b5: Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
* commit '8330bd519eaa5204bd79110caeebdeca953c7270':
  Remove the 5 sec timeout logic for setVolumeControlStream
2015-05-22 16:39:17 +00:00
Adam Lesinski
85900a5e08 am 90b078d5: am 35f6c005: Merge "BatteryStatsService: Only query bluetooth on demand." into mnc-dev
* commit '90b078d58665d3c2c576217cc061ea4d37a1dc89':
  BatteryStatsService: Only query bluetooth on demand.
2015-05-22 16:38:35 +00: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
Jim Miller
6a3b0caf2f am 8bd088f5: am 361b2d69: Merge "Fix crash in fingerprint and problem where directory has wrong selinux label" into mnc-dev
* commit '8bd088f590fe7afd96a8deee824223b26b42203f':
  Fix crash in fingerprint and problem where directory has wrong selinux label
2015-05-22 15:31:43 +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
Dianne Hackborn
ad15bee4ff am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit 'c60f010edcb197451d087207b0c9527d74cff245':
  Add API to track usage time of apps.
2015-05-22 01:37:15 +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
e11f0225d7 am c04bedd7: am 5347d018: Merge "Prevent ImmersiveModeCling from eating all touches" into mnc-dev
* commit 'c04bedd7304022d3fa5795a346c41056a5c6ecd3':
  Prevent ImmersiveModeCling from eating all touches
2015-05-22 00:23:46 +00:00
Filip Gruszczynski
76173cc89f am b0edb78e: am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev
* commit 'b0edb78e5cfd793ff7848b14962f1cf7ca509eff':
  Support for devices with a chin.
2015-05-22 00:23:41 +00: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
Craig Mautner
f41e2e6391 am 4c20f59f: am 15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit '4c20f59f76fc6a7c5c4dc3d6e3087395cf5686de':
  For getHomeActivity() only return current user.
2015-05-22 00:00:15 +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
Maxim Bogatov
05075305b4 Limit large font accessibility setting to user profile.
There were 2 problems:
1) When Settings application updated font size it called
ActivityManagerNative.updatePersistentConfiguration() that makes IPC
call to system_process. Then font size was persisted in system_process.
But, the user id we save with the font size if calculated based on the
current process, which is UserHandle.USER_OWNER for the system_process.

2) When user was changed font size was not read from database. Font size
from current configuration was always used.

b/18305168

Change-Id: Id847935a1ab1da3ef133e28ed6928c99c5fe0f16
2015-05-21 16:40:05 -07: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
a96f4d8392 am 7a41587d: am 7d85ea93: Always tell Keyguard about occluded state
* commit '7a41587df5aebd5dfcbafda23722fc5f3049dbed':
  Always tell Keyguard about occluded state
2015-05-21 21:33:49 +00: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
2dec5b6c4b am 2e5c21b8: am f98702ea: Protecting against the correct flag for the input consumer
* commit '2e5c21b8a004ba1bb63555436607065eeb0b308b':
  Protecting against the correct flag for the input consumer
2015-05-21 19:08:10 +00:00
Craig Mautner
49c2047827 am 2fd28c9a: am 714b0ab4: Merge "Add debug for bug 21055376." into mnc-dev
* commit '2fd28c9a6017f6aac92400d07dcc3276ca1115d7':
  Add debug for bug 21055376.
2015-05-21 19:08:05 +00: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
Narayan Kamath
4014376378 am b825039e: am 6bd37924: Merge "Fix application moves." into mnc-dev
* commit 'b825039e3c5bad879ab309573fc7cf34536c3ec4':
  Fix application moves.
2015-05-21 18:49:02 +00:00
Eric Laurent
6f25f7fbce am 60574a02: am 97de0c9a: Merge "AudioService: indicate system ready to AudioFlinger" into mnc-dev
* commit '60574a02d80d584e7f563056d18fc340ce29baa3':
  AudioService: indicate system ready to AudioFlinger
2015-05-21 18:48:10 +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
Jae Seo
dde5d60d96 am 96a424e2: am 184016aa: Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev
* commit '96a424e261c55f08de8f1c6a3d5c7547030aafab':
  TIF: Build the list of available TV inputs as the current user
2015-05-21 15:39:52 +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
Jim Miller
ddfdfc494e am 60ce06db: am 0a17fb4e: Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev
* commit '60ce06db20b41fed23460e927f9a51ecaa5b1bee':
  Move from native FingerprintService implementation to fingerprintd
2015-05-21 12:22:14 +00:00
Craig Mautner
2fa6d52ca5 am 4d191f52: am 116c9ed6: Merge "Avoid resuming activity before launch." into mnc-dev
* commit '4d191f52e8ecadafe2ab2953c4cd6c04b1525010':
  Avoid resuming activity before launch.
2015-05-21 12:21:47 +00: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