• Home
  • History
  • Annotate
  • only in /frameworks/base/services/core/jni/
History log of /frameworks/base/services/core/jni/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
62f38d14c531e5983dafb2e0b93bae9f7769953c 23-Dec-2014 Sungsoo Lim <sungsoo@google.com> DO NOT MERGE Implement cloneTvInputEvent

memcpy() only copies the memory address value of device_info.audio_address,
and it could be invalid when onDeviceAvailable() is called.

Bug: 18819334
Change-Id: I827da8032a982abf3029874b8454ca79290bb0e0
(cherry picked from commit 898de6fd8c78d84ae1425e052b27a97ec6f230ad)
om_android_server_tv_TvInputHal.cpp
a617074c531dfa317e5051fa70ec6b6c21d14386 17-Dec-2014 Wonsik Kim <wonsik@google.com> DO NOT MERGE TIF: change TvInputHal events to run on its own thread

Bug: 18688119
Change-Id: Id60f82295cdbc45065be416c9828eae144b6799f
(cherry picked from commit 57b37f610d33989f1b23e1b8d9e61fb177456364)
om_android_server_tv_TvInputHal.cpp
1481a4282818939436f590d8c88aea2d19166b8e 17-Dec-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Pass port ID for set_audio_return_channel

This CL passes a port ID when enabling/disabling ARC in case
there are multiple HDMI ports that support the feature.

Bug: 18781204

Change-Id: I632518132bf07c8ae6f0ff5135429ca719b596b2
om_android_server_hdmi_HdmiCecController.cpp
c08eab81f30a3120ec0929d3508b4a78d498e1ff 11-Nov-2014 Craig Mautner <cmautner@google.com> Show error dialogs over apps that dismiss keyguard

Error dialogs absorb all input to ensure that they are not missed.
This can cause the screen to lock up if they are not displayed but
are still absorbing touches. This was what was happening when there
was an error dialog up at the same time as a phone call came in as
in b/17648830.

This fix recognizes when an app is dismissing the keyguard and
forces any error dialogs to be shown over such an app.

This also removes the private flags from the input system as they
are no longer needed.

Fixes bug 17648830.

Change-Id: I5c98b8265a1448b445fdb2f745fc78892f8656a4
om_android_server_input_InputWindowHandle.cpp
df1198401101805a335535dd08231cbb0e2af500 15-Oct-2014 destradaa <destradaa@google.com> Fix reference leak in GPS measurement JNI layer.
b/16727892
b/17075171

Change-Id: I5f41c6db114078b927e56a7614fa7c09a288e2b2
om_android_server_location_GpsLocationProvider.cpp
8f24a8b60f9afc1aedb89e7ee80ce65515439600 22-Oct-2014 Wonsik Kim <wonsik@google.com> TIF: fix wrong config comparison & confusing method name

TvStreamConfig should do deep comparison in TvInputHardwareManager
where the object gets created from binder calls. In addition to this
fix, modify [aA]ddStream to [aA]ddOrUpdateStream so that the method
name better reflects what it does.

Bug: 18027719
Change-Id: I43fa668f91cb9433beee97ee31b4b1f58f21bfcf
om_android_server_tv_TvInputHal.cpp
51938c205f41da95486b17ea645fd0ce2a73be82 19-Sep-2014 Mike Lockwood <lockwood@google.com> Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
109526fe4f01a2b7ac90106cf41966b2d872d03a 10-Sep-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Stub MHL Controller" into lmp-dev
9ee5e7e17f7d65620f21d1a42865981e7bc56593 09-Sep-2014 Mike Lockwood <lockwood@google.com> USB string descriptors are not UTF8, so it is not safe to treat them as such.

Add AndroidRuntime::NewStringLatin1() to convert non-UTF8 strings to Java strings.

Bug: 17427781
Change-Id: I7df1d4e94a7beebc8b1a74c0c0a163b794025ae8
om_android_server_UsbHostManager.cpp
f5e56d41a25b44e28db160350709aef7295e3119 09-Sep-2014 Michael Wright <michaelwr@google.com> Remove unused variables from UsbHostManager.

Change-Id: I68067b69de077667482633cc6ecd97ee94ecb699
om_android_server_UsbHostManager.cpp
781041239f2931ca16c902fb371cd041b057c918 26-Aug-2014 Jinsuk Kim <jinsukkim@google.com> CEC: Stub MHL Controller

Replace MHL Controller with a stub impl

Bug: 17259897

Change-Id: Id57bac363441f72b3da3f30d31c68c6d3b502237
ndroid.mk
nload.cpp
a6863ad62296a5280504165a1fbc70523940a9c8 05-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Allow for event dispatching when in non-interactive states." into lmp-dev
70af00abf73160235d4efe114fcf4753007a8ff3 04-Sep-2014 Michael Wright <michaelwr@google.com> Allow for event dispatching when in non-interactive states.

We need to allow for event dispatching in non-interactive states so
that we can enable a richer set of interactions when a device is
dozing (i.e. is in a low power state with an Always-on-Display).

Bug: 17167296
Change-Id: I8ae0f544a8106cb91ff38c2309b8b57cbe2f2c72
om_android_server_input_InputManagerService.cpp
52617bbff8607cdc208ba107ec111bd1471433cb 25-Aug-2014 Tsuwei Chen <tsuwei@google.com> Reload GPS configuration after carrier info is available.
Bug: 17110478
Change-Id: I1ecb71c4ca661df3dfeaea1622d73caeacb1350e
om_android_server_location_GpsLocationProvider.cpp
29564cd24589867f653cd22cabbaac6493cfc530 07-Aug-2014 Narayan Kamath <narayan@google.com> Remove system_server classes from the boot image.

