662 Commits

Author SHA1 Message Date
Christopher Lane
771cd657ac Fix build
Change-Id: I20168fb1c29ba6eb695f0d24c6ca512420b2b319
2014-04-14 16:31:27 -07:00
Christopher Lane
111db01a26 resolved conflicts for merge of 381ac080 to master
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
2014-04-14 15:14:01 -07:00
Christopher Lane
381ac08054 am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev
* commit '62538940de1755c71c56b0e5d81e12397e5de58a':
  Add support for custom TXT records in NSD
2014-04-14 21:16:27 +00:00
Christopher Lane
b72d8b4091 Add support for custom TXT records in NSD
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
2014-04-14 14:10:36 -07:00
Dan Sandler
352e108259 Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'" 2014-04-14 17:54:22 +00:00
Jeff Brown
15b0bef925 am 9e2fde9c: am d912e1f6: Use the display\'s actual state in the view hierarchy.
* commit '9e2fde9c8a3557d6e8d1f3971a421ecdf5c2ce07':
  Use the display's actual state in the view hierarchy.
2014-04-12 02:02:26 +00:00
Jeff Brown
9e2fde9c8a am d912e1f6: Use the display\'s actual state in the view hierarchy.
* commit 'd912e1f6a111fb33118d116bd72da1a328041bca':
  Use the display's actual state in the view hierarchy.
2014-04-12 01:58:57 +00:00
Jeff Brown
d912e1f6a1 Use the display's actual state in the view hierarchy.
Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false.  However, this method
really describes the interactive state of the device rather than the
actual display state.  This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.

This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.

Bug: 13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
2014-04-11 18:46:22 -07:00
Jinsuk Kim
aa77b11bdb am 4bdcd299: am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '4bdcd299da48f9abe5f9c67abed0dbe79080445d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
2014-04-11 09:47:11 +00:00
Jinsuk Kim
4bdcd299da am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '55dab4dd3b5b56ade91c012d688b581b6cbdebdf':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
2014-04-11 09:43:37 +00:00
Jinsuk Kim
55dab4dd3b am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit 'b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
2014-04-11 09:40:46 +00:00
Jinsuk Kim
b11f250e09 Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 2014-04-11 09:38:23 +00:00
Jinsuk Kim
61791075f4 Delegate HdmiCecService method impl to HdmiCecDevice subclass
Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.

Other changes:
  - Fixed a bug of <Inactive Source> not sending its physical address
    in its message body. Also the command should have been sent to TV
    only rather than broadcast.

  - Put back sendGiveDevicePowerStatus interface method. It allows the client
    to keep track of the other device(like TV) power status more closely.
    Devices goes through the status from standby -> transient to on -> on
    but the CEC spec doesn't require that they broacast it actively.

    The restored method can be used to let the playback device to get
    up-to-date power status of TV/display when it is booting up.

    This method should work the same across all the device types. So it was
    implemented in the service, not delegated to HdmiCecDevice.

  - Send <Report Physical Address> when a new logical device is registered,
    which is required by CEC spec: "it should report the association between
    its logical and physical address by broadcasting <Report Physical
    Address>

Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
2014-04-11 18:35:01 +09:00
Jeff Brown
861aa0073a am 26c6a50f: Rename isScreenOn() to isInteractive().
* commit '26c6a50f037c6af9c41b3f96269fe194748605ce':
  Rename isScreenOn() to isInteractive().
2014-04-11 09:24:24 +00:00
Jeff Brown
26c6a50f03 Rename isScreenOn() to isInteractive().
Fix build break due to an earlier merge.

Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
2014-04-11 02:15:54 -07:00
Jeff Brown
858737d08d resolved conflicts for merge of 4e5c089e to master-lockscreen-dev
Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
2014-04-11 01:47:08 -07:00
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
2014-04-11 01:33:20 -07:00
Jeff Brown
337e764deb am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.
2014-04-11 03:49:37 +00:00
Jeff Brown
f24687e273 Merge "Plumb display power state through display manager." into klp-modular-dev 2014-04-11 03:47:08 +00:00
Jeff Brown
037c33eae7 Plumb display power state through display manager.
Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
2014-04-10 20:46:14 -07:00
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
2014-04-10 12:48:07 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Paul Lawrence
17f2fdd018 am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection"
* commit '9502f990899ef576879048ec5147d403158ad89d':
  Allow encryption when keyguard is set to pattern or no protection
