Commit Graph

8800 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Selim Cinek
d3f216d921 Merge "Fixed that touches where incorrectly consumed when fullscreen" into mnc-dev 2015-05-20 22:21:38 +00:00
Selim Cinek
f83e824216 Fixed that touches where incorrectly consumed when fullscreen
The fake window that was added when View.SYSTEM_UI_FULL_SCREEN was
set consumed all touches, even those going to the SystemUI and not
just those of windows below. The input consumer is now correctly
positioned in the window order to only capture the right touches.
Clicks to the volume panel and the heads up now correctly go to the
right place instead of just unhiding the SystemUI bars.

Bug: 21089476
Change-Id: Ib53dfc0b33b70084ca607d0f044db30b6e6c91d6
2015-05-20 22:20:17 +00:00
Jim Miller
be67542182 Move from native FingerprintService implementation to fingerprintd
This adds a new service, fingerprintd, that manages fingerprint
hardware from a separate process.  It provides a binder interface that
FingerprintManager uses to talk to the fingerprint HAL.

Change-Id: I84d8e407c1f1a7d1a396e246c382459ad38810ae
2015-05-20 14:56:06 -07:00
Filip Gruszczynski
3e11bf33a6 Support for devices with a chin.
Information about the chin is now part of the config.xml instead of the
theme. It is retrieved by WindowManagerService and passed to the clients
as insets. Clients can adjust their behavior in a way that makes it
invisible to the user, that part of the surface doesn't actually exist.

Bug: 19908853

Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
2015-05-20 14:20:30 -07:00
Ruben Brunk
f082bb2a7f Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev 2015-05-20 20:44:28 +00:00
Jeff Sharkey
4e2add3eb4 Merge "Write packages.list when adding/removing users." into mnc-dev 2015-05-20 19:09:50 +00:00
Jeff Sharkey
91edde24ff Write packages.list when adding/removing users.
FUSE daemons now rely on getting per-user GID information when
packages.list is written.  Normal secondary user adding/removing
usually has enough PackageManager traffic to trigger a side-effect
rewrite, but this change writes explicitly to handle guest users.

Also obtain the user list once, and exclude dying users.  During
user creation we manually splice in the user ID that we're bringing
online.

Bug: 19924661
Change-Id: Icc5b1b169300c9dc12099be12651acbf89d6bea9
2015-05-20 12:05:04 -07:00
Stefan Kuhne
242a500491 Merge "Don't exceed max. allowed recent document tasks for an app." into mnc-dev 2015-05-20 18:38:31 +00:00
Stefan Kuhne
510e554283 Don't exceed max. allowed recent document tasks for an app.
We were exceeding the maximum allowed recents document tasks entry
for an application package because the full Intent object was been
compared for equality which will be different for each task. Now
we are only comparing that the task components match which is
sufficient to determining that the task belongs to the same
application package.

Bug: 18642190
Change-Id: I831b0fcffb876d51e9439e7a7a4c75bb0881db7c
2015-05-20 10:54:09 -07:00
Eric Laurent
5aa384cdc8 Merge "AudioFormat: more compressed formats" into mnc-dev 2015-05-20 16:22:01 +00:00
Narayan Kamath
e46a5b31d6 Merge "Throw a checked exception on inconsistent installs." into mnc-dev 2015-05-20 15:54:49 +00:00
Paul Jensen
2e54f13b46 Merge "Report invalid network after one failed attempt." into mnc-dev 2015-05-20 12:56:25 +00:00
Narayan Kamath
c52ae28006 Throw a checked exception on inconsistent installs.
Allows us to proceed without crashing the system process. Also,
complete an incomplete error message. Follow up comments from
change b904863476.

bug: 21144503

Change-Id: Idb6a33f93b70b4e5e2bca95d2d3af0e2adaeedf3
2015-05-20 11:12:47 +01:00
Nitin Arora
11f83882f2 Bluetooth: Clear BLE always ON apps at Airplane mode
This patch clears the container managing the Ble Always On
apps while switching on, the airplane mode. The airplane mode
will completely turn Off the Bleutooth Adapter from any state
it is in.

Change-Id: Ib28d39d85efe3aac37e3a53a4fb892099568c702
2015-05-19 22:38:46 -07:00
Svetoslav
f357c96273 Merge "Prevent modification of system fixed permissions" into mnc-dev 2015-05-20 01:57:44 +00:00
Simranjit Singh Kohli
bdf2d1fa38 Merge "[Fix Potential for error]:" into mnc-dev 2015-05-20 01:04:57 +00:00
Simranjit Singh Kohli
6a184878f8 [Fix Potential for error]:
Init for accounts maybe called when non-system app asks for accounts.
That might lead to deletion of accounts and broadcast from the user,
which requires permission. Hence, we should clear calling identity
before requesting it.

Bug: 21140169

Change-Id: I057ac6778ea53d3f96b3e5c42fe3a2fe60c3cf28
2015-05-19 17:38:10 -07:00
Ruben Brunk
6664aee15a camera: Add AIDL interface for CameraServiceProxy.
- Adds an AIDL interface to allow the proxy camera service
  running in system server to accept RPCs from the camera
  service running in mediaserver.
- Request an update to the valid user set from the proxy
  camera service when mediaserver restarts to initialize
  properly + avoid DOS after a crash.

Bug: 21267484
Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
2015-05-19 17:20:24 -07:00
Svetoslav
6503e69d1d Prevent modification of system fixed permissions
Change-Id: I061b993df305f27e52f08dad54f1bdbf162de4d9
2015-05-19 16:49:53 -07:00
Eric Laurent
cae3466333 AudioFormat: more compressed formats
Add MP3 and AAC as valid AudioFormat encodings.
Only @hide for now to allow system components to manage
audio patches with those formats.

Bug: 18649264.
Change-Id: I5ef5f151783308e31d8ac5b29454589077ef62ea
2015-05-19 16:46:52 -07:00
Svetoslav
6d9a53abbc Merge "Handle downgrading a runtime permission to an install one" into mnc-dev 2015-05-19 23:30:48 +00:00
Svetoslav
a1d0f3031f Handle downgrading a runtime permission to an install one
bug:21300531

Change-Id: I5c020c0faae3e727bbe898441c58116e2ab892b8
2015-05-19 16:27:00 -07:00
Jeff Sharkey
891230b59e Merge "Push initial disk state, handle empty media." into mnc-dev 2015-05-19 22:04:54 +00:00