We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
classes.jar. They are only used from there, and since they
use Class.forName, we want them to be loaded by the
system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
nload.cpp
2d8964cca7663b32ca339e1bb57eb4830488fb97 13-Aug-2014 destradaa <destradaa@google.com> Merge "Update FlpHardwareProvider native layer, to stop raising FatalErrors." into lmp-dev
ff8e6093fa5c9114d3565e0fb0d87bd4df3d777c 13-Aug-2014 destradaa <destradaa@google.com> Update FlpHardwareProvider native layer, to stop raising FatalErrors.

b/16800814

Change-Id: Ic619f37c02c7e4dddc4ef06369f8730cbd66e6bd
om_android_server_location_FlpHardwareProvider.cpp
931a37f992c738ebc5d3c82e424d94591798a4d7 13-Aug-2014 destradaa <destradaa@google.com> Add additional logging around AGPS IP Address handling.

The additional logging is expected to help troubleshoot and prevent the issue tracked by the
following bugs:
b/16875580
b/16961654

Change-Id: Ibee7fe0774efa3db77ab53af96c128ced186b40e
om_android_server_location_GpsLocationProvider.cpp
b82de3600f15edbff693d1362bf33140c2aabd33 05-Aug-2014 Wonsik Kim <wonsik@google.com> TIF: fix JTvInputHal::removeStream issue

Bug: 16803334
Change-Id: I3f92a12479cdded7a3bf572cc59e68367a0797ad
om_android_server_tv_TvInputHal.cpp
21aa3467cd14260418cc47334b656adf841a567c 29-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: fix TvInputHal bug for multiple devices

In addition, add toString() method to TvStreamConfig for easier
debugging.

Bug: 16561829, Bug: 16666251
Change-Id: Ic192aef30f4d193b73bac7bc93a1563aa9af4377
om_android_server_tv_TvInputHal.cpp
f9a274c9b8578dda6afeda422bff18b1577028b9 26-Jul-2014 destradaa <destradaa@google.com> Add support for sources in Geofencing APIs.

Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
om_android_server_location_FlpHardwareProvider.cpp
f4e0c0cb8ef22fdb20ae74b444c9f4b7d15ded8b 27-Jul-2014 Sreeram Ramachandran <sreeram@google.com> Allow VPNs to add/remove link addresses dynamically.

Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
ndroid.mk
om_android_server_connectivity_Vpn.cpp
0f208eb707926f0afc1ce073be866bedd4955aa2 27-Jul-2014 Jeff Brown <jeffbrown@google.com> Remove DozeHardware since it will not be used.

Bug: 16516536
Change-Id: I14597d3c9470c94e3bc5b8cff500d2fe6b2fd977
ndroid.mk
om_android_server_dreams_McuHal.cpp
nload.cpp
8c688ada2dc256a746429b10b2e7a47a52e9b02f 24-Jul-2014 Jinsuk Kim <jinsukkim@google.com> MHL controller for subcommand reception

Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
om_android_server_hdmi_HdmiCecController.cpp
c086a3df3b28996cd10ebe42c5f59035d054aa0d 18-Jun-2014 Terry Heo <terryheo@google.com> Add a frame capture API of TV input

- Added new permission CAPTURE_TV_INPUT

Bug: 15736756
Change-Id: I2ae8b2e3f5b1ad1d525854ed89ab2043cf66acbe
om_android_server_tv_TvInputHal.cpp
4b3e3931270f8e406fc806bc7fa1c2788256687d 22-Jul-2014 destradaa <destradaa@google.com> Expose Gps Navigation Messages in the platform.
b/16405976

Change-Id: Ic982ea2467d116585780c20c2fa7e974e50f8345
om_android_server_location_GpsLocationProvider.cpp
81cabb8a7fb5b61f16bf49c2757ccb51bc88e708 22-Jul-2014 destradaa <destradaa@google.com> Add uncertainty for GPS received TOW field.
b/16463499

Change-Id: I5dde8a2737d9345eb7f77edc64ab7286254a65e4
om_android_server_location_GpsLocationProvider.cpp
2102dd725540bcf51bf324a2775fbcffe45dd32f 19-Jul-2014 destradaa <destradaa@google.com> Update GPS HAL raw measurements support.

Align the GPS framework with the GPS HAL
b/16374800

Remove localTime field from API
b/16241708

Update Property containers for measurements to use bit masks
b/16238371

Change-Id: Id4db16c3153d0020bf2edb5a67f59353662762d0
om_android_server_location_GpsLocationProvider.cpp
963295ea105314e28e4ca9563aa09cb7440de4c3 11-Jul-2014 Andres Morales <anmorales@google.com> Permit settings to "wipe" the persistent partition

One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
om_android_server_PersistentDataBlockService.cpp
ea8a8a6076f04360de2d25b3e5853cde8026cd5f 24-Jun-2014 destradaa <destradaa@google.com> Update location framework to accept raw data from GPS HAL.

Change-Id: Ib4feca004b53fa89dcece4299974ab08913455a0
om_android_server_location_GpsLocationProvider.cpp
284c31b92e4e0d0b8095ae50c61db9c83c9d577c 11-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Update HdmiControlService JNI to the change in HAL definition

Change-Id: Iab235785c4d0242ab5845d1f8ad62d78770ff9c4
om_android_server_hdmi_HdmiCecController.cpp
6bc2c2c34f2b23eae79ad733c97a691734055c4f 07-May-2014 Paul Jensen <pauljensen@google.com> Convert Vpn from NetworkStateTracker to NetworkAgent.

This eliminates the need for the ConnectivityService.VpnCallback class.
This requires shifting VPNs to the new "network" netd API.
VpnService.protect() is modified to no longer go through ConnectivityService.
NetworkCapabilities is extended to add a transport type for VPNs and a
capability requiring a non-VPN (so the default NetworkRequest isn't satisfied
by a VPN).