2014-04-10 14:33:29 +00:00
Paul Lawrence
9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection" 2014-04-10 14:30:53 +00:00
Narayan Kamath
2a6599d335 am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs
2014-04-10 09:47:21 +00:00
Narayan Kamath
954a4666ab am d11f223c: resolved conflicts for merge of 286a247e to master
* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
  Re-implement native library search and copies.
2014-04-10 09:47:18 +00:00
Narayan Kamath
f148f36d14 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
2014-04-10 09:45:18 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
2014-04-10 09:26:44 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
2014-04-09 16:47:40 -07:00
Jae Seo
2d55c116ee am b06cb887: Skip cleaning up TV service/session when the user state is not found
* commit 'b06cb8870f0407f18bb1225065a93aba2a5de2bf':
  Skip cleaning up TV service/session when the user state is not found
2014-04-09 19:34:45 +00:00
Jae Seo
b06cb8870f Skip cleaning up TV service/session when the user state is not found
Bug: 13930813
Change-Id: I64285edaca0bd06d6f6efaeb6b5c30c2ef762902
2014-04-09 12:10:58 -07:00
Jesse Gunsch
8d31358fb4 Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 2014-04-09 18:09:03 +00:00
Narayan Kamath
a00ed7f725 am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
  Move certain internal activity manager methods to new class.
2014-04-09 14:03:47 +00:00
Narayan Kamath
a981e3b01a resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
2014-04-09 14:57:59 +01:00
Sander Alewijnse
5b25236a87 am c03dea76: Merge "Changed tag name and error strings for PersistentPreferredActivity storage."
* commit 'c03dea76307163b95a313ba3e887aa94ed01dc2c':
  Changed tag name and error strings for PersistentPreferredActivity storage.
2014-04-09 09:18:21 +00:00
Sander Alewijnse
c03dea7630 Merge "Changed tag name and error strings for PersistentPreferredActivity storage." 2014-04-09 09:14:50 +00:00
Jeff Brown
7f9599d63c am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
  Move display power controller to display manager service. (DO NOT MERGE)
2014-04-09 09:12:40 +00:00
Jeff Brown
4cf85c740d am 1b03d160: Merge "Move display power controller to display manager service."
* commit '1b03d160114b1ea553f322e99ca168965daffea8':
  Move display power controller to display manager service.
2014-04-09 04:44:55 +00:00
Jeff Brown
131206b8a9 Move display power controller to display manager service.
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
2014-04-08 21:34:32 -07:00
Jeff Brown
13014b5fe5 Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
2014-04-08 20:51:07 -07:00
Jeff Brown
ad9ef191f5 Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
2014-04-08 20:41:46 -07:00
Amith Yamasani
a7d72d34af am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles"
* commit '5784b39843bd3d6112352ff3b736a6498107911c':
  Launcher APIs and broadcasts for managed profiles
2014-04-09 00:45:12 +00:00
Dave Platt
8e5df442cd Merge "NsdService does not clean up after exiting clients" 2014-04-08 17:35:57 -07:00
Amith Yamasani
5784b39843 Merge "Launcher APIs and broadcasts for managed profiles" 2014-04-08 22:04:20 +00:00
Jae Seo
e0925b6c47 am 3957091b: Initial round of Television Input Framework
* commit '3957091ba8f08c02b5e781098cb955a5f697a1ff':
  Initial round of Television Input Framework
2014-04-08 20:39:02 +00:00
Jae Seo
3957091ba8 Initial round of Television Input Framework
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.

Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
2014-04-08 13:35:21 -07:00
Kenny Guy
af6f402d37 am cfd3cd6d: Merge "Pipe notifications from related users to listeners."
* commit 'cfd3cd6df375793d714fe3b6570791e377cab1e5':
  Pipe notifications from related users to listeners.
2014-04-08 18:05:44 +00:00
Kenny Guy
cfd3cd6df3 Merge "Pipe notifications from related users to listeners." 2014-04-08 17:59:27 +00:00