1111 Commits

Author SHA1 Message Date
Jason Monk
87be9ba1ea Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00
Amith Yamasani
3fa61b671e Merge "Allow adding a user while still removing other users" 2014-05-20 01:02:59 +00:00
Amith Yamasani
f584f014db Allow adding a user while still removing other users
When at the user limit, removing and adding a user causes a race
condition where the deleted user is still being removed and adding
another one fails.

This change excludes deleted users from the counting to compare
against the limit.

Also fix an ArrayIndexOutOfBounds recently introduced in AppOpsService.

Bug: 13282768
Change-Id: Ib79659e7604396583a280dbbc560b288a6d9051c
2014-05-19 17:57:25 -07:00
Jim Miller
fe4e1b655f Merge "Fix infinite loop in TrustManagerService exception handler." 2014-05-20 00:50:05 +00:00
John Spurlock
ce271360da Merge "Dump the countdown condition, if active." 2014-05-20 00:46:09 +00:00
John Spurlock
fb8eb00bcd Dump the countdown condition, if active.
Change-Id: I3fa1d239379565bae74094dc2bc2da76326f41dd
2014-05-19 20:43:48 -04:00
Jim Miller
577b6f6ae4 Fix infinite loop in TrustManagerService exception handler.
Fixes bug 15092272

Change-Id: I972a9134aed18fc160c919eac93e9d488b5691f1
2014-05-19 17:38:13 -07:00
Winson Chung
4661a2574a Merge "Fixing regression in dismissing Recents." 2014-05-19 21:13:13 +00:00
Winson Chung
6cb485fd2e Fixing regression in dismissing Recents.
- Restoring app info functionality when developer options are enabled and you long-press on the app icon.

Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834
2014-05-19 14:06:13 -07:00
Adrian Roos
45d50a1363 Merge "Speed up brightness transition if auto brightness adjustment is changed" 2014-05-19 19:30:15 +00:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
RoboErik
b4f4f69e4c Merge "Move media key processing to sessions" 2014-05-19 19:28:54 +00:00
David Christie
3662ad4aec Merge "Fix bug where location provider fails on secondary users. Bug: 12592045" 2014-05-19 18:09:50 +00:00
Robert Greenwalt
5d2e896457 Fix the build
Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
2014-05-19 11:00:12 -07:00
Winson Chung
958e559b98 Merge "Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)" 2014-05-19 16:25:40 +00:00
Winson Chung
9aeb607399 Merge "Enabling alternate recents on all form factors." 2014-05-19 16:18:38 +00:00
Adrian Roos
c47bb2a323 Merge "Fix cropping for fullscreen windows" 2014-05-19 16:13:34 +00:00
Robert Greenwalt
34524f06fb Add javadoc for NetworkRequest.
Also moved the requestId serial number out of this public class into CS.

Had to leave NetworkRequest hidden for now because the docs refer to things still hidden
in ConnectivityManager.

Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
2014-05-19 08:17:05 -07:00
Narayan Kamath
f6edb97b62 am 9672ee12: am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit '9672ee125d6aee73bf1e5425c4089285714f25bf':
  Fail if we're unable to agree on an ISA for shared UIDs.
2014-05-19 13:35:57 +00:00
Narayan Kamath
9672ee125d am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99':
  Fail if we're unable to agree on an ISA for shared UIDs.
2014-05-19 13:33:19 +00:00
Adrian Roos
3eeb4e6e40 Fix cropping for fullscreen windows
Bug: 15046646
Change-Id: I526c0044e3715a4096373b8bbbdbd0c864be2df9
2014-05-19 14:12:07 +02:00
Yohei Yukawa
b503d782f5 Merge "Do not pass null to IInputMethod#setSessionEnabled" 2014-05-19 07:45:12 +00:00
Yohei Yukawa
9d91b43c8d Do not pass null to IInputMethod#setSessionEnabled
It doen't make sense to pass null as IInputMethodSession
for IInputMethod#setSessionEnabled. If we do this, it
causes NPE.

BUG: 14980068
Change-Id: Ide48d098d5e7640890257e31f8872e79b9821eb2
2014-05-19 16:18:36 +09:00
Jinsuk Kim
4b0b0391d5 Merge "Initialize internal CEC logical devices" 2014-05-18 23:03:33 +00:00
Robert Greenwalt
337a63aea7 Merge "Decouple network_sampling frequency from VDBG" 2014-05-18 14:43:12 +00:00
Craig Mautner
810c2b5f4d Merge "Pass correct task to window manager" 2014-05-17 22:15:22 +00:00
Craig Mautner
abcc59c32f Pass correct task to window manager
The target task when starting is not always the top task. If it's not
the window manager gets into a bad state.

Fixes bug 14684143.

Change-Id: I90145ae43bdc5d980dc25ac19e12aa84debfed71
2014-05-17 15:13:28 -07:00
Winson Chung
71dc28b11e Merge "Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)" 2014-05-17 00:35:21 +00:00
Winson Chung
1e8d71b605 Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)
Change-Id: Icc5d2a784ed3c3c27143eb04cbb4305549ee223a
2014-05-17 00:31:50 +00:00
Robert Greenwalt
311060571c Decouple network_sampling frequency from VDBG
Add a special debug flag for testing network sampling.