bug:15409918
Change-Id: Ic4498f1961582208add6f375ad16ce376ee9eb95
om_android_server_connectivity_Vpn.cpp
68d4acd205e8c2da524e62734ca42847306cc029 02-Jul-2014 Andres Morales <anmorales@google.com> Service for reading and writing blocks to PST partition

Permits apps with permission
android.permission.ACCESS_PERSISTENT_PARTITION to obtain
a read and write data blocks to the PST partition.

Only one block ever exists at one time in PST. When
a client writes another block, the previous one is
overwritten.

This permits storing a block of data that will live
across factory resets.

Change-Id: I8f23df3531f3c0512118eb4b7530eff8a8e81c83
ndroid.mk
om_android_server_PersistentDataBlockService.cpp
nload.cpp
1e47ff9f8faa2927084b3da1e2d7d16ef0477637 08-Jul-2014 Wonsik Kim <wonsik@google.com> Merge "Implement support for buffer producer profile"
0b2691b6873f9d328884c5a9e5ab1fe308f3ee36 23-May-2014 Wonsik Kim <wonsik@google.com> Implement support for buffer producer profile

Bug: 15177117
Change-Id: I7776a8b2959281f10cba742ab75f15f80f6feecf
om_android_server_tv_TvInputHal.cpp
42230728b8212738c2351939c5577730f05a58de 07-Jul-2014 Jungshik Jang <jayjang@google.com> Add port number to hot plug event handler.

This is to remove a TODO about adding port number to
jni interface.

Bug: 15844074
Change-Id: I4dba0879527035a4cabad6cc80e359e6c1fd39b0
om_android_server_hdmi_HdmiCecController.cpp
4a9c3891d4f890109e02bc83fecf9bcdf56a9395 07-Jul-2014 Mike Reed <reed@google.com> kNative_8888_SkColorType is now kN32_SkColorType

Change-Id: I13421a21de611203c62c1c1c36570a8cc803907b
om_android_server_input_InputManagerService.cpp
839ae5f460caadf8580b7e0ab77e255d7a1ddae5 03-Jul-2014 Wonsik Kim <wonsik@google.com> TIF: Let TvInputHal handle multiple streams

Bug: 15579918
Change-Id: Iad972c36d675fb99b5950bcecf5925e660272cb4
om_android_server_tv_TvInputHal.cpp
ba147582b1ae504e9c00a0c94d715c061506b2ba 02-Jul-2014 Jinsuk Kim <jinsukkim@google.com> Remove the usage of TX_STATUS in HdmiControlService

Reflects the change to come in CEC HAL

Change-Id: I3a64e19bbdd8067855911ef11653fe64049b8880
om_android_server_hdmi_HdmiCecController.cpp
9e922ca97097cb1aa67ff53219d874ea2503a80d 20-Jun-2014 Wonsik Kim <wonsik@google.com> Fix native calls to null pointer

Since DEVICE_AVAILABLE event fires right after initialization, it
could happen before TvInputHal.mPtr is set, which causes calls to
null pointer. Fix the bug by allowing TvInputHal to wait for mPtr to
be set before calling native methods.

Change-Id: Id07f15130beb69f77c16bf3c735285c31ae4a3a4
om_android_server_tv_TvInputHal.cpp
b933055cf3f7f8ea89bfd3bc9c37a3891ff7310a 16-Jun-2014 Mike Reed <reed@google.com> stop using (deprecated) SkBitmap::Config

Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
om_android_server_AssetAtlasService.cpp
a358b53e1d0bb7a7fc08b0a4d2a2e256f3045859 12-Jun-2014 Wonsik Kim <wonsik@google.com> TvInputHardware: Add HDMI port ID

Bug: 15570939
Change-Id: I957804124fa5e417de8c98c6d41332609097d995
om_android_server_tv_TvInputHal.cpp
d7c29189aa639bfac1e6efcd222e65c2c8ecf3f1 27-May-2014 Wonsik Kim <wonsik@google.com> TvInputHardware: Integration with audio framework changes

TvInputHardwareManager detects AudioPort specified by tv_input and
connect source to sink via AudioManager.createAudioPatch().

Bug: 15177175
Change-Id: I2252eb0df2d8287889ed28cc7d76dc1a659fd08b
om_android_server_tv_TvInputHal.cpp
63dd3bb3602bc00557680432b08b49a5a15bcdb7 13-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Fixed a wrong path to HdmiPortInfo class

This fixes a JNI error for HdmiCecController

Change-Id: I8ce987dfa3126ecffd455a964c01d27fb9aa01eb
om_android_server_hdmi_HdmiCecController.cpp
0340bbc89f8162f9c2a298c98b03bfcdd1bc6e87 05-Jun-2014 Jinsuk Kim <jinsukkim@google.com> RoutingControlAction for HdmiControlService

Routing control action is initiated in various cases, such as manual
TV input port switching, routing change of a different CEC switch,
and so on. The action determines the device to be a new active source.

Change-Id: I1efcd6ff1919dd94d6fa0e0ffa6e430c48d4e9c6
om_android_server_hdmi_HdmiCecController.cpp
a6ce7708d6124224399241503fadcafe0c4684d4 10-May-2014 Jinsuk Kim <jinsukkim@google.com> DeviceSelectAction for HdmiControlService

DeviceSelectAction is the main handler for the API deviceSelect() which is
used to choose a new active source among logical devices on the bus.

Change-Id: I77582a1f873423fc316d89f67a89a867461a76b2
om_android_server_hdmi_HdmiCecController.cpp
092b445ef898e3c1e5b2918b554480940f0f5a28 11-Jun-2014 Jungshik Jang <jayjang@google.com> Move message handling logic to local device instead of service.

