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
Joe Fernandez
55b38fadd0
docs: MediaRouteProvider Developer Guide
...
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
2014-04-02 15:35:15 -07:00
Ben Cheng
3399ec317d
am b386bfd7: am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit 'b386bfd791d77e24bcfe3261420f82b0a9d3851d':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 20:59:47 +00:00
Ben Cheng
b386bfd791
am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."
...
* commit '89dddcc948cb3e826bfddeefae73066849aba0fc':
Use default visibility for Snapshot::getLocalClip.
2014-04-02 20:54:47 +00:00
Ben Cheng
89dddcc948
Merge "Use default visibility for Snapshot::getLocalClip."
2014-04-02 20:51:00 +00:00
Michael Wright
744cf2b98f
am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev
...
* commit '4932a355f1594990173e0d9cd1fa38b8491c4a29':
Misc. buttons aren't gamepad keys.
2014-04-02 20:30:29 +00:00
Michael Wright
4932a355f1
Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev
2014-04-02 20:26:36 +00:00
Ben Cheng
65ba94f79d
Use default visibility for Snapshot::getLocalClip.
...
The method is in libhwui.so but used by libandroid_runtime.so
(via android_view_GLES20Canvas.cpp). If the compiler decides not to
inline this method, the linker won't be able to resolve the dependency
when it has hidden visibility.
The problem is found when testing GCC 4.9.
Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
2014-04-02 13:26:33 -07:00
Baligh Uddin
65b2d089c3
Import translations. DO NOT MERGE
...
Change-Id: Iedc52a08baa64f6294add074ebf597d09c06725a
Auto-generated-cl: translation import
2014-04-02 08:49:36 -07:00
Baligh Uddin
ca0513026a
Import translations. DO NOT MERGE
...
Change-Id: I3ba9a4dc3048b098598e12a78e7cc7dde521ea56
Auto-generated-cl: translation import
2014-04-02 08:41:45 -07:00
Ben Murdoch
cf61c9b71f
Update ViewRootImpl for 64bit functor type.
...
Change-Id: Ie9020f0276c58ebf0977e4aef725fbc26aaf67b2
2014-04-02 14:41:41 +01: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
Narayan Kamath
ea9e5ecac1
am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
...
* commit '17b1b8fe8c0c8f05f2077acc82428881bf591a78':
Move zygote startup logic to the frameworks.
2014-04-02 10:35:38 +00:00
Narayan Kamath
17b1b8fe8c
Merge "Move zygote startup logic to the frameworks."
2014-04-02 10:29:55 +00:00
Narayan Kamath
973b4663b0
Move zygote startup logic to the frameworks.
...
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.
The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
logging.
- We call env->FatalError() instead of using LOG(FATAL)
Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
2014-04-02 10:18:43 +01: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
Ricardo Cervera
04c2a55716
am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit 'c013eaad574bcb40152d90105d6fbc82293cbb11':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:20:22 +00:00
Ricardo Cervera
c013eaad57
am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit '5a218b186735534925d7fedb63f1c78a3a3ff543':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:15:31 +00:00
Ricardo Cervera
5a218b1867
am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
...
* commit '8e183798d573ad4777a5f01fd6db8f86ca0e120f':
docs: Added notes to use the last SDK version to the Build your First App class.
2014-04-02 00:08:11 +00:00
Ricardo Cervera
8e183798d5
Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
2014-04-02 00:03:00 +00: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
875eff832f
Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
2014-04-01 22:48:28 +00:00
Michael Wright
f46b5d466d
Misc. buttons aren't gamepad keys.
...
BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices. As such, we shouldn't treat them
as belonging to gamepads at all.
Bug: 13432364
Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4
2014-04-01 15:43:43 -07: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
Jeff Tinker
6dc8063d2a
am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
...
* commit '433a063309ba9ff9cdce4f9688e027c642a79505':
Support CAST V2 Authentication in MediaDrm
2014-04-01 22:00:49 +00:00
Craig Mautner
ffb22827d7
am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:56:55 +00:00
Jeff Tinker
433a063309
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
2014-04-01 21:54:29 +00:00
Craig Mautner
2b6fe2990d
am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:48:04 +00:00
Craig Mautner
c70f15fe29
am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2fc798a2270cda98366776af489d45c1043e831d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:41:15 +00:00
Jeff Tinker
e4095a80b6
Support CAST V2 Authentication in MediaDrm
...
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
2014-04-01 14:25:35 -07:00
Craig Mautner
2fc798a227
resolved conflicts for merge of 8c6e6e73 to klp-dev
...
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
2014-04-01 13:57:37 -07:00
Michael Kolb
2c73e08d36
am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev
...
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
Add outset to decor view measuring
2014-04-01 20:46:38 +00:00
Michael Kolb
17bbd976c0
Merge "Add outset to decor view measuring" into klp-modular-dev
2014-04-01 20:40:35 +00:00
Craig Mautner
8c6e6e7372
am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959
am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f
am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff
am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:43:41 +00:00
Craig Mautner
d1c82f8fc2
am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:36:48 +00:00
Craig Mautner
1cb3c1d381
am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit 'fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:30:41 +00:00
quddusc
913c903612
am f425e5ea: am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit 'f425e5ea05bf445ab97176fe4a79e54f976d22b8':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 19:29:52 +00:00
Scott Main
f80749c5c5
am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs
...
* commit 'c37960733aebed4ef4d64d72f7658534f9fd5698':
laptop image with redacted
2014-04-01 19:29:45 +00:00
Scott Main
402f23046c
am 3bd0a44b: am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs
...
* commit '3bd0a44bbf8de4dc1d190fffe91a10b8f1e2243f':
dashbaord update for 4/1/14
2014-04-01 19:29:41 +00:00
Ricardo Cervera
3b7432d2e4
am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
docs: Renamed the document on building with Android Studio
2014-04-01 19:29:38 +00:00
Craig Mautner
fc80fbe3d5
am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:24:23 +00:00
Craig Mautner
7bd0b65233
am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
...
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c
Fix FLAG_DISMISS_KEYGUARD not working
...
Fixes bug 13672528.
Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
2014-04-01 12:10:54 -07:00
quddusc
f425e5ea05
am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit 'c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 18:30:33 +00:00
quddusc
c7f403f46d
am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
...
* commit '5321e9bd48db680c618a490fb38c060c3c05beba':
docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
2014-04-01 18:24:38 +00:00
quddusc
5321e9bd48
Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs
2014-04-01 18:12:06 +00:00