OSDN Git Service
Narayan Kamath [Mon, 29 Dec 2014 10:12:55 +0000 (10:12 +0000)]
am
7d019394: am
712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
* commit '
7d019394f7ca2f047e9c3d2a98b5c23b223c6689':
Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
Narayan Kamath [Mon, 29 Dec 2014 10:07:13 +0000 (10:07 +0000)]
am
712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
* commit '
712a02050e7be4479f12a81aeb23d7217b8d7a8d':
Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
Narayan Kamath [Mon, 29 Dec 2014 10:02:26 +0000 (10:02 +0000)]
Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
Craig Mautner [Mon, 29 Dec 2014 01:56:42 +0000 (01:56 +0000)]
am
443d1a6a: am
cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
* commit '
443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
[ActivityManager] Reset ActivityRecord's waitingVisible
Craig Mautner [Mon, 29 Dec 2014 01:44:25 +0000 (01:44 +0000)]
am
cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
* commit '
cfa31a605cda26a556009ddd4eae83085e74339b':
[ActivityManager] Reset ActivityRecord's waitingVisible
Craig Mautner [Mon, 29 Dec 2014 01:30:49 +0000 (01:30 +0000)]
Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"
John Spurlock [Sun, 28 Dec 2014 05:42:43 +0000 (05:42 +0000)]
am
af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev
automerge:
db41690
* commit '
db416907b831010cc2854292aa7de85fd8857a77':
Audio Policy: Clear calling identity for all paths setting ringer mode.
Baligh Uddin [Sun, 28 Dec 2014 05:41:16 +0000 (05:41 +0000)]
am
45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge:
bedfb2f -s ours
* commit '
bedfb2faecc4ddc83cf368d0db5c10776236a49b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Dec 2014 05:39:56 +0000 (05:39 +0000)]
am
4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge:
378939f -s ours
* commit '
378939f0580c615e21a5c9b17565b2822f326559':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Dec 2014 05:38:49 +0000 (05:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
c5d0323 -s ours
* commit '
c5d0323c125ff5ec687286c308386f81d7e132d9':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Dec 2014 05:37:29 +0000 (05:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
b0e2d4c -s ours
* commit '
b0e2d4c7f1b4280880e28335af0cea13af6902b4':
Import translations. DO NOT MERGE
Robin Lee [Sun, 28 Dec 2014 05:36:20 +0000 (05:36 +0000)]
am
b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev
automerge:
c9db16c
* commit '
c9db16c59164d865b92e4527fb479fb892c5d4bb':
Revert "DevicePolicy: Don't warn about managed profile CAs"
Baligh Uddin [Sun, 28 Dec 2014 05:35:06 +0000 (05:35 +0000)]
am
83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge:
cecabf4 -s ours
* commit '
cecabf48ae85943b9c0e5b4805299794f5f3b857':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Dec 2014 05:33:41 +0000 (05:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
f17490f -s ours
* commit '
f17490f5c202676c3a2e6f27c445f334509d8f59':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sun, 28 Dec 2014 05:32:24 +0000 (05:32 +0000)]
am
b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev
automerge:
48fd168
* commit '
48fd1688a27519b14959b1c181f1fa8178836997':
Add configuration indicating whether TTY over VoLTE is supported.
Amit Mahajan [Sun, 28 Dec 2014 05:29:52 +0000 (05:29 +0000)]
am
d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev
automerge:
4f68c0c
* commit '
4f68c0c1d8811d610021d97839af303c2752eff2':
IMS: add the api to get IMS registration information.
Jinsuk Kim [Fri, 26 Dec 2014 20:30:42 +0000 (20:30 +0000)]
am
266f2b04: am
92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev
* commit '
266f2b047ebfb80a7fa72da302988fba4c902f43':
CEC: Let the caller check CEC device type
Robert Greenwalt [Fri, 26 Dec 2014 20:30:32 +0000 (20:30 +0000)]
am
33868dab: am
4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
* commit '
33868dab9af09d61634f1f7ab3a8c704aacd0de0':
Fix timing between bcast and net setup.
John Spurlock [Fri, 26 Dec 2014 20:30:21 +0000 (20:30 +0000)]
am
de9af5cd: am
17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev
* commit '
de9af5cdc0a8ce55657e82fa2a71faa9d6321cb1':
Zen: Fix selection logic for "Indefinitely".
Jean-Michel Trivi [Fri, 26 Dec 2014 20:30:04 +0000 (20:30 +0000)]
am
98ba8409: am
996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev
* commit '
98ba8409876087f32114d889435b7f1bd7a73ffb':
AudioRecord: filter attributes
Elliott Hughes [Fri, 26 Dec 2014 18:59:22 +0000 (18:59 +0000)]
am
f9f41951: am
ee435b16: Merge "telephony: Update comments for preferred network mode"
* commit '
f9f41951701f5e47b454b7c3f4e7d4654a9c4a3e':
telephony: Update comments for preferred network mode
Elliott Hughes [Fri, 26 Dec 2014 18:53:55 +0000 (18:53 +0000)]
am
ee435b16: Merge "telephony: Update comments for preferred network mode"
* commit '
ee435b16d89ee9cb65eead9ac7507693342c15b3':
telephony: Update comments for preferred network mode
Elliott Hughes [Fri, 26 Dec 2014 18:48:56 +0000 (18:48 +0000)]
Merge "telephony: Update comments for preferred network mode"
Sungmin Choi [Mon, 9 Jun 2014 05:45:51 +0000 (14:45 +0900)]
telephony: Update comments for preferred network mode
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
John Spurlock [Wed, 24 Dec 2014 01:21:22 +0000 (01:21 +0000)]
am
af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev
* commit '
af84e073bce12c6ae0c737339804e96314bb663d':
Audio Policy: Clear calling identity for all paths setting ringer mode.
John Spurlock [Wed, 24 Dec 2014 01:16:12 +0000 (01:16 +0000)]
Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev
John Spurlock [Tue, 23 Dec 2014 21:14:44 +0000 (16:14 -0500)]
Audio Policy: Clear calling identity for all paths setting ringer mode.
For proper appops bookkeeping and zen setting changes.
Bug:
18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
Nick Kralevich [Tue, 23 Dec 2014 19:52:12 +0000 (19:52 +0000)]
am
8454f2d4: am
5e1e38cc: Merge "Mods to the SELinuxMMAC engine code."
* commit '
8454f2d48517d79268688b2262b17ff0cab39622':
Mods to the SELinuxMMAC engine code.
Nick Kralevich [Tue, 23 Dec 2014 19:46:44 +0000 (19:46 +0000)]
am
5e1e38cc: Merge "Mods to the SELinuxMMAC engine code."
* commit '
5e1e38ccdd3da34f65a642dc25b5b2b5cf2b6059':
Mods to the SELinuxMMAC engine code.
Nick Kralevich [Tue, 23 Dec 2014 19:42:05 +0000 (19:42 +0000)]
Merge "Mods to the SELinuxMMAC engine code."
Robert Craig [Wed, 19 Nov 2014 18:56:10 +0000 (13:56 -0500)]
Mods to the SELinuxMMAC engine code.
* We now require that all certs used to sign the apk and all
certs stored with policy be tested for set equality. Prior
efforts required that the cert included with policy only
needed to match one of the certs included with an apk.
* Allowed a new tag to be included with policy describing the
signatures. <cert signature=""/> is now allowed as a child
element of the <signer> tag describing multiple certs. The
old way of describing signatures attached as attributes to
the root signer tag is still supported. The engine now treats
it the same as if they used the new layout with the outer
signature as the first signature value.
* Moved the class which holds all policy from an inner static
to a builder pattern governed by the Policy.PolicyBuilder
class. This will help provide more clarity and allow for
easier enforcement of certain invariants as the policy
representation is being built.
* Loads of new comments.
Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Baligh Uddin [Tue, 23 Dec 2014 15:59:36 +0000 (15:59 +0000)]
am
45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
45c6ae56d969709e0969514fa219375561c2df38':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Dec 2014 15:59:31 +0000 (15:59 +0000)]
am
4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
4acca673904d3f99a3686a9ad92f471e97e67959':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Dec 2014 15:53:34 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 23 Dec 2014 15:53:17 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Baligh Uddin [Tue, 23 Dec 2014 15:52:52 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 23 Dec 2014 15:52:47 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Narayan Kamath [Tue, 23 Dec 2014 13:47:50 +0000 (13:47 +0000)]
am
4dcc8d28: am
d7771768: Merge "Build against libphonenumber-platform."
* commit '
4dcc8d28d7933a4a08d2330f78f3b4486d2ef264':
Build against libphonenumber-platform.
Narayan Kamath [Tue, 23 Dec 2014 13:41:17 +0000 (13:41 +0000)]
am
d7771768: Merge "Build against libphonenumber-platform."
* commit '
d777176872792ed2a17f46acbd2f8ebc64ac1995':
Build against libphonenumber-platform.
Narayan Kamath [Tue, 23 Dec 2014 13:33:44 +0000 (13:33 +0000)]
Merge "Build against libphonenumber-platform."
Robin Lee [Tue, 23 Dec 2014 13:29:05 +0000 (13:29 +0000)]
am
b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev
* commit '
b4b14e391dbcde537350ccf649b3603cafba1e6c':
Revert "DevicePolicy: Don't warn about managed profile CAs"
Robin Lee [Tue, 23 Dec 2014 12:30:26 +0000 (12:30 +0000)]
Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev
Baligh Uddin [Tue, 23 Dec 2014 08:37:22 +0000 (00:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia6fc4bb7529db266834f9de0e809c77be53fa38b
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Dec 2014 08:28:11 +0000 (00:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2096264002a0f4dad73672f5834327f151e95788
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Dec 2014 05:46:27 +0000 (21:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8e2bfc9d5db55c0a7aa2c0cc7d0318ed5df921c0
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Dec 2014 04:56:36 +0000 (20:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic2b81358285cfa793cf31ddc621e86fadb7d218f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Dec 2014 04:50:07 +0000 (04:50 +0000)]
am
83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
83a590b14ca70da7b6061529a521212572d732b3':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Dec 2014 04:44:56 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Tue, 23 Dec 2014 04:44:52 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Baligh Uddin [Tue, 23 Dec 2014 04:26:50 +0000 (20:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie975c5e8d1edb7afc679ce1d27bb7e09b81df571
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Dec 2014 04:23:07 +0000 (20:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib629c0bca4f92a0c81bf5af904773df1b1f8549e
Auto-generated-cl: translation import
Pavel Zhamaitsiak [Tue, 23 Dec 2014 03:44:34 +0000 (03:44 +0000)]
am
b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev
* commit '
b45075a7cb508e63ff2d662affbc970202249ac2':
Add configuration indicating whether TTY over VoLTE is supported.
Andreas Gampe [Tue, 23 Dec 2014 03:44:12 +0000 (03:44 +0000)]
am
5470c169: am
2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '
5470c1699121135f0f1c615d080359f0bc9cf1c4':
Core/jni: Remove Dalvik options from AndroidRuntime
Pavel Zhamaitsiak [Tue, 23 Dec 2014 03:39:04 +0000 (03:39 +0000)]
Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev
Andreas Gampe [Tue, 23 Dec 2014 03:37:07 +0000 (03:37 +0000)]
am
2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '
2b20efa728f79ef9322930aefbbf0483a578ee74':
Core/jni: Remove Dalvik options from AndroidRuntime
Andreas Gampe [Tue, 23 Dec 2014 03:29:45 +0000 (03:29 +0000)]
Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
Amit Mahajan [Tue, 23 Dec 2014 01:24:28 +0000 (01:24 +0000)]
am
d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev
* commit '
d00b6067bf03b59143d98dba1343ced27306863c':
IMS: add the api to get IMS registration information.
Amit Mahajan [Tue, 23 Dec 2014 01:19:19 +0000 (01:19 +0000)]
Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev
Andreas Gampe [Thu, 18 Dec 2014 22:39:22 +0000 (14:39 -0800)]
Core/jni: Remove Dalvik options from AndroidRuntime
Dalvik is dead. Remove old command-line options from AndroidRuntime.
Bug:
18833580
Bug:
18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
Jinsuk Kim [Mon, 22 Dec 2014 22:53:58 +0000 (22:53 +0000)]
am
92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev
* commit '
92ae5abf4dac470c5c915ec4782d5af6f251d257':
CEC: Let the caller check CEC device type
Etan Cohen [Thu, 11 Dec 2014 18:41:25 +0000 (10:41 -0800)]
Add configuration indicating whether TTY over VoLTE is supported.
Bug:
18593974
Change-Id: I8b45bfe91a7222d96f22a93e5bc887b96c231afe
Jinsuk Kim [Mon, 22 Dec 2014 22:48:44 +0000 (22:48 +0000)]
Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev
Jinsuk Kim [Mon, 22 Dec 2014 22:01:51 +0000 (07:01 +0900)]
CEC: Let the caller check CEC device type
Device event listener mechanism invoke the callback on all kinds
of devices in order to deal with a caller who wants to get notified
for all types. TIF was changed to check the device type to make
sure it handles source type only.
Bug:
18832462
Change-Id: I5123fe79c09f623849b93b64d0c28e6a930dd437
Robert Greenwalt [Mon, 22 Dec 2014 22:36:11 +0000 (22:36 +0000)]
am
4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
* commit '
4dcacef5c53e9d94beab777d79ecada86a15289b':
Fix timing between bcast and net setup.
Robert Greenwalt [Mon, 22 Dec 2014 22:32:39 +0000 (22:32 +0000)]
Merge "Fix timing between bcast and net setup." into lmp-mr1-dev
John Spurlock [Mon, 22 Dec 2014 22:01:27 +0000 (22:01 +0000)]
am
17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev
* commit '
17ca1aaf72ac5d48d33517331b6d772c1a158bfd':
Zen: Fix selection logic for "Indefinitely".
John Spurlock [Mon, 22 Dec 2014 21:56:35 +0000 (21:56 +0000)]
Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev
John Spurlock [Mon, 22 Dec 2014 20:13:30 +0000 (15:13 -0500)]
Zen: Fix selection logic for "Indefinitely".
Use a signal condition value for the forever condition in the panel
to ease the distinction between no selection + selecting indef.
Bug:
18810529
Change-Id: I2590899ab43734708c72aad066653ef27f89d760
Libin.Tang@motorola.com [Thu, 18 Dec 2014 04:47:45 +0000 (22:47 -0600)]
IMS: add the api to get IMS registration information.
Bug:
18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
Jean-Michel Trivi [Mon, 22 Dec 2014 19:00:22 +0000 (19:00 +0000)]
am
996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev
* commit '
996af72b0c2c161e66cee00560e5ba00459f39bf':
AudioRecord: filter attributes
Jean-Michel Trivi [Mon, 22 Dec 2014 18:55:39 +0000 (18:55 +0000)]
Merge "AudioRecord: filter attributes" into lmp-mr1-dev
Jean-Michel Trivi [Fri, 19 Dec 2014 17:34:07 +0000 (09:34 -0800)]
AudioRecord: filter attributes
When creating an AudioRecord instance, filter the tags in the
AudioAttributes to remove tags that are handled at the Java
layer.
Bug:
18733215
Bug:
18736417
Change-Id: I16a3497742086deced4e8677bd6231290396c5f6
Robin Lee [Mon, 22 Dec 2014 11:48:10 +0000 (11:48 +0000)]
Revert "DevicePolicy: Don't warn about managed profile CAs"
This reverts commit
80559f4aadb3419eecdf6bf61945af584cd2aa8a.
Bug:
18224038
Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
Jinsuk Kim [Sat, 20 Dec 2014 00:06:25 +0000 (00:06 +0000)]
am
ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev automerge:
2c8c47d
* commit '
ed27b72e581aea85d3c9db4284b07c560d326838':
CEC: Allow no vendor-specific data for <Vendor Command With ID>
Jinsuk Kim [Sat, 20 Dec 2014 00:00:38 +0000 (00:00 +0000)]
Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev
automerge:
2c8c47d
* commit '
2c8c47daefc881c5603689be39b10cb93a0cabdf':
CEC: Allow no vendor-specific data for <Vendor Command With ID>
Jinsuk Kim [Fri, 19 Dec 2014 23:58:09 +0000 (23:58 +0000)]
Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev
Jinsuk Kim [Fri, 19 Dec 2014 23:43:27 +0000 (08:43 +0900)]
CEC: Allow no vendor-specific data for <Vendor Command With ID>
Changed not to return <Feature Abort> if the command comes
with any vendor-specific data, which is still valid.
Bug:
18816046
Change-Id: I22204d167c7783a841f7bb560e900b525f9f036b
Eric Laurent [Fri, 19 Dec 2014 23:27:25 +0000 (23:27 +0000)]
am
a1bd2d00: am
1ed9a88e: Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev
* commit '
a1bd2d0008e5d9cb563936b7f044d8796c37fb2f':
MediaSession: unmute stream when adjusting volume
John Reck [Fri, 19 Dec 2014 23:21:44 +0000 (23:21 +0000)]
am
165fb8f5: am
f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-dev
* commit '
165fb8f5aa0709a8dc35f99a9b81f6906452a648':
Tweak RT-animator scheduling
Eric Laurent [Fri, 19 Dec 2014 23:21:04 +0000 (23:21 +0000)]
am
1ed9a88e: Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev
* commit '
1ed9a88ec3a1a1d9f418ae0b6f1e77e7b7dd99a3':
MediaSession: unmute stream when adjusting volume
Eric Laurent [Fri, 19 Dec 2014 23:17:05 +0000 (23:17 +0000)]
Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev
John Reck [Fri, 19 Dec 2014 23:15:12 +0000 (23:15 +0000)]
am
f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-dev
* commit '
f89dac472366c547e535dfafa8df25bd2d031833':
Tweak RT-animator scheduling
John Reck [Fri, 19 Dec 2014 23:09:47 +0000 (23:09 +0000)]
Merge "Tweak RT-animator scheduling" into lmp-mr1-dev
Svet Ganov [Fri, 19 Dec 2014 22:43:30 +0000 (22:43 +0000)]
am
f64d26fc: am
e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
* commit '
f64d26fce002019f390b4f9f37c8edf965c362c5':
Remove a bad heuristic when determining click location for accessibility.
Svet Ganov [Fri, 19 Dec 2014 22:36:56 +0000 (22:36 +0000)]
am
e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
* commit '
e130d6c14ae2d4a6f703ef452a7e5741d84936a0':
Remove a bad heuristic when determining click location for accessibility.
Svet Ganov [Fri, 19 Dec 2014 22:33:49 +0000 (22:33 +0000)]
Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
Bart Sears [Fri, 19 Dec 2014 22:18:57 +0000 (22:18 +0000)]
am
a2bd0e55: am
02aca27f: Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
* commit '
a2bd0e55997e1d8c956a616b376c5b7ccf8ed243':
Allow OEM to specify <unavailable-feature>.
Bart Sears [Fri, 19 Dec 2014 21:50:03 +0000 (21:50 +0000)]
am
02aca27f: Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
* commit '
02aca27f8005ef94c906e599695243a9fd80f68a':
Allow OEM to specify <unavailable-feature>.
Bart Sears [Fri, 19 Dec 2014 21:45:47 +0000 (21:45 +0000)]
Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-dev
Svet Ganov [Fri, 19 Dec 2014 19:59:18 +0000 (11:59 -0800)]
Remove a bad heuristic when determining click location for accessibility.
As a bride-gap solution to click on partially covered views in accessibility
mode we compute a point on the screen where to send a down/up event pair.
A heuristic we used was that if the action target is covered by a view that
that has a touch listener we consider the target obscured by the one with
the listener. However, this generates false positives, for example the target
is covered by a view that observers touches for scrolling but not clicking.
bug:
18782023
Change-Id: I31ff34011d45667f1eddda47373ec00e4a23dbf6
Robert Greenwalt [Thu, 18 Dec 2014 01:19:53 +0000 (17:19 -0800)]
Fix timing between bcast and net setup.
A legacy network type request would generate a bcast before the network
notification was sent - the legacy startUsingNetworkFeature API requires
the notification so it can bind your dns queries to the new network.
Fast-moving clients could try to use the network before it was ready.
bug:
18792871
Change-Id: I24c46ef15c249c50bfc321f62756d1f66dc3a6a9
John Reck [Fri, 19 Dec 2014 19:37:21 +0000 (11:37 -0800)]
Tweak RT-animator scheduling
Bug:
18226391
The issue occurs as a result of a dispatchFrame itself
taking longer than 12ms, the alloted budget. The result
is that a vsync request (which occured at the end) would
miss the vsync that occured 1ms prior to the end of the frame.
As a result it would end up waiting for the following vsync,
essentially dropping to 30fps even though 60 could have been
sustained.
Fix this with a few tweaks.
First, adjust the UI thread's delay bias from (now + 4ms) to
(vsync + 4ms), this prevents RT animators from slowly drifting
if the vsync occurs mid-task.
Second, request a vsync preemptively prior to running callbacks.
This way if any callbacks needs the next vsync and it takes
"too long", we will catch that vsync.
Finally, fix an issue where the display event queue was always
drained & rejected at the end of a task loop. Instead, drain
and reject all stale vsyncs. This still prevents the issue of
both UI thread & RT thread trying to drive 2 frames in a single
pulse, but also allows RT to notice that it missed a vsync
pulse it needed and that it should speed-up a bit in response
Change-Id: I9d6be037737e9283297898cac2e3563453e797cd
Wink Saville [Fri, 19 Dec 2014 19:22:41 +0000 (19:22 +0000)]
am
7c580cab: am
b5f1e878: Fix build breakage.
* commit '
7c580caba94ca3b917c887b9e8353809c7f320c7':
Fix build breakage.
Wink Saville [Fri, 19 Dec 2014 19:17:21 +0000 (19:17 +0000)]
am
b5f1e878: Fix build breakage.
* commit '
b5f1e878d1bc245b676a1a2504c30d21a311bf6c':
Fix build breakage.
Jeff Sharkey [Fri, 19 Dec 2014 19:08:55 +0000 (11:08 -0800)]
Allow OEM to specify <unavailable-feature>.
Some single-system-image builds may run on devices that lack
certain hardware features. This change allows the OEM partition to
mark a feature as "unavailable" which overrides the system image.
Bug:
18801291
Change-Id: I0d81144ec92ee9a78c13b223bbba20a4aed23fa0
Wink Saville [Fri, 19 Dec 2014 19:02:01 +0000 (11:02 -0800)]
Fix build breakage.
I rebased a change and didn't compile, my mistake.
Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
Wink Saville [Fri, 19 Dec 2014 18:33:20 +0000 (18:33 +0000)]
am
57859d70: am
f73c2d1f: Update mapping between RAF and Network Type.
* commit '
57859d704ef2bc61798c172c4524596393f0beef':
Update mapping between RAF and Network Type.
Wink Saville [Fri, 19 Dec 2014 18:27:32 +0000 (18:27 +0000)]
am
f73c2d1f: Update mapping between RAF and Network Type.
* commit '
f73c2d1f0b6d55668c19493fba0088a69e6b128f':
Update mapping between RAF and Network Type.
Wink Saville [Fri, 19 Dec 2014 18:09:26 +0000 (18:09 +0000)]
am
aa40537c: am
63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
* commit '
aa40537ca56ce386edcdaed2d21a9e2f07975812':
Update mapping between RAF and Network Type.
Wink Saville [Wed, 17 Dec 2014 22:38:49 +0000 (14:38 -0800)]
Update mapping between RAF and Network Type.
bug:
18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77