Local device is in charge of handling incoming messages
and for some messages such as <set menum language> or
<report physical address> each device has slightly different
behavior. Instread of checking destination address and
local device status from service, this change leaves it
to each local device.
Note that some messages are still left on service
and will be refactored in the following changes.

Along with this, following changes are included.
1. add missing jin interfaces
set_option
set_audio_return_channel
is_connected
Note that get_port_info is under review of jinsuk's change
2. if tv device receives <Report Physical Address>,
starts NewDeviceAction.
3. add constants variables related to new interfaces.
4. add two helper methods for physical address and vendor
id handling

Change-Id: I9c9d04744bc09fbf38431ecfa6e77097b0618a37
om_android_server_hdmi_HdmiCecController.cpp
96a14701c0858ffa38b9488fae3b9a37a115cbf9 05-Jun-2014 destradaa <destradaa@google.com> IPv6 support for GPS HAL.

Change-Id: Iacaf3ab86009975ba07e1a13dbe539cf47c5a6f7
om_android_server_location_GpsLocationProvider.cpp
5adb67d4ce228a3afa6512e87d61c4d581dfd1e3 09-Jun-2014 Ed Heyl <edheyl@google.com> merge 4ce22057, regen api/current.txt

Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
3f48068d782b81dc1c8a0190b91fbb2862007244 06-Jun-2014 Jinsuk Kim <jinsukkim@google.com> Remove HdmiCecService

The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
ndroid.mk
om_android_server_hdmi_HdmiCecService.cpp
nload.cpp
5ce66d8dcc786b3d6a0fdfb42074e6c9741590ef 29-May-2014 destradaa <destradaa@google.com> Re-work the initialization of FLP HAL to make isSupported() static.
b/14839888

Change-Id: Ib5973586fd8a2d4a1e5fd09cf82dd4f4493398d0
om_android_server_location_FlpHardwareProvider.cpp
4c9e57f156d3cbd86b38e9897dfdab81964efe90 03-Jun-2014 Jae Seo <jaeseo@google.com> resolved conflicts for merge of ebe661c4 to master

Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
d5cc4a281e7ce29d1e8687ff3394b57a3a549260 31-May-2014 Jae Seo <jaeseo@google.com> Put TV Input Framework under android.media.tv, including TvContract

Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
om_android_server_tv_TvInputHal.cpp
9ec2eabe5ae9b17064412833ae11b113da453b75 02-Jun-2014 Florin Malita <fmalita@google.com> Merge "Add a native Canvas wrapper."
e74282b70b4a8ad1186fdc32204e1ecee16cd901 29-May-2014 Jinsuk Kim <jinsukkim@google.com> DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService

HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
om_android_server_hdmi_HdmiCecController.cpp
c47e26ca2ff6f032c4b3a094810b1d1062bcb1ff 27-May-2014 Jungshik Jang <jayjang@google.com> DO NOT MERGE: Add cec message handler to hdmi cec jni implementation

Notification for incoming cec message can be issued
from any thread but jni can call java method
in the thread that jni knows like service thread.
So this change delegates incoming message to
jni-friendly thread, service thread by exploit
looper of service thread.

Change-Id: If3b141d917df3e209912af1778eb509777199969
om_android_server_hdmi_HdmiCecController.cpp
5c3d927e17e98e8fd4a9f3c86f7f4def0bcfa816 08-May-2014 Florin Malita <fmalita@google.com> Add a native Canvas wrapper.

Instead of storing a direct SkCanvas reference, Canvas now tracks
an opaque native wrapper class. The native wrapper can be used to
store additional info for emulating deprecated Skia features
(at this point it only stores a canvas).

Some notes:

* all native handle -> SkCanvas conversions are routed through a
handful of native utility methods.
* safeCanvasSwap() refactored as a lower level setNativeBitmp() - which
is what clients need.
* removed unused get_thread_msec() (Canvas.cpp)

Change-Id: I715a5a6f1e1621c1cfc1e510ae4f2ea15cf11114
om_android_server_AssetAtlasService.cpp
8692fc68a413c7aca75f094bb02bcbabcc277c73 29-May-2014 Jinsuk Kim <jinsukkim@google.com> Stop publishing HdmiCecService, start publishing HdmiControlService

HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
om_android_server_hdmi_HdmiCecController.cpp
4085d0ef62554c7e139b82bca0f97161bb159f8c 27-May-2014 Jungshik Jang <jayjang@google.com> Add cec message handler to hdmi cec jni implementation

Notification for incoming cec message can be issued
from any thread but jni can call java method
in the thread that jni knows like service thread.
So this change delegates incoming message to
jni-friendly thread, service thread by exploit
looper of service thread.

Change-Id: If3b141d917df3e209912af1778eb509777199969
om_android_server_hdmi_HdmiCecController.cpp
c22dbb69194c8e8fe2a32326d1f37a738cad0904 26-May-2014 Wonsik Kim <wonsik@google.com> Revert "Revert "Add physical TV input handling to TvInputManagerService""

This reverts commit 1940e197a8de186df5edf0b78e0907ae539bd215.

Bug: 14118245, Bug: 15197740
Change-Id: Ia308f16d2ed8ec55112a4d21c180ccb97e8d7c6a
ndroid.mk
om_android_server_tv_TvInputHal.cpp
nload.cpp
be9cd8eb3fe64a572f9c7dfc41f04defd46a752d 15-May-2014 Jungshik Jang <jayjang@google.com> Add ARC commands

ARC, Audio Return Channel is newly introduced in HDMI CEC 1.4.
Here is a list of new command
<Initiate ARC>
<Report ARC Initiated>
<Report ARC Terminated>
<Request ARC Initiation>
<Request ARC Termination>
<Terminate ARC>

