242 Commits

Author SHA1 Message Date
Craig Mautner
e1abfdf711 am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit '6222a8ef853609ea9c0f725c2412a2d25968d9da':
  Set the new SurfaceControl opaque flag.
2014-02-21 04:20:58 +00:00
Craig Mautner
709efec60d am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '56dbf7b092826b1cef42357bda422baf18d2292c':
  Resize DimLayer explicitly on rotation.
2014-02-21 04:20:39 +00:00
Michael Wright
d429710f8e Merge "Unbreak manual brightness setting." 2014-02-21 02:09:49 +00:00
Jeff Brown
ac8bdfe4f0 Merge "resolved conflicts for merge of baaa080b to master" 2014-02-21 02:07:45 +00:00
Jeff Brown
10102e4c0e resolved conflicts for merge of baaa080b to master
Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
2014-02-20 18:05:03 -08:00
Michael Wright
5c977ea1b7 Unbreak manual brightness setting.
Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
2014-02-20 18:02:27 -08:00
Ben Gruver
0e3b52e5e8 Merge "Add ability to match intents based on the package name of the intent sender" 2014-02-21 01:18:59 +00:00
Amith Yamasani
1a405db22a Merge "Abort removing account if prohibited by policy" 2014-02-21 00:06:03 +00:00
Amith Yamasani
5934dbc9f1 Abort removing account if prohibited by policy
Bug: 13077993

If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.

Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
2014-02-20 15:23:36 -08:00
Craig Mautner
1648f042f3 am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
* commit 'fd8a8ccbb79b3d83bb328d64c544c59251eef151':
  Set the new SurfaceControl opaque flag.
2014-02-20 22:39:52 +00:00
Craig Mautner
3519530fae am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
* commit '267b37ceff64b6adaeef52e3a582f1186144f93e':
  Resize DimLayer explicitly on rotation.
2014-02-20 22:39:49 +00:00
Craig Mautner
fd8a8ccbb7 Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 2014-02-20 22:36:52 +00:00
Craig Mautner
267b37ceff Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 2014-02-20 22:34:38 +00:00
Craig Mautner
902945d151 Resize DimLayer explicitly on rotation.
Using the alpha value to trigger a resizing of the DimLayer was a
Bad Idea. The alpha value should reflect the true alpha value and
not be used to trick the code. Actually changing the size and
position is a Better Idea.

Fixes bug 13101776.

Change-Id: I11c16b8276919ea85960fe87bb17c0956ce8a3b1
2014-02-20 14:31:32 -08:00
Jeff Brown
90506a41c6 am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
* commit '07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65':
  Add a new "doze mode" based on Dream components.
2014-02-20 21:47:08 +00:00
Jeff Brown
2687550272 Add a new "doze mode" based on Dream components.
When a doze component has been specified in a config.xml resource
overlay, the power manager will try to start a preconfigured dream
whenever it would have otherwise gone to sleep and turned the
screen off.  The dream should render whatever it intends to show
then call startDozing() to tell the power manager to put the display
into a low power "doze" state and allow the application processor
to be suspended.  The dream may wake up periodically using the
alarm manager or other features to update the contents of the display.

Added several new config.xml resources related to dreams and dozing.
In particular for dozing there are two new resources that pertain to
decoupling auto-suspend mode and interactive mode from the display
state.  This is a requirement to enable the application processor
and other components to be suspended while dozing.  Most devices
do not support these features today.

Consolidated the power manager's NAPPING and DREAMING states into one
to simplify the logic.  The NAPPING state was mostly superfluous
and simply indicated that the power manager should attempt to start
a new dream.  This state is now tracked in the mSandmanSummoned field.

Added a new DOZING state which is analoguous to DREAMING.  The normal
state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP.
The PowerManager.goToSleep() method now enters the DOZING state instead
of immediately going to sleep.

While in the doze state, the screen remains on.  However, we actually
tell the rest of the system that the screen is off.  This is somewhat
unfortunate but much of the system makes inappropriate assumptions
about what it means for the screen to be on or off.  In particular,
screen on is usually taken to indicate an interactive state where
the user is present but that's not at all true for dozing (and is
only sometimes true while dreaming).  We will probably need to add
some more precise externally visible states at some point.

The DozeHardware interface encapsulates a generic microcontroller
interface to allow a doze dream for off-loading rendering or other
functions while dozing.  If the device possesses an MCU HAL for dozing
then it is exposed to the DreamService here.

Removed a number of catch blocks in DreamService that caught Throwable
and attempted to cause the dream to finish itself.  We actually just
want to let the process crash.  Cleanup will happen automatically if
needed.  Catching these exceptions results in mysterious undefined
behavior and broken dreams.

Bug: 12494706
Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
2014-02-20 13:39:13 -08:00
Narayan Kamath
520a5673fb am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
  AArch64: Make AssetAtlasService 64-bit compatible
2014-02-20 13:02:21 +00:00
Dan Stoza
b88a904dfe Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:33 +00:00
RoboErik
3328868544 Merge "Initial round of MediaSession APIs" 2014-02-20 00:25:10 +00:00
RoboErik
01fe661ae5 Initial round of MediaSession APIs
This is far from complete but puts the basic components in place
for an app to interact with media sessions.

Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f
2014-02-19 13:41:37 -08:00
Patrick Tjin
a1cd90bc8f Merge "Modify unexpected mtu debug message to print mtu" 2014-02-19 21:21:19 +00:00
Patrick Tjin
a45610fc1f Modify unexpected mtu debug message to print mtu
Change-Id: Iacc78582c5e3d6b156e8e2eda25e89e0e5be6eda
2014-02-19 12:53:04 -08:00
Adam Lesinski
a78068e7a3 am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev
* commit '13c839962e246517a7a95326610ea30c529d79dc':
  Make UsbService optional
