16010 Commits

Author SHA1 Message Date
Jeff Brown
3af3926749 Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 2014-04-23 01:20:01 +00:00
Jeff Brown
44b1f76474 Fix HDMI hotplug display blanking behavior.
Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
2014-04-22 18:07:24 -07:00
Ying Wang
d12bf27575 am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
2014-04-23 00:11:52 +00:00
Ying Wang
b081a59a0f Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
2014-04-22 15:20:16 -07:00
Nick Kralevich
9a492393df am 5246f459: am d267c1a0: Merge "remove unneeded import statements."
* commit '5246f4599a0c9978012ffb1049307704b5027a0b':
  remove unneeded import statements.
2014-04-22 21:15:10 +00:00
Nick Kralevich
d236d625b4 am 3ab7882a: am a67d4a6e: Merge "remove unused import."
* commit '3ab7882a57d3c7a0e13f58837cd02138df43f301':
  remove unused import.
2014-04-22 21:14:59 +00:00
Nick Kralevich
5246f4599a am d267c1a0: Merge "remove unneeded import statements."
* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
  remove unneeded import statements.
2014-04-22 19:52:21 +00:00
Nick Kralevich
3ab7882a57 am a67d4a6e: Merge "remove unused import."
* commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938':
  remove unused import.
2014-04-22 19:52:18 +00:00
Nick Kralevich
d267c1a06f Merge "remove unneeded import statements." 2014-04-22 19:24:47 +00:00
Nick Kralevich
c826257bf3 remove unneeded import statements.
Internal master is out of sync with AOSP. Resync.

Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
2014-04-22 12:17:51 -07:00
Nick Kralevich
8cb5abcfde remove unused import.
This change resynchronizes AOSP with internal master.
The import line is unused.

Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
2014-04-22 12:10:24 -07:00
Craig Mautner
43c6a98f0f am 6985badc: Fix black ActivityView
* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView
2014-04-22 13:27:53 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
2014-04-22 13:27:44 +00:00
Craig Mautner
6985badc63 Fix black ActivityView
Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
2014-04-21 15:28:43 -07:00
Craig Mautner
f4c909bcb8 Fix ActivityView lifecycle
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
2014-04-21 15:28:42 -07:00
Zach Swasey
a33666a7ca Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
This fixes a bug where a View with filterTouchesWhenObscured will have
all touches filtered when in magnification accessibility mode. This is
due to magnification being a separate Window over top of the running
Activity. The method onFilterTouchEventForSecurity in View will then
always return false when filterTouchesWhenObscured is enabled on the
View. By adding the magnification Window to the list of Trusted Overlays
we can ensure that touches will work properly with this property enabled.

Change-Id: I07706588a625682d05da5cb19f401139eb08a54c
2014-04-21 14:54:21 -07:00
Jinsuk Kim
cbafd1b3ea Move logical address allocation logic into native service from HAL
Logical address logic is independent from hardware, and the algorithm is
standardized in the spec. Moved the logic to service so that all HAL
implementations doesn't have to duplicated logic inside.

Related change in HAL definition is in:
https://googleplex-android-review.git.corp.google.com/#/c/447951/

Change-Id: I9699309719f3214fc2dbdf219faad484c0c1c5bf
2014-04-21 07:42:35 +09:00
Jeff Brown
18a69b936a am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
  Add support for dynamically setting the virtual display surface.
2014-04-17 21:53:34 +00:00
Jeff Brown
92207df753 Add support for dynamically setting the virtual display surface.
Previously, the surface that backs a virtual display had to be set
at the time when the display was created.  This change now makes
it possible to set or remove the surface later.  The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
2014-04-16 18:45:05 -07:00
Aaron Whyte
ee5d512d62 am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
* commit '4980996bcc4e8065cf5dff1cf989d73face38281':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
2014-04-16 23:49:20 +00:00
Aaron Whyte
4980996bcc Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 2014-04-16 23:45:22 +00:00
Aaron Whyte
d1931ffc07 Allowed custom secure-adb confirmation via Activity or Service.
It used to only be available via an Activity.

Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
2014-04-16 14:50:14 -07:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
2014-04-16 20:10:26 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling.
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
2014-04-16 13:03:26 -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
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
Elliott Hughes
5b7dccc4f9 am 90e2301e: am d2a11d97: Merge "Add explicit close of Scanner input"
* commit '90e2301e23532c92dd4c24394b7407e243389e9f':
  Add explicit close of Scanner input
2014-04-11 17:21:20 +00:00
Elliott Hughes
90e2301e23 am d2a11d97: Merge "Add explicit close of Scanner input"
* commit 'd2a11d97a94bed18629bded429f118f57f4f7821':
  Add explicit close of Scanner input
2014-04-11 17:18:14 +00:00
Elliott Hughes
d2a11d97a9 Merge "Add explicit close of Scanner input" 2014-04-11 17:14:39 +00:00
Narayan Kamath
80edaa676b am 24c089a8: Fix build.
* commit '24c089a8b5871b331441d0858aa164364b7737cb':
  Fix build.
2014-04-11 10:54:20 +00:00
Narayan Kamath
24c089a8b5 Fix build.
isScreenOn was changed to isInteractive.

Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
2014-04-11 10:50:43 +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
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
Narayan Kamath
1d26a3f1ef am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs
2014-04-10 09:23:33 +00:00
Narayan Kamath
0fd40cb100 am 80413c9f: Merge "Re-implement native library search and copies."
* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.
2014-04-10 09:23:30 +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
Ramin Zaghi
ff0c470833 System services detect and register app CPU ABIs
This patch uses the NativeLibraryHelper class to
match native libraries in an .apk package with
those listed in 'ro.cpu.abilist' property.
The result is stored in packages.xml and the
ApplicationInfo class.

This information will be used by the ActivityManager
to decide which zygote to use to launch the given
app.

Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
2014-04-09 17:20:13 +01:00
Ramin Zaghi
1378aba7ae Re-implement native library search and copies.
We now use a two step approach :

- First we look through the list of shared libraries in an
  APK, and choose an ABI based on the (priority)  list of ABIs
  a given device supports.
- Then we look through the list of shared libraries and copy
  all shared libraries that match the ABI we've selected.

This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.

The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).

bug: https://code.google.com/p/android/issues/detail?id=65053
bug: 13647418

Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
2014-04-09 17:16:40 +01: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