Along with it replaced <Get OSD Name> with <Give OSD Name>
which is renamed in CEC 1.4.

Change-Id: If4a7aedef839c8413a8e3b5f66f3df0c7234104b
om_android_server_hdmi_HdmiCecService.cpp
531fecca1c55d2f60977a57f5eb546d4d202fb97 08-May-2014 Florin Malita <fmalita@google.com> Merge "Encapsulate Canvas.mNativeCanvas"
c677675e9c465dc1de21ecf2e0421835c7eb55b4 07-May-2014 Florin Malita <fmalita@google.com> Encapsulate Canvas.mNativeCanvas

Currently, the native canvas is accessed/manipulated from several
unrelated classes.

In order to facilitate SaveFlags emulation, this CL encapsulates
the field and refactors its external users.

Two main changes:

* new getNativeCanvas() getter for use in Java-level clients.
* JNI canvas swappers (GraphicsBuffers, Surface, TextureView &
AssetAtlasService) are refactored based on the exising/equivalent
safeCanvasSwap() Canvas method.

Change-Id: I966bd4898f0838fb3699e226d3d3d51e0224ea97
om_android_server_AssetAtlasService.cpp
a9095ba488ea18aeafaf9c3a8258bf9f459bda71 02-May-2014 Jungshik Jang <jayjang@google.com> Implement more native api for Hdmi cec.

HAL interface for CEC has more apis that haven't
connected with HdmiCecController.
Here is a list of apis.

1. addLogicalAddress
2. clearLogicalAddress
3. getPhysicalAddress
4. getVersion
5. getVendorId

Verified that it does not affect to other components in nakasi

Change-Id: I535bde47c43dd25bbede002c0a2aefbe86779076
om_android_server_hdmi_HdmiCecController.cpp
97babdc92be8c81325f3a9f4f520a8c20bed177d 02-May-2014 Jungshik Jang <jayjang@google.com> Fix unmatched jni method name.

It breaks systemserver

Change-Id: Iecc5600d64a273c4bbf51bd8fd779a79a3dab107
om_android_server_hdmi_HdmiCecController.cpp
e9c77c88ea34a66f83a94f960547275c0ff6bd07 24-Apr-2014 Jungshik Jang <jayjang@google.com> Implement native send and receive logic for HdmiCecController.

This change includes native jni implementation for
incoming and outgoing message of CEC.
For incoming message, native layer converts it into three
pieces, source address (initiator), destination address (follower)
and data body which includes opcode. In Java layer, it is delegated to
main io thread. For now all messages are rejected by sending <Feature Abort>
to initiator.
For outoging message, all messages are sent to io thread and it delegates
it into native layer. Native logic converts it into cec_message and
pass it to HAL so that HAL performs sending message.
In order to handle <Feature Abort> message, added [Abort reason] which is
defined in hdmi_cec.h.

Change-Id: If9fd74745f476105e5cfae964e39c78bae69d3e2
om_android_server_hdmi_HdmiCecController.cpp
15c32f2699f03ba2065e663b3beb2c8d328f42ef 30-Apr-2014 Michael Wright <michaelwr@google.com> Merge "Move key attribute information into KeyEvent."
c79224e4b70c27293a6744f29d73653a3c5ee018 29-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 60037302: am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev

* commit '60037302208be033442cc3f3c50a25c7064ebbd1':
Move logical address allocation logic into native service from HAL
60037302208be033442cc3f3c50a25c7064ebbd1 29-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev

* commit '8fe27e881851921a90882f7d4da142bf936c5549':
Move logical address allocation logic into native service from HAL
337d9d2edc262141f9b8f684e53aae5e47f0ae13 23-Apr-2014 Michael Wright <michaelwr@google.com> Move key attribute information into KeyEvent.

This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
om_android_server_input_InputManagerService.cpp
0792d37385e60aa8d73f8df174d0a32f4f618bc4 23-Apr-2014 Jungshik Jang <jayjang@google.com> Implement skeleton of new HDMI Control Service.

HdmiCecService is a system service handling HDMI-CEC features
and command. Recently we found out that industry has more
requirements to support HDMI-CEC. Also, MHL is another
standard should be in our pocket. Basically, MHL is
a standard to support communication between mobile device
and TV or Av device. As CEC is a control standard over HDMI
cable, MHL has control channel for peer device.
There behavior is very similiar. Both have commands that
can change Tv's current input and can send/receive key
to other device to control other deivce or TV.

In order to cover both CEC and MHL, current HdmiCecService
implementation has limitation. We had several
session of discussion and decided to refactor
HdmiCecService into HdmiControlService.
For each standard it will have separate controller instance
like HdmiCecController and HdmiMhlController.

In this change I didn't touch original HdmiCecService
because some component, like cast receiver, uses HdmiCecService.
For a while we will keep HdmiCecService until HdmiControlService
accomodates all features of HdmiCecService.

Change-Id: I5485280ab803dbf071d898bfbe34be0b11ce7958
ndroid.mk
om_android_server_hdmi_HdmiCecController.cpp
nload.cpp
cbafd1b3ead132f4b17d367ed8cdae7c16edc2e7 20-Apr-2014 Jinsuk Kim <jinsukkim@google.com> 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
om_android_server_hdmi_HdmiCecService.cpp
4bdcd299da48f9abe5f9c67abed0dbe79080445d 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> 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
55dab4dd3b5b56ade91c012d688b581b6cbdebdf 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev

* commit 'b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
b11f250e09195d1ab250c93bfed0b31ed3a40f3d 11-Apr-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
61791075f4422cfef00fda325d6ae07293dd262f 07-Apr-2014 Jinsuk Kim <jinsukkim@google.com> 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
om_android_server_hdmi_HdmiCecService.cpp
4e5c089ef3e62e7f658e71c0be262d09bd3e399b 11-Apr-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 337e764d to master

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
337e764debde56b1462fb5f2794b3e917d8a42e2 11-Apr-2014 Jeff Brown <jeffbrown@google.com> am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev

* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
037c33eae74bee2774897d969d48947f9abe254f 09-Apr-2014 Jeff Brown <jeffbrown@google.com> 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
om_android_server_input_InputManagerService.cpp
om_android_server_power_PowerManagerService.cpp
om_android_server_power_PowerManagerService.h
118d113478a2c58e7997f926a8dd1bc5ca5f5dc8 05-Apr-2014 Michael Wright <michaelwr@google.com> Merge "Fix size_t format specifier"
654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea 05-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> PowerManager: Fix build

fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808

Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
om_android_server_power_PowerManagerService.cpp
9ecba5269b1e114439f4515a433d73d450f04769 05-Apr-2014 Michael Wright <michaelwr@google.com> Fix size_t format specifier

Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
om_android_server_input_InputManagerService.cpp
7716b7d8ef9addb913bbc4bdd3153fa36bd1aa87 04-Apr-2014 Leon Scroggins <scroggo@google.com> Merge "Update to call new Skia APIs."
f20a5eb279035d462e1f5d9895f4eb66cc152215 02-Apr-2014 Ruchi Kandoi <kandoiruchi@google.com> PowerManager: add powerHint method

Add powerHint method to IPowerManager for passing power hints from other
processes.

Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
om_android_server_power_PowerManagerService.cpp
cc11f15f76a62ded3e403cb2bc818c6aa5bf261c 31-Mar-2014 Leon Scroggins <scroggo@google.com> Update to call new Skia APIs.

I816129d49c0118453222916f3c818eccac33663d merges a new version of
Skia that updates various APIs. Call the new ones.

SkBitmap::copyTo now takes an SkColorType instead of an
SkBitmap::Config, so do the conversion with
SkBitmapConfigToColorType or use the enum when it makes sense.

Call SkImageDecoder::decodeSubset instead of (deprecated)
SkImageDecoder::decodeRegion.

Override SkCanvas::ClipVisitor::clipRRect in ClipCopier.

In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was
previously called inside the clip call, to determine the return value.

For various SkPaint effects, call the new factories (as the constructors
have been made protected).

Implement SkJavaOutputStream::bytesWritten(), overriding a new pure
virtual function on SkWStream.

Update Matrix calls to always return true (since SkMatrix calls no
longer return a value).

Depends on I816129d49c0118453222916f3c818eccac33663d (skia).

Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
om_android_server_input_InputManagerService.cpp
f60283598751cbbdb65b2a59d2294e23bb4dfb99 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
Use build property for CEC device OSD name
f2fe3505dac16dfa990fbab56713abab6ba0bc54 03-Apr-2014 Jinsuk Kim <jinsukkim@google.com> 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
60b17cc0944a855d6a867d7674c9c33b1251a3f7 28-Mar-2014 Jinsuk Kim <jinsukkim@google.com> 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
om_android_server_hdmi_HdmiCecService.cpp
00bc2834537dec9e407da5cf4573048189f45289 31-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev

* commit '2e59bd788546e29e48b85bda72da6af61704113d':
Replace individual methods with a consolidated CEC nativeSendmessage
2e59bd788546e29e48b85bda72da6af61704113d 31-Mar-2014 Jinsuk Kim <jinsukkim@google.com> 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
ecd072161ec57ba8dfb26659511c0f6605601560 27-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 22d07464 to master

Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
22d074643ed0d010ebfdb0fca685d65eb2632e58 27-Mar-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
40a00a341b72490c6291b3aac65bc7a10b3e10ad 24-Mar-2014 Jinsuk Kim <jinsukkim@google.com> 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
om_android_server_hdmi_HdmiCecService.cpp
a1bd79268be693f04f4adee90673d6ed400cc9fd 21-Mar-2014 Dianne Hackborn <hackbod@google.com> Battery stats: track actually running time

Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use. Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
om_android_server_am_BatteryStatsService.cpp
a42cb8b0e2b8fdfbac1a6590d6b60814caa01088 21-Mar-2014 Colin Cross <ccross@android.com> resolved conflicts for merge of a67e34c8 to master

Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
f2fecf48f740a079cf9015ea8c2695039ca11d81 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev

* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
Add HDMI-CEC service
c61f4dd744b1b0396703aa58eb22fc31d2b7050e 21-Mar-2014 Jinsuk Kim <jinsukkim@google.com> Merge "Add HDMI-CEC service" into klp-modular-dev
4f512fb451c8ddcea852645c5c24314c20c0974b 28-Feb-2014 Jinsuk Kim <jinsukkim@google.com> Add HDMI-CEC service

This CL adds a system service handling HDMI-CEC protocol. The service
is equipped with the capability sending/receiving HDMI-CEC messages

Not all the messages are in place. Currently it has messages to support
a few features only, as follows:

- One touch play
- System information
- Routing control (partially - active source status maintenance only)
- Device OSD transfer
- Power status

It will be extended to cover the wider usages in the follow up CLs.

The CEC standard version referenced in the implementation is 1.3a.

Change-Id: Ifed0b02f52ebf098eddb3bd0987efbf353b7e8fe
ndroid.mk
om_android_server_hdmi_HdmiCecService.cpp
nload.cpp
4b59883afd498dd993263c95aa6db84cbe7c49b4 14-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 7c2b1625: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

* commit '7c2b1625d66d3c80c313160f78c8bccd9499539e':
Remove SO_BINDTODEVICE from VPN protect
7c2b1625d66d3c80c313160f78c8bccd9499539e 14-Mar-2014 Chad Brubaker <cbrubaker@google.com> am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

