1131 Commits

Author SHA1 Message Date
Jeff Brown
7a32533c62 am ccf51bef: am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit 'ccf51bef288652cb618a566a376173e252b84af0':
  I'm feeling the good vibrations.
2014-05-21 02:41:06 +00:00
Jeff Brown
df3bad37d2 am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '8f120dd6d631ac632d3356b81403a53f958021f0':
  Allow display timeouts to be set in config.xml.
2014-05-21 02:41:00 +00:00
Jeff Brown
ccf51bef28 am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '2d9b513dab78242281bca125b4abc6b8235089a6':
  I'm feeling the good vibrations.
2014-05-21 02:38:11 +00:00
Jeff Brown
8f120dd6d6 am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
  Allow display timeouts to be set in config.xml.
2014-05-21 02:38:07 +00:00
Jeff Brown
969579bb9d I'm feeling the good vibrations.
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution.  However if
the system is performing haptic feedback then we want to allow
it to run to completion.

Bug: 14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
2014-05-20 19:29:29 -07:00
Jeff Brown
27736f5c0a Allow display timeouts to be set in config.xml.
Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
2014-05-20 17:17:10 -07:00
Lorenzo Colitti
00592c2700 Merge "Move IP config from WifiConfiguration to IpConfiguration." 2014-05-20 23:15:50 +00:00
Yuncheol Heo
cd47ecb690 Merge "Fix the wrong conversion of byte to int." 2014-05-20 22:53:13 +00:00
Jaewan Kim
6346155c5a Move IP config from WifiConfiguration to IpConfiguration.
This is so that Ethernet can use it in the future.

Bug: 7606609
Bug: 8687763

Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
2014-05-20 15:24:10 -07:00
Amith Yamasani
863ddcc7ac Merge "Per-user telephony restrictions" 2014-05-20 22:20:06 +00:00
Amith Yamasani
9f6c25f57e Per-user telephony restrictions
Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.

Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
2014-05-20 15:13:28 -07:00
Eric Laurent
c0e439f1b7 Merge "AudioSystem: add new audio device definitions" 2014-05-20 21:39:23 +00:00
Winson Chung
53dd1f7ffc Merge "Fixing transition to/from Recents with full screen apps." 2014-05-20 21:36:28 +00:00
Winson Chung
ae08441649 Fixing transition to/from Recents with full screen apps.
Change-Id: I2f400b6736581a37d38a75ee7194fc7cb6438460
2014-05-20 14:20:11 -07:00
Dianne Hackborn
3bf2723193 Merge "Delay the dispatching of non-wakeup alarms." 2014-05-20 20:25:08 +00:00
Dianne Hackborn
d4e6d467cd Delay the dispatching of non-wakeup alarms.
When the screen is off, there are no guarantees about when
non-wakeup alarms will be dispatched.  Historically they are
dispatched any time the device wakes up.  With this change,
we will delay the dispatch until sometime later.

The amount of delay is determined by how long the screen has
been off.  Currently there are three possible delays: up to
2 minutes if the screen has been off for less than 5 minutes;
up to 15 minutes if it has been off for less than 30 minutes;
and otherwise up to an hour.

When the screen is turned on or a wakeup alarm is dispatched,
all delayed alarms will also be dispatched.

Note that one of the things this delays is TIME_TICK, which
means the in many cases we won't deliver TIME_TICK until the
screen is in the process of waking up.  The current
implementation causes this to be delayed until the SCREEN_ON
broadcast is sent; we probably want to improve this to have
the power manager tell the alarm manager about the screen
turning on before it sends that broadcast, to help make sure
things like the lock screen can update their current time
before the screen is actually turned on.

In addition, switch all of the alarm stats to use the new
PendingIntent "tag" identifier for its operations, instead
of the old code to try to construct a pseudo-identifier
by retrieving the raw Intent.

Also add a new package manager command to immediately write
packages.xml.

Change-Id: Id4b14757cccff9cb2c6b36de994de38163abf615
2014-05-20 13:24:25 -07:00
Robert Greenwalt
a67be03f9e Add NetworkFactory names and unregistration.
Some Factories come and go (Telephony) and so they need to be able to unregister.
Also, debugging is tough when the factories are anonymous, so add names for logging.

Lastly, only send single set of NetworkRequests to a newly registered NetworkFactory
and only send the requests.

Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
2014-05-20 09:03:57 -07:00
Christoph Studer
05ad48206a Add ZEN and speedbump to NotificationListenerService
Change-Id: I39fae5d77863e0d10cf236a096cc589167d146d3
2014-05-20 17:03:22 +02:00
Jason Monk
87be9ba1ea Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00
Yuncheol Heo
03e8a834da Fix the wrong conversion of byte to int.
Because 'byte' type is signed, we need a mask when converting it to 'int' type.

Change-Id: I3a8fcb38c9d108c0280d66301e29144391807401
2014-05-20 19:49:58 +09:00
Eric Laurent
948d32748c AudioSystem: add new audio device definitions
Change-Id: Ib7675bc33771365b2dbb7694c522469317b11457
2014-05-19 18:43:49 -07: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