OSDN Git Service
Chris Craik [Fri, 11 Apr 2014 22:50:34 +0000 (22:50 +0000)]
am
dd35634c: Merge "Fix BitmapMesh buffer copy"
* commit '
dd35634cb0059b4b745161eb80234d8e8da38033':
Fix BitmapMesh buffer copy
Chris Craik [Fri, 11 Apr 2014 22:46:07 +0000 (22:46 +0000)]
Merge "Fix BitmapMesh buffer copy"
Fabrice Di Meglio [Fri, 11 Apr 2014 22:26:23 +0000 (22:26 +0000)]
am
296832e0: Merge "Fix constructors for SearchIndexableData and SearchIndexableResource"
* commit '
296832e0e5ac007aecd5824dede840d1f403ced0':
Fix constructors for SearchIndexableData and SearchIndexableResource
Fabrice Di Meglio [Fri, 11 Apr 2014 22:19:22 +0000 (22:19 +0000)]
Merge "Fix constructors for SearchIndexableData and SearchIndexableResource"
Fabrice Di Meglio [Fri, 11 Apr 2014 22:15:34 +0000 (15:15 -0700)]
Fix constructors for SearchIndexableData and SearchIndexableResource
- fix locale initialization
- fix constructor chain
Change-Id: Id072574cca79fd49013e0b796b98a12d0bb8459f
Amith Yamasani [Fri, 11 Apr 2014 22:04:41 +0000 (22:04 +0000)]
am
8f993de8: Merge "Expose an API to generate a badged icon for managed profiles."
* commit '
8f993de81f9e9bcfd136c42bb6bf12114fedfd36':
Expose an API to generate a badged icon for managed profiles.
Amith Yamasani [Fri, 11 Apr 2014 22:01:15 +0000 (22:01 +0000)]
Merge "Expose an API to generate a badged icon for managed profiles."
Amith Yamasani [Fri, 11 Apr 2014 21:57:12 +0000 (14:57 -0700)]
Expose an API to generate a badged icon for managed profiles.
Change-Id: I6257f43934ba6eefe752003942d8d3bcf207d5f9
Paul McLean [Fri, 11 Apr 2014 21:25:07 +0000 (21:25 +0000)]
am
fd7d3108: Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."
* commit '
fd7d31087bcd40b825b0eee3058e2298d8648e9f':
Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices.
Paul McLean [Fri, 11 Apr 2014 21:25:03 +0000 (21:25 +0000)]
am
d1d7c491: Merge "Revert "Revert "Initial implementation of USB Audio output."""
* commit '
d1d7c491601a3fd1547c31606e1b8386db068b9c':
Revert "Revert "Initial implementation of USB Audio output.""
Paul McLean [Fri, 11 Apr 2014 21:18:51 +0000 (21:18 +0000)]
Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."
Paul McLean [Fri, 11 Apr 2014 21:18:35 +0000 (21:18 +0000)]
Merge "Revert "Revert "Initial implementation of USB Audio output."""
Chris Craik [Fri, 11 Apr 2014 20:40:05 +0000 (13:40 -0700)]
Fix BitmapMesh buffer copy
Change-Id: I7c1a3651c7d91d7ff37ecbe18d974fa8cb1cf415
John Reck [Fri, 11 Apr 2014 20:21:18 +0000 (20:21 +0000)]
am
c70f3db8: Merge "Simplify matrix calculations"
* commit '
c70f3db80ad522bdb5938b5944b3d9c7d7758f12':
Simplify matrix calculations
John Reck [Fri, 11 Apr 2014 20:14:46 +0000 (20:14 +0000)]
Merge "Simplify matrix calculations"
John Reck [Fri, 11 Apr 2014 15:54:47 +0000 (08:54 -0700)]
Simplify matrix calculations
Bug:
13913604
Change-Id: I2c0f85a34e1e520050a5a6131306d6b7c352d827
Aravind Akella [Fri, 11 Apr 2014 19:44:01 +0000 (19:44 +0000)]
am
d951ab23: am
8ebd66c2: am
cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit '
d951ab230d80631731ef12b5d76c678c30165d6a':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Aravind Akella [Fri, 11 Apr 2014 19:40:31 +0000 (19:40 +0000)]
am
8ebd66c2: am
cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit '
8ebd66c259602f6b0be26fdfd3fe2f55538f6424':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Aravind Akella [Fri, 11 Apr 2014 19:34:51 +0000 (19:34 +0000)]
am
cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
* commit '
cd4c1c714c37a1bc7ba35ebd2509eca4f0f6a314':
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Aravind Akella [Fri, 11 Apr 2014 19:32:38 +0000 (19:32 +0000)]
Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev
Paul McLean [Thu, 10 Apr 2014 23:02:55 +0000 (16:02 -0700)]
Implement USB Audio across Nexus Devices
Fix issues with connecting non-audio USB devices.
https://b.corp.google.com/issue?id=
13745966
https://b.corp.google.com/issue?id=
8281454
https://b.corp.google.com/issue?id=
13751080
https://b.corp.google.com/issue?id=
4643412
Change-Id: I1186f69a6c5f50279a1225a77fb5d4f7a8eda3cb
Jose Lima [Fri, 11 Apr 2014 19:07:56 +0000 (19:07 +0000)]
am
68b9d975: am
9e99cab7: am
970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '
68b9d97593d2ec79892813ab06f1b89c41de64b0':
Added getLeanbackLaunchIntentForPackage()
Jose Lima [Fri, 11 Apr 2014 19:01:21 +0000 (19:01 +0000)]
am
9e99cab7: am
970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '
9e99cab7d9a0ec2315140c21bb1958eb7ff76a09':
Added getLeanbackLaunchIntentForPackage()
Jose Lima [Fri, 11 Apr 2014 18:58:43 +0000 (18:58 +0000)]
am
970417c7: Added getLeanbackLaunchIntentForPackage()
* commit '
970417c7d3e33ccbd6918e28d9bc5da24651f5b3':
Added getLeanbackLaunchIntentForPackage()
John Spurlock [Fri, 11 Apr 2014 18:50:43 +0000 (18:50 +0000)]
am
ae3f7cca: Merge "Add app_name to keyguard package."
* commit '
ae3f7cca5235b9c3da080e7f8210a21ecf48285b':
Add app_name to keyguard package.
Narayan Kamath [Fri, 11 Apr 2014 18:50:39 +0000 (18:50 +0000)]
am
6d8479d5: am
88a99645: am
97953b30: am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
6d8479d535f99db1e957cbc1c3ac396cb26287ed':
Workaround 64 bit devices that don't have zygotes yet.
Winson Chung [Fri, 11 Apr 2014 18:44:37 +0000 (18:44 +0000)]
am
f5bcd887: Merge "Refactoring filter animation logic."
* commit '
f5bcd8876e54aea8f228266ded5d9de8e6cad821':
Refactoring filter animation logic.
John Spurlock [Fri, 11 Apr 2014 18:44:26 +0000 (18:44 +0000)]
Merge "Add app_name to keyguard package."
Narayan Kamath [Fri, 11 Apr 2014 18:41:23 +0000 (18:41 +0000)]
am
88a99645: am
97953b30: am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
88a996455b1f3906765cc177c461d38cc9bfda92':
Workaround 64 bit devices that don't have zygotes yet.
Winson Chung [Fri, 11 Apr 2014 18:38:32 +0000 (18:38 +0000)]
Merge "Refactoring filter animation logic."
Narayan Kamath [Fri, 11 Apr 2014 18:36:32 +0000 (18:36 +0000)]
am
97953b30: am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
97953b308f9159a73061ae047e368eac503c1931':
Workaround 64 bit devices that don't have zygotes yet.
Winson Chung [Fri, 11 Apr 2014 00:29:13 +0000 (17:29 -0700)]
Refactoring filter animation logic.
Change-Id: Ic3b57f540da8fa0d2703eef34c43ed9e54f85021
Narayan Kamath [Fri, 11 Apr 2014 18:33:00 +0000 (18:33 +0000)]
am
4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."
* commit '
4f4892d00aab13975a8aed000f84ae0320355fd7':
Workaround 64 bit devices that don't have zygotes yet.
Narayan Kamath [Fri, 11 Apr 2014 18:29:54 +0000 (18:29 +0000)]
Merge "Workaround 64 bit devices that don't have zygotes yet."
Svetoslav [Fri, 11 Apr 2014 18:26:42 +0000 (18:26 +0000)]
am
0f7ed1f4: Merge "Adding system support for a single accessibility focus."
* commit '
0f7ed1f4776844f3ee8d3ce9d903f62cace66a06':
Adding system support for a single accessibility focus.
Narayan Kamath [Fri, 11 Apr 2014 17:44:31 +0000 (18:44 +0100)]
Workaround 64 bit devices that don't have zygotes yet.
This can be fixed by tweaking their BoardConfig as well,
but that leads to all sorts of other problems.
For now, fall back to the primary zygote if the secondary
is unavailable. This will fail if shared libraries for the
primary zygote ABI are unavailable, but that won't be the
case just yet.
bug:
13970103
Change-Id: Ifa107e43ca95023d57a0d9c641e4fddaccd9a888
Svetoslav [Fri, 11 Apr 2014 18:22:18 +0000 (18:22 +0000)]
Merge "Adding system support for a single accessibility focus."
Svetoslav [Fri, 11 Apr 2014 00:41:29 +0000 (17:41 -0700)]
Adding system support for a single accessibility focus.
Now that we have APIs to query all interactive windows and allow
an accessibility service to put accessibility focus in each of
them we have to guarantee that there is a single accessibility
focus. This is required for correct operation of the touch
explorer as on double tap in clicks in the center of the focused
area, hence having more that one focus is an issue. Also the
system is maintaining a single input focus so now accessibility
focus behaves consistently with that.
bug:
13965563
Change-Id: I0b5c26dadfabbf80dbed8dc4602073aa575ac179
Fabrice Di Meglio [Fri, 11 Apr 2014 18:21:27 +0000 (18:21 +0000)]
am
62499493: Merge "Add toString() for SearchIndexableData and SearchIndexableResource"
* commit '
624994930adea1158011ff5c8ea1f8bfd700fe0e':
Add toString() for SearchIndexableData and SearchIndexableResource
Fabrice Di Meglio [Fri, 11 Apr 2014 18:17:57 +0000 (18:17 +0000)]
Merge "Add toString() for SearchIndexableData and SearchIndexableResource"
Jose Lima [Thu, 10 Apr 2014 17:42:19 +0000 (10:42 -0700)]
Added getLeanbackLaunchIntentForPackage()
Change-Id: I23be3bfa59be812a915adc37e08fdf59be8ad90f
Elliott Hughes [Fri, 11 Apr 2014 17:54:26 +0000 (17:54 +0000)]
am
f873e785: am
c2bd3687: am
70bba904: am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
f873e7858cca1181a63bf92c4e9bb92824451cc8':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:48:11 +0000 (17:48 +0000)]
am
c2bd3687: am
70bba904: am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
c2bd3687dc381e10b45ab938e088dab6d824fa84':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:45:17 +0000 (17:45 +0000)]
am
1f2966ea: am
8e6992fb: am
1ea1857d: am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
1f2966ea2bd001adde9ee4773d97d1bb6007aa53':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:44:51 +0000 (17:44 +0000)]
am
70bba904: am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
70bba904fc50f44cb4a695cf76e423534c835cf6':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:41:44 +0000 (17:41 +0000)]
am
b093e485: Merge "generateProjectThumbnail can fail to close output stream"
* commit '
b093e485bbd790cc4d9678451c8cce4d361c2cf2':
generateProjectThumbnail can fail to close output stream
Elliott Hughes [Fri, 11 Apr 2014 17:40:39 +0000 (17:40 +0000)]
am
8e6992fb: am
1ea1857d: am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
8e6992fb3ac986d3bbb93cd2d55d3e18eb03b3b5':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:37:54 +0000 (17:37 +0000)]
Merge "generateProjectThumbnail can fail to close output stream"
Elliott Hughes [Fri, 11 Apr 2014 17:37:18 +0000 (17:37 +0000)]
am
1ea1857d: am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
1ea1857de9c98199015f0188678a12a82a6248d4':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:33:15 +0000 (17:33 +0000)]
am
8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter"
* commit '
8cd319b84635454746803b0eed7e2626d7945a09':
Add additional languages to be accepted by the NumberPicker input filter
Elliott Hughes [Fri, 11 Apr 2014 17:30:09 +0000 (17:30 +0000)]
Merge "Add additional languages to be accepted by the NumberPicker input filter"
Elliott Hughes [Fri, 11 Apr 2014 17:27:49 +0000 (17:27 +0000)]
am
988b38bc: am
5b7dccc4: am
90e2301e: am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
988b38bc812b12871ac7452a40d9d73273d126bc':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:25:08 +0000 (17:25 +0000)]
am
5b7dccc4: am
90e2301e: am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
5b7dccc4f9cc1d07650cd7d1f499c3c11ba3ede2':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:21:20 +0000 (17:21 +0000)]
am
90e2301e: am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
90e2301e23532c92dd4c24394b7407e243389e9f':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:18:14 +0000 (17:18 +0000)]
am
d2a11d97: Merge "Add explicit close of Scanner input"
* commit '
d2a11d97a94bed18629bded429f118f57f4f7821':
Add explicit close of Scanner input
Elliott Hughes [Fri, 11 Apr 2014 17:14:39 +0000 (17:14 +0000)]
Merge "Add explicit close of Scanner input"
Ricardo Cervera [Fri, 11 Apr 2014 16:25:48 +0000 (16:25 +0000)]
am
dec50073: am
8490cc15: am
3d9a3b58: am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
dec50073c93dff71d6d6fb3a2f14969690f02b9d':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:25:44 +0000 (16:25 +0000)]
am
0504d2fa: am
80790fe0: am
7186228a: am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
0504d2fa94cfe757683b8a5b13a864adc33273c6':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:21:28 +0000 (16:21 +0000)]
am
8490cc15: am
3d9a3b58: am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
8490cc15e5b948162feafd808e3c94a3d13bac57':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:21:22 +0000 (16:21 +0000)]
am
80790fe0: am
7186228a: am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
80790fe0e71d6fb4b34a311062244d16d0d9c07a':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:19:09 +0000 (16:19 +0000)]
am
3d9a3b58: am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
3d9a3b589af661f980a7c03f208915b54521639f':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:19:06 +0000 (16:19 +0000)]
am
7186228a: am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
7186228ae8505c3222be81680811d00de9bbdb6d':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:14:23 +0000 (16:14 +0000)]
am
7abc67f4: am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
7abc67f43fff9d2dc84d1bddfb3e5b3a04fbc30a':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:14:17 +0000 (16:14 +0000)]
am
d1f51fda: am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
d1f51fda68ee23aaa83db62b32ad2b65d7fb4320':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:11:59 +0000 (16:11 +0000)]
am
2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
* commit '
2abf55ca9b8a796ffb246538d319798dabedbec6':
docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147
Ricardo Cervera [Fri, 11 Apr 2014 16:11:56 +0000 (16:11 +0000)]
am
a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
* commit '
a765e78241970f212991056b09027ef4df818d95':
docs: Added a document on debugging in Android Studio
Ricardo Cervera [Fri, 11 Apr 2014 16:07:47 +0000 (16:07 +0000)]
Merge "docs: Updated SDK installation instructions for Ubuntu. Bug:
13476147" into klp-docs
Ricardo Cervera [Fri, 11 Apr 2014 16:06:22 +0000 (16:06 +0000)]
Merge "docs: Added a document on debugging in Android Studio" into klp-docs
Alexandra Gherghina [Fri, 11 Apr 2014 16:00:38 +0000 (16:00 +0000)]
am
23d2dd3d: Merge "Add new call to DevicePolicyManager to enable a profile."
* commit '
23d2dd3da15b4312cc55c4d7b0bcf70719655e65':
Add new call to DevicePolicyManager to enable a profile.
Alexandra Gherghina [Fri, 11 Apr 2014 15:53:15 +0000 (15:53 +0000)]
Merge "Add new call to DevicePolicyManager to enable a profile."
Alexandra Gherghina [Wed, 2 Apr 2014 10:23:54 +0000 (11:23 +0100)]
Add new call to DevicePolicyManager to enable a profile.
Bug:
13755091
Change-Id: Idb6975431f842ededf78966c578b0533e6f186af
Brian Williammee [Fri, 11 Apr 2014 14:27:14 +0000 (14:27 +0000)]
am
7217f380: Correct some comments (LTE->CDMA)
* commit '
7217f3805819b6feca7ec1cc378a9ca56cf2d275':
Correct some comments (LTE->CDMA)
Brian Williammee [Fri, 9 Aug 2013 00:39:01 +0000 (17:39 -0700)]
Correct some comments (LTE->CDMA)
Change references to LTE in CellSignalStrengthCdma to CDMA.
Change-Id: I2c003746dcef84949af69e2fbd4e5db4906e1125
Przemyslaw Szczepaniak [Fri, 11 Apr 2014 12:10:57 +0000 (12:10 +0000)]
am
39c82a3b: Merge "Remove "final" from TextToSpeechClient class."
* commit '
39c82a3b19788b100f52f24732560ef325c13133':
Remove "final" from TextToSpeechClient class.
Przemyslaw Szczepaniak [Fri, 11 Apr 2014 12:06:42 +0000 (12:06 +0000)]
Merge "Remove "final" from TextToSpeechClient class."
Narayan Kamath [Fri, 11 Apr 2014 11:41:45 +0000 (11:41 +0000)]
am
79d88d13: am
73e78c75: am
af42a91c: Fix another build breakage.
* commit '
79d88d138c07835d349f7c74f380eaeb7cac8d0b':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:37:40 +0000 (11:37 +0000)]
am
73e78c75: am
af42a91c: Fix another build breakage.
* commit '
73e78c75b770b3af0d48acac9c8565f7b4d035ff':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:35:19 +0000 (11:35 +0000)]
am
af42a91c: Fix another build breakage.
* commit '
af42a91c118941d463b474574bf34bf05822350d':
Fix another build breakage.
Narayan Kamath [Fri, 11 Apr 2014 11:28:10 +0000 (12:28 +0100)]
Fix another build breakage.
Caused by
037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.
Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
Narayan Kamath [Fri, 11 Apr 2014 11:01:59 +0000 (11:01 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:57:28 +0000 (10:57 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:54:20 +0000 (10:54 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 10:42:33 +0000 (11:42 +0100)]
Fix build.
isScreenOn was changed to isInteractive.
Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
Narayan Kamath [Fri, 11 Apr 2014 10:10:16 +0000 (10:10 +0000)]
am
26ad3af7: am
c3255ae0: am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
26ad3af74d4b8a6f960de7a4370684a987551f6d':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 10:02:17 +0000 (10:02 +0000)]
am
c3255ae0: am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
c3255ae04c8bec36f6701b92bf645323558e23c1':
Dual zygote cleanup.
Narayan Kamath [Fri, 11 Apr 2014 09:57:27 +0000 (09:57 +0000)]
am
de442781: am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
Dual zygote cleanup.
Jinsuk Kim [Fri, 11 Apr 2014 09:47:20 +0000 (09:47 +0000)]
am
4bdcd299: am
55dab4dd: am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
4bdcd299da48f9abe5f9c67abed0dbe79080445d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Jinsuk Kim [Fri, 11 Apr 2014 09:43:37 +0000 (09:43 +0000)]
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
Mikhail Naganov [Fri, 11 Apr 2014 09:42:32 +0000 (09:42 +0000)]
am
b429088c: Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat."
* commit '
b429088cbb12a226fd217f04870d16bbd833ed06':
Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat.
Jinsuk Kim [Fri, 11 Apr 2014 09:40:46 +0000 (09:40 +0000)]
am
b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '
b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
Delegate HdmiCecService method impl to HdmiCecDevice subclass
Jinsuk Kim [Fri, 11 Apr 2014 09:38:22 +0000 (09:38 +0000)]
Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
Mikhail Naganov [Fri, 11 Apr 2014 09:36:38 +0000 (09:36 +0000)]
Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat."
Jinsuk Kim [Mon, 7 Apr 2014 04:39:17 +0000 (13:39 +0900)]
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
Jeff Brown [Fri, 11 Apr 2014 09:26:02 +0000 (09:26 +0000)]
am
26c6a50f: Rename isScreenOn() to isInteractive().
* commit '
26c6a50f037c6af9c41b3f96269fe194748605ce':
Rename isScreenOn() to isInteractive().
Jeff Brown [Fri, 11 Apr 2014 09:15:54 +0000 (02:15 -0700)]
Rename isScreenOn() to isInteractive().
Fix build break due to an earlier merge.
Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
Mikhail Naganov [Thu, 10 Apr 2014 17:07:42 +0000 (18:07 +0100)]
Add Javadoc statement regarding enumerability of methods of injected Java
objects for applications targeted to API levels after KitKat.
Bug:
12169386
Change-Id: I1c988468545e48ac0d7323b01b9c77a1f8d713f2
Narayan Kamath [Fri, 11 Apr 2014 08:45:47 +0000 (08:45 +0000)]
am
909a6a0e: Merge "Dual zygote cleanup."
* commit '
909a6a0e2b5815332618b2cf731d27824a76d042':
Dual zygote cleanup.
Jeff Brown [Fri, 11 Apr 2014 08:43:44 +0000 (08:43 +0000)]
am
4e5c089e: resolved conflicts for merge of
337e764d to master
* commit '
4e5c089ef3e62e7f658e71c0be262d09bd3e399b':
Plumb display power state through display manager.
Jeff Brown [Fri, 11 Apr 2014 08:21:14 +0000 (01:21 -0700)]
resolved conflicts for merge of
337e764d to master
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
Colin Cross [Fri, 11 Apr 2014 08:31:32 +0000 (08:31 +0000)]