* commit '78f204aed8c0f3c8174616801d66f96a9a00a5fd':
Remove SO_BINDTODEVICE from VPN protect
306c46884eb3121a981a0d1ed0c5461908c227fc 12-Mar-2014 RoboErik <epastern@google.com> am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge

* commit 'ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd':
b/12068020 Make kb layouts only unique to vendor/product. Do not merge
ca9eef6203b7cfb0084f8305d4dcc5d70a7a25cd 16-Dec-2013 RoboErik <epastern@google.com> b/12068020 Make kb layouts only unique to vendor/product. Do not merge

This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/399886/

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: I1f2508561992080459310d5a644dad65a9c24f1a
om_android_server_input_InputManagerService.cpp
d52207423225bcd99e94276e9d0fc2cb5f905602 10-Mar-2014 Jason Gerecke <killertofu@gmail.com> Support unique calibration per orientation

Updates the format of the calibration XML to store the Surface rotation
that a specific calibration applies to. Also updates the API to require
a rotation value for get/set, and has the native framework supply this
according to the current rotation whenever it changes.

Change-Id: I72b6703f646dd18db537365c5c9843f720a5f41e
om_android_server_input_InputManagerService.cpp
857aa7be880c53d78f72a9f227cbdf72ee68d587 28-Jan-2014 Jason Gerecke <killertofu@gmail.com> Initialize mAffineTransform and update on modification

This patch causes the InputReader to update its mAffineTransform to reflect
the currently-set calibration on startup and whenever its value is changed
through the InputManagerService.

Change-Id: I81c76e8cf168728ee140abaf148e1cd31687d5af
om_android_server_input_InputManagerService.cpp
c51cf03cf2458c8c137f60c7379f2cccf681d16f 03-Mar-2014 Dianne Hackborn <hackbod@google.com> Start recording wakeup reasons in battery history.

Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel. These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
ndroid.mk
om_android_server_am_BatteryStatsService.cpp
nload.cpp
f87b2248497223a18ee0e5403967a5de55d8cbb5 28-Feb-2014 Chad Brubaker <cbrubaker@google.com> Merge "Remove SO_BINDTODEVICE from VPN protect"
4915fb22c71a56a629116751b2d7783a9c6fde4c 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge "Cleanup unnecessary includes for libskia."
7531aa22355cf03f51def61ba67f1636bf85f408 13-Jan-2014 Mike Lockwood <lockwood@google.com> Add support for USB devices with multiple configurations and alternate interfaces

Added UsbConfiguration class, as well as accessors to UsbDevice to get configuration list
Added methods to UsbDeviceConnection to select configurations and alternate interfaces.

Also added accessors for USB descriptor name strings and fixed some memory leaks in the JNI code.

Bug: 12425052
Change-Id: Idb990f4d5c054a8cb997eb3f440f6da9f83bce05
om_android_server_UsbHostManager.cpp
950fe8f8d4d654e645fa7205ca275b5a03feb214 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Cleanup unnecessary includes for libskia.

The libskia target exports all of its public includes directories so
redefining them here is redundant. Also this cleans up and makes it
obvious where the framework is making using of private Skia headers.

Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
ndroid.mk
4418372b21e91f6d4b9e11931dd87a90a023d79e 22-Feb-2014 Greg Hackmann <ghackmann@google.com> am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
0cab896a987f6687affd5c50c3bdbe10745c8dff 22-Feb-2014 Greg Hackmann <ghackmann@google.com> resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
17ab38f8a87bc90eab11373f878f220ce3031de6 27-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make AssetAtlasService 64-bit compatible

Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)

Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
om_android_server_AssetAtlasService.cpp
10102e4c0e501333a12b38a5cfe709d1558d84dd 21-Feb-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of baaa080b to master

Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
90506a41c6b85cf7e65b663480e4fe003a99c8c2 20-Feb-2014 Jeff Brown <jeffbrown@google.com> 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.
2687550272ba061448f5d5b914700dc335299ee7 31-Jan-2014 Jeff Brown <jeffbrown@google.com> 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
ndroid.mk
om_android_server_dreams_McuHal.cpp
om_android_server_input_InputManagerService.cpp
nload.cpp
520a5673fbe8bff90954045b24a361982861ef8d 20-Feb-2014 Narayan Kamath <narayan@google.com> am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
AArch64: Make AssetAtlasService 64-bit compatible
e62c4a10cbcf6946d505470d8cc44c6855c679b3 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> 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
37d894a42b5744e3e5def5fbfcc641fe3afa2063 18-Feb-2014 Jeff Sharkey <jsharkey@android.com> am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
Structure device not freed in error case
bcf12b302cd2715de54493808b2503de05c53757 11-Feb-2014 Chad Brubaker <cbrubaker@google.com> Remove SO_BINDTODEVICE from VPN protect

SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
om_android_server_connectivity_Vpn.cpp
d430354c6b6b3b39c35e8af90007414c325ccb2d 13-Feb-2014 Andreas Huber <andih@google.com> Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.""
9ae000ca8c05ad6f700ad7bf119bbc92fb964b57 13-Feb-2014 Andreas Huber <andih@google.com> Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."

This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
ndroid.mk
04f0cab79d1499a5fe27330bb30dd94151b82880 13-Feb-2014 Andreas Huber <andih@google.com> Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
7825334929b098b36e1144872200e75ba6d24b13 07-Feb-2014 Andreas Huber <andih@google.com> Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.

AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
ndroid.mk
be83e4a08e909b773ffc06a6e59446deadb8af8b 12-Feb-2014 Jeff Brown <jeffbrown@google.com> am 38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)