Change-Id: Ibe572c3b5648ca25f1e5be2c61e5c5ad2979b2cb
2014-05-16 17:19:24 -07:00
Christopher Tate
27fb0eec90 Merge "Add idle-state controller for the Task Manager" 2014-05-17 00:11:10 +00:00
Christopher Tate
851f3d5110 Add idle-state controller for the Task Manager
"Idle time" is currently defined to begin ~ an hour (actually slightly
more) after the screen turns off and/or dreaming begins.  Screen-on
and dreams-ending are the triggers for declaring "idle" time to be
over.

Bug 14993295

Change-Id: I0898871d5b76a52d647ae2ebcb1b2f941ec45e79
2014-05-16 16:55:22 -07:00
Lorenzo Colitti
1bc91f0d2e Merge "Stop clatd when starting the Nat464Xlat service." 2014-05-16 23:52:52 +00:00
RoboErik
42ea7eecd1 Rename session classes to have media prefix, hide routes
This renames several of the core session classes to be prefixed
with Media. It also adds @hide to all route references for now.

Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
2014-05-16 16:40:17 -07:00
Winson Chung
a449dc033b Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)
Change-Id: I582221468e63a96a5dfd132a31b09e72099b170f
2014-05-16 16:24:21 -07:00
RoboErik
8a2cfc309a Move media key processing to sessions
Send all media key events over to the MediaSessionService instead
of AudioManager. This does not affect volume handling yet, so it
is possible to get into a state where volume will be handled by
a different thing than media buttons. Except for corner cases
this shouldn't be noticable.

Change-Id: I00a576175d9c82937f0836e509b9a98d5cb77b83
2014-05-16 15:10:27 -07:00
Matthew Williams
fdd9203192 Refactored code didn't make it into previous CL
Change-Id: I7ec93e783267d0c0fb39fbc8d0abe7270bdaea68
2014-05-16 14:48:39 -07:00
Adrian Roos
6da87ab684 Speed up brightness transition if auto brightness adjustment is changed
Bug: 15019366
Change-Id: Id6e18f6b74d801bc8e87ba84c0948bbbabda368b
2014-05-16 21:14:58 +00:00
Lorenzo Colitti
43b76dfddb Stop clatd when starting the Nat464Xlat service.
If a runtime restart happens while clatd was running, we try to
start clatd, which causes a fatal exception because netd returns
a 400 error (clatd already started.

Bug: 13450716
Bug: 15012035
Change-Id: I102a06d6193fb5f4a1ebe5ad52e5647ff72ca0da
2014-05-16 14:02:13 -07:00
Matthew Williams
4b291fbffc Merge "TM TaskServiceContext implementation" 2014-05-16 20:48:46 +00:00
Adrian Roos
4b0ec7e924 Merge "Trust Agents: Withhold trust until user has authenticated" 2014-05-16 20:13:30 +00:00
Adrian Roos
dc0d5d1850 Merge "Trust Agents: Implement DPM override" 2014-05-16 20:13:20 +00:00
Dianne Hackborn
3fce73a866 Merge "Fix recording of wake_lock_in." 2014-05-16 19:42:54 +00:00
Adrian Roos
7046bfd054 Trust Agents: Withhold trust until user has authenticated
Bug: 14229695
Change-Id: I40d9fa442aa05437c20081c007ed64f984042418
2014-05-16 21:24:29 +02:00
Dianne Hackborn
9a75543006 Fix recording of wake_lock_in.
There was a bug that would allow the nesting count
to get off.  Also better documentation of times in
HistoryItem, and new option to disable resetting of
the stats when unplugging.

Change-Id: If1b39a02475c5b620c67b700a323a6d0462d5c61
2014-05-16 10:46:33 -07:00
Matthew Williams
691e93e82c TM TaskServiceContext implementation
Each task is run on the client from within a TaskServiceContext.
TSC tracks the state of execution of each task on the client.

Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
2014-05-16 10:33:48 -07:00
Jason Monk
8974f24909 Merge "Notify AppOpsService of UserRestrictions and Owners" 2014-05-16 17:30:31 +00:00
Robert Greenwalt
fcfef283d8 Merge "Clean up when we switch networks." 2014-05-16 17:16:19 +00:00
Jason Monk
62062996dd Notify AppOpsService of UserRestrictions and Owners
This makes the DevicePolicyManagerService and UserManagerService
push the DeviceOwner/ProfileOwners and user restrictions on boot
as well as on any change.

This also adds a list of restrictions that allow any op to connected with
a user restriction such that it will return MODE_IGNORED when the user
restriction is present (except for the device/profile owner).

Change-Id: Id8a9591d8f04fe5ecebd95750d9010afc0cd786c
2014-05-16 13:12:41 -04:00
Adrian Roos
ca36b95bd3 Trust Agents: Implement DPM override
Disable trust agents when a device policy
disabling them is in effect.

Bug: 14619289
Change-Id: I0920a17021cbf045d2362735df49ef4d013fcc7f
2014-05-16 18:52:29 +02:00