228 Commits

Author SHA1 Message Date
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
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
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
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
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
Dave Platt
8e5df442cd Merge "NsdService does not clean up after exiting clients" 2014-04-08 17:35:57 -07:00
Craig Mautner
8f2adcb10e am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
2014-04-07 22:21:33 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
2014-04-04 19:28:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
2014-04-04 15:21:53 -04:00
Jinsuk Kim
f2fe3505da am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit '31518f745ffa5e832274c332ac957a065948fdaf':
  Use build property for CEC device OSD name
2014-04-03 00:39:23 +00:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
2014-04-03 07:59:27 +09:00
Jinsuk Kim
4c963841db am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
  Maintain display power status for playback device
2014-04-02 22:43:52 +00:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Narayan Kamath
71ab4f4f48 am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
  Move zygote startup logic to the frameworks.
2014-04-02 10:41:24 +00:00
Jinsuk Kim
4e90fcd190 Maintain display power status for playback device
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.

Other changes:

    - Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
      can be queried by clients.

    - Defensively check the availability of HdmiCecService so that
      HdmiCecManager.getClient() returns null in case the service couldn't
      be initialized. This ensures clients of the service gets the nulled-out
      HdmiCecClient when called in the state/configuration where the service
      is not available, thus proceed accordingly.

Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
2014-04-02 14:46:14 +09:00
Michael Kolb
4a8121478e am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
* commit '875eff832f9f496740ceba2f12de6f5423225274':
  Add circular anti-aliasing mask to circular display
2014-04-01 22:54:30 +00:00
Michael Kolb
39a6db7cd5 Add circular anti-aliasing mask to circular display
Bug: 13635645

  Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService

Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
2014-04-01 15:28:01 -07:00
Nick Kralevich
ce30fca85d am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs."
* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
  Change when the SELinux relabel of /data/data occurs.
2014-03-31 20:20:41 +00:00
Narayan Kamath
56a8f8b48f resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
2014-03-31 14:10:53 +01:00
Jinsuk Kim
2e59bd7885 am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage
2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Craig Mautner
1872ce3e7a am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
2014-03-28 23:05:42 +00:00
Adam Hampson
e8609de4fb am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev
* commit '594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
  hdmi: cec: add permission name to dump permission denial message
2014-03-28 23:04:01 +00:00
Adam Hampson
594c73fc57 Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 2014-03-28 22:22:52 +00:00
John Spurlock
ec27a7caf3 am 5579ec33: DO NOT MERGE Enhance the NotificationListenerService api.
* commit '5579ec33eb317a19ad80929169b2b329b147d98b':
  DO NOT MERGE Enhance the NotificationListenerService api.
2014-03-28 19:01:10 +00:00
John Spurlock
5579ec33eb DO NOT MERGE Enhance the NotificationListenerService api.
Add to NotificationListenerService:
 - getActiveNotificationKeys() : String[]
 - getActiveNotifications(String[] keys) : StatusBarNotification[]
 - cancelNotifications(String[] keys) : void
 - onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
 - getKey() : String

Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
2014-03-28 10:19:00 -04:00
Adam Hampson
25b32c65e7 hdmi: cec: add permission name to dump permission denial message
The android.security.cts.ServicePermissionsTest--testDumpProtected test was
failing on this service because it is looking for the permission name in the
denial message.

Change-Id: I4b4d38cd27b782470d1f21e36104164d2c8962a3
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-27 14:20:23 -07:00
Craig Mautner
af89d7e21f am bffd4d43: Merge "Check return values for null." into klp-modular-dev
* commit 'bffd4d437d133164877c6a194d6a533299072fae':
  Check return values for null.
2014-03-27 20:25:45 +00:00
Craig Mautner
bffd4d437d Merge "Check return values for null." into klp-modular-dev 2014-03-27 20:22:20 +00:00
Craig Mautner
d3849f5415 Check return values for null.
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
2014-03-27 13:19:29 -07:00
Craig Mautner
723f7bbcf3 am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"
* commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f':
  Do not show Home behind full screen activity
2014-03-27 20:14:13 +00:00
Adam Lesinski
6984e4f9bb am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
  Fix a race in NotificationManager with Listeners
2014-03-27 17:18:03 +00:00
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
2014-03-27 12:50:58 +00:00
Adam Lesinski
e824026554 Fix a race in NotificationManager with Listeners
After being bound to, a NotificationListenerService could
make a call into NotificationManagerService before having been
added to the list of active services.

Bug: 13644375
Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
2014-03-26 17:52:54 -07:00
Jinsuk Kim
40a00a341b Replace individual methods with a consolidated CEC nativeSendmessage
It saves us from having to add numerous native methods to HdmiCecService.
A new native method that reports physical address was added in consequence
to be able to build the message in Java side.

Other changes:
 - Substituted more concrete type (cec_device_type_t) to int.
 - Fixed the issue about byte endianness in handling physical
   address/vendor id. The bytes of variable mPhysicalAddress in native
   service were being reversed previously but still worked because they
   were reversed again when copied out to outgoing messages. Vendor id
   had a bug of bytes being reversed. In order to fix the issue, the way
   they are copied to byte array was changed so that it becomes
   independent to byte endianness.
 - CL's for header/HAL implementation changes are:
   https://googleplex-android-review.git.corp.google.com/#/c/437667
   https://googleplex-android-review.git.corp.google.com/#/c/437668

Change-Id: Id1ac683fe54597a2c707f30492c7f86e5392504d
2014-03-27 07:59:31 +09:00
Nick Kralevich
32cc40a9b5 am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
  Note libselinux dependency on packages.list format changes.
2014-03-26 15:55:41 +00:00
Craig Mautner
16744ac3f7 am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
  Defer removal of activity until animation complete.
2014-03-26 00:26:03 +00:00
Craig Mautner
79e6578b6c Defer removal of activity until animation complete.
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
2014-03-25 16:48:47 -07:00
Craig Mautner
d7bf82d6a4 am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev
* commit 'f32b22e9c78cbc0109adbad67e9ff3d7045bd954':
  Move task to top in window manager.
2014-03-25 18:14:15 +00:00
Craig Mautner
f32b22e9c7 resolved conflicts for merge of ca903d38 to klp-modular-dev
Change-Id: I44b8cbeb9ae9f6e5c8b2fe1363127d6eccfdf041
2014-03-25 11:05:08 -07:00
Adam Lesinski
99d607844d am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev
* commit '415e6f8ed46a70e6ae50e05cda56356dae31718c':
  Fix issue with early service start
2014-03-25 17:26:05 +00:00
Adam Lesinski
415e6f8ed4 Merge "Fix issue with early service start" into klp-modular-dev 2014-03-25 17:22:11 +00:00
Matthew Williams
4bcf922a55 am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit 'c798e4f5497c39a3c6c14b120cffdee1122a9212':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
2014-03-25 10:04:56 +00:00
Matthew Williams
c798e4f549 am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
2014-03-25 09:57:36 +00:00
Adam Lesinski
a6db4ab619 Fix issue with early service start
NotificationListener services would start too early
and crash due to system_server not being ready.

Bug: 13439345
Change-Id: I86ee93b50d016bfa0119e21a8cde8635212b16a4
2014-03-24 12:39:47 -07:00