* commit '38f96e5020b3e82b98fe97b0be363a5ad185860f':
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
ca9bc702df5c14a89c9b8b0109a05894bf74962e 11-Feb-2014 Jeff Brown <jeffbrown@google.com> Add support for injecting events into ActivityContainers.

Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
om_android_server_input_InputManagerService.cpp
38f96e5020b3e82b98fe97b0be363a5ad185860f 11-Feb-2014 Jeff Brown <jeffbrown@google.com> Add support for injecting events into ActivityContainers. (DO NOT MERGE)

Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
om_android_server_input_InputManagerService.cpp
0d148c8b4ed94891d00acf20aa724493629970e9 11-Feb-2014 Michael Wright <michaelwr@google.com> Merge "Move inputservice over to frameworks/native"
d6b473713f43dec0828971854fe1018642cfaf27 11-Feb-2014 Michael Wright <michaelwr@google.com> Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
ndroid.mk
om_android_server_input_InputApplicationHandle.h
om_android_server_input_InputManagerService.cpp
om_android_server_input_InputWindowHandle.h
om_android_server_power_PowerManagerService.h
7f258f970e2123131638665c9d6674a7e1c7e4ea 11-Feb-2014 Narayan Kamath <narayan@google.com> am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit 'a9d171bd5bab29feaef409489ed23d3c490285ce':
Use long to store pointers in ConsumerIrService
a9d171bd5bab29feaef409489ed23d3c490285ce 11-Feb-2014 Narayan Kamath <narayan@google.com> am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService"

* commit '5c770dfba2846ee173d147fd974f8e9f073c1534':
Use long to store pointers in ConsumerIrService
453fa30ab2dbff5934e551323763200fac96d723 11-Feb-2014 Michael Wright <michaelwr@google.com> Revert "Move inputservice over to frameworks/native"

This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.
ndroid.mk
om_android_server_input_InputApplicationHandle.h
om_android_server_input_InputManagerService.cpp
om_android_server_input_InputWindowHandle.h
89e5c7ebb37fabc4368e87e17a502db62598bd61 10-Feb-2014 Michael Wright <michaelwr@google.com> Move inputservice over to frameworks/native

Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
ndroid.mk
om_android_server_input_InputApplicationHandle.h
om_android_server_input_InputManagerService.cpp
om_android_server_input_InputWindowHandle.h
a407d6a003d746fa0aff50f7ba5da61f19a85b75 06-Feb-2014 Michael Wright <michaelwr@google.com> Remove SkRegion dependency from libinput

This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.

Change-Id: I755e6267996c93fe700f1056327386923287575a
om_android_server_input_InputWindowHandle.cpp
583b7b16718b2787e64f1f26e476d349b96a909a 28-Jan-2014 Narayan Kamath <narayan@google.com> am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"

* commit '39a789bf6efd5c3478a442e60e896cae371fd04c':
AArch64: Make graphics classes 64-bit compatible
36bef0bf30d6bae48cf3837df351075ca4fce654 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
om_android_server_AssetAtlasService.cpp
7023df08f14ec5dee76ac54c03e870f84e297636 27-Jan-2014 Narayan Kamath <narayan@google.com> Revert "AArch64: Make graphics classes 64-bit compatible"

This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976.

Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
om_android_server_AssetAtlasService.cpp
18b4cbeedef21c1fa666a110a157bab66edff976 20-Jan-2014 Ashok Bhat <ashok.bhat@arm.com> AArch64: Make graphics classes 64-bit compatible

This a merger of two commits submitted to AOSP by
the following authors:

ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com

Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.

Commit messages below:

================================================
AArch64: Make graphics classes 64-bit compatible

Changes in this patch include

[x] Long is used to store native pointers as they can
be 64-bit.

[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)

[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

==================================================================

AArch64: Use long for pointers in graphics/Camera

For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

===================================================================

Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
om_android_server_AssetAtlasService.cpp
2dfae9bea104c0594fd5641f9704f34b204abd87 08-Jan-2014 RoboErik <epastern@google.com> Merge "b/12068020 Make kb layouts only unique to vendor/product"
43bc1c07d25b7f278a860bbb9118f46ac732593a 08-Jan-2014 Mike Lockwood <lockwood@google.com> am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"

* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
Added missing USB device descriptor fields needed for intent filters
e853de1f10820da1bc7b6bf13faadaf835239c29 08-Jan-2014 Narayan Kamath <narayan@google.com> am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712"

* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
Fix a bug introduced in change 73712
3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85 08-Jan-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 92ae0347 to klp-modular-dev

Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
fb290df3c9a6f37ec050163029e25844de2f8590 16-Dec-2013 RoboErik <epastern@google.com> b/12068020 Make kb layouts only unique to vendor/product

Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
om_android_server_input_InputManagerService.cpp
9158825f9c41869689d6b1786d7c7aa8bdd524ce 22-Nov-2013 Amith Yamasani <yamasani@google.com> Move some system services to separate directories

Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
ndroid.mk
om_android_server_AlarmManagerService.cpp
om_android_server_AssetAtlasService.cpp
om_android_server_ConsumerIrService.cpp
om_android_server_SerialService.cpp
om_android_server_SystemServer.cpp
om_android_server_UsbDeviceManager.cpp
om_android_server_UsbHostManager.cpp
om_android_server_VibratorService.cpp
om_android_server_connectivity_Vpn.cpp
om_android_server_input_InputApplicationHandle.cpp
om_android_server_input_InputApplicationHandle.h
om_android_server_input_InputManagerService.cpp
om_android_server_input_InputWindowHandle.cpp
om_android_server_input_InputWindowHandle.h
om_android_server_lights_LightsService.cpp
om_android_server_location_FlpHardwareProvider.cpp
om_android_server_location_GpsLocationProvider.cpp
om_android_server_power_PowerManagerService.cpp
om_android_server_power_PowerManagerService.h
nload.cpp