2014-02-19 19:48:05 +00:00
Adam Lesinski
55b8ddc303 am 0817d16c: am 04520a01: am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev
* commit '0817d16c539ca6b499da9f807e8ac6988233e9c3':
  Add fastpath for single signature comparison
2014-02-19 19:48:01 +00:00
Adam Lesinski
1c532c2e2d am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev
* commit '4b07b26e8654df52ca80bb2165ebdf9352ab9337':
  Make UsbService optional
2014-02-19 19:41:26 +00:00
Adam Lesinski
04520a01b8 am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev
* commit '6feaa267a585f22595f846c9e3d09a76dc3db47a':
  Add fastpath for single signature comparison
2014-02-19 19:41:23 +00:00
Adam Lesinski
4b07b26e86 Merge "Make UsbService optional" into klp-modular-dev 2014-02-19 19:38:34 +00:00
Craig Mautner
08c9db7363 am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
* commit '6ed1c96b7253d2590ffe339714bdcaf8c77217c0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
2014-02-19 16:37:07 +00:00
Craig Mautner
a1baf02884 am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
2014-02-19 16:29:01 +00:00
Dan Sandler
83b34efe9e Merge "Make some notifications public (safe for secure lockscreens):" 2014-02-19 02:26:12 +00:00
Craig Mautner
71dd1b6343 Set the new SurfaceControl opaque flag.
Converts surfaces from transparent to opaque and opaque to transparent
without creating a new surface. Uses the new SurfaceControl.setOpaque
method.

Fixes bug 12387406.

Change-Id: I669c064e622e211b00b1585183a488d5b3f4b778
2014-02-18 15:59:23 -08:00
Adam Lesinski
f5b3a01e54 Add fastpath for single signature comparison
PackageManager does not need to create a hash set
when comparing two sets of signatures, where each set
contains one signature. This is the common case for
most applications.

Bug:13029313
Change-Id: I61883d85960db7b376e234d7abae6149c4d20245
2014-02-18 15:31:41 -08:00
Adam Lesinski
2cb6c60c0d Make UsbService optional
Tweaked the services Android.mk to build dependencies
when building with mm[m].

Change-Id: I6dad511c652bcacc085f27ede5f8f22a6982c6bd
2014-02-18 14:57:09 -08:00
Dianne Hackborn
ca1bf21c51 Implement wifi part of issue #12973036: Improve power_profile.xml
Add battery stats tracking of wifi state.

Also update when we retrieve the current time to use a more
consistent value across stats tracking.

Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
2014-02-18 14:43:14 -08:00
Jeff Sharkey
e62c4a10cb am ab528077: am 37d894a4: am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
* commit 'ab5280776f40c473228d3e920771a41289ed7fee':
  Structure device not freed in error case
2014-02-18 17:26:17 +00:00
Jeff Sharkey
d3b21393bf am fef3dd01: am 41185c84: am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit 'fef3dd01fbad923bf7ff509f4ee95312fd7cb4db':
  Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:22:23 +00:00
Jeff Sharkey
9a41b24c8f am 392ee12f: am 96190f1c: am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '392ee12fd57870e1e8f0777d03295b0435babd1f':
  Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:22:18 +00:00
Jeff Sharkey
37d894a42b am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"
* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case
2014-02-18 17:19:38 +00:00
Jeff Sharkey
41185c844f am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT
2014-02-18 17:15:44 +00:00
Jeff Sharkey
96190f1c05 am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
  Fix, MountService now only sends one onShutDownComplete
2014-02-18 17:15:39 +00:00
Dan Stoza
16ec12ae77 Allow disabling layer rotation during screenshots
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
2014-02-14 23:10:29 +00:00
Ben Gruver
4f4161442d am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
  Check the return value of listFiles on the ifw directory
2014-02-14 23:08:10 +00:00
Paul Lawrence
a9f387bdf0 Merge "Support default, pattern, pin and password encryption types" 2014-02-14 15:25:01 +00:00
Jeff Brown
88aaef7128 am ce0552f3: am 8a4c2bb1: am 567f7ca4: Refactor dream manager to new pattern.
* commit 'ce0552f360d8c8f0bc45095293be369800ce9c93':
  Refactor dream manager to new pattern.
2014-02-14 09:50:37 +00:00
Jeff Brown
8a4c2bb1f0 am 567f7ca4: Refactor dream manager to new pattern.
* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
  Refactor dream manager to new pattern.
2014-02-14 09:14:09 +00:00
Jeff Brown
567f7ca424 Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
2014-02-13 23:26:59 -08:00
David Christie
d63b4314b8 Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug: 12824233" 2014-02-13 20:25:01 +00:00
Craig Mautner
6b1a93fcb9 am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
  Don't null class member before using it.
2014-02-13 19:24:23 +00:00
Craig Mautner
21ab13ff74 am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.
2014-02-13 19:18:04 +00:00
Craig Mautner
474f1fbe8d Merge "Don't null class member before using it." into klp-modular-dev 2014-02-13 19:14:17 +00:00