OSDN Git Service
Alan Viverette [Thu, 5 Feb 2015 00:44:02 +0000 (16:44 -0800)]
Allow top-level drawable container in progressDrawable
Bug:
19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
Wonsik Kim [Tue, 3 Feb 2015 23:39:57 +0000 (23:39 +0000)]
Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
Lajos Molnar [Tue, 3 Feb 2015 22:55:21 +0000 (14:55 -0800)]
camera2: limit flexYUV array size in DngCreator
corrected overread
Bug:
19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
Paul Jensen [Tue, 3 Feb 2015 21:08:58 +0000 (21:08 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
Paul Jensen [Mon, 2 Feb 2015 16:03:03 +0000 (11:03 -0500)]
Facilitate network validation on networks with a per-network PAC.
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY. This will fail on networks where Internet
access is only permitted via the proxy. Always failing network
validation has the potential to disable WiFi auto-join. Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.
bug:
19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
Svetoslav [Sat, 31 Jan 2015 04:28:41 +0000 (20:28 -0800)]
Fix broken activation of the selected view in accessibility mode.
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.
This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.
The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.
bug:
18986806
bug:
18889611
Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
Joe Fernandez [Mon, 2 Feb 2015 19:24:38 +0000 (19:24 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
automerge:
c6ca860
* commit '
c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:19:23 +0000 (19:19 +0000)]
Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
Jorim Jaggi [Mon, 2 Feb 2015 13:45:39 +0000 (14:45 +0100)]
Send accessibility event when bouncer is shown
Bug:
18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
Joe Fernandez [Mon, 2 Feb 2015 17:44:26 +0000 (17:44 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
* commit '
d14b64323ff92be9db804d66a1146693c27150a6':
docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am
eba583e3: docs: February 2015 Dashboard updates
* commit '
eba583e3930891f7a8a0e48a961a4a2471fc757c':
docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Tyler Gunn [Mon, 2 Feb 2015 15:48:52 +0000 (15:48 +0000)]
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
Jon Larimer [Sat, 31 Jan 2015 05:19:19 +0000 (05:19 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a
automerge:
4a82635
* commit '
4a826358e769e697ec329cf14edeb049981a11a9':
Jon Larimer [Sat, 31 Jan 2015 05:03:24 +0000 (05:03 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af
automerge:
27d099a
* commit '
27d099a7e128744b7a11ce09b469a3396e872d33':
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de
automerge:
9e7e8af
* commit '
9e7e8afbb934742cb7996b22e32f94c1c09704af':
Joe Fernandez [Sat, 31 Jan 2015 03:04:16 +0000 (03:04 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9
automerge:
cacf7da
* commit '
cacf7da1c4d078641f099bab717e155609c5dc99':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 03:02:42 +0000 (03:02 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
automerge:
7789447
* commit '
7789447bd97c851b7a09623a417300590e5439d5':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 03:01:20 +0000 (03:01 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
automerge:
7e683bd
* commit '
7e683bdaddff77a24a36d420c5782b47795c5ccb':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 02:50:57 +0000 (02:50 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
automerge:
f02a8d9
* commit '
f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
* commit '
1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
docs: training intent doc error update
Wonsik Kim [Fri, 30 Jan 2015 08:48:51 +0000 (17:48 +0900)]
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.
Bug:
18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update
b/
18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:10 +0000 (00:54 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
* commit '
3d5535cfb7755c20619529649b025c4682013b85':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:07 +0000 (00:54 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
* commit '
1d59871e4e8a3a657dab3931d684706c45630a2f':
Resource resolution fixes.
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev
Joe Fernandez [Sat, 31 Jan 2015 00:14:39 +0000 (00:14 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge:
5c9d0de
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Joe Fernandez [Fri, 30 Jan 2015 23:41:10 +0000 (23:41 +0000)]
am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
d801a1238392b8c7a8e0131cee89370143363046':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
Jon Larimer [Fri, 30 Jan 2015 22:24:43 +0000 (22:24 +0000)]
am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:18:34 +0000 (22:18 +0000)]
am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:11:56 +0000 (22:11 +0000)]
am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:09:37 +0000 (22:09 +0000)]
Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
Jinsuk Kim [Fri, 30 Jan 2015 22:00:39 +0000 (22:00 +0000)]
Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
Jinsuk Kim [Fri, 30 Jan 2015 21:58:18 +0000 (21:58 +0000)]
Revert "CEC: Let playback device switch TV input after bootup"
This reverts commit
8913a0e1e8559d96e82b1ff408dd312ed279021b.
Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
159aa73574804967aded45d06b70df5a8dd64a58':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
d403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
Jason Monk [Fri, 30 Jan 2015 18:27:52 +0000 (18:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
Jason Monk [Fri, 30 Jan 2015 18:02:27 +0000 (13:02 -0500)]
Fix QS bluetooth tile accessibility issue
Bluetooth tile was not announcing its state when the top half was
clicked. This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information. So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.
Bug:
19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
Jason Monk [Fri, 30 Jan 2015 16:30:29 +0000 (11:30 -0500)]
Fix expandSettingsPanel status bar call
Use the same mechanism as the two finger gesture to get it to open
correctly.
Bug:
19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
Alan Viverette [Fri, 30 Jan 2015 03:15:06 +0000 (03:15 +0000)]
Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
Legler Wu [Thu, 29 Jan 2015 07:07:39 +0000 (15:07 +0800)]
[DS] Correct the access method for telephony system property
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC
Bug:
18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
Christopher Ferris [Fri, 30 Jan 2015 02:29:26 +0000 (02:29 +0000)]
Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
Rich Slogar [Fri, 30 Jan 2015 01:58:22 +0000 (01:58 +0000)]
am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:53:53 +0000 (01:53 +0000)]
am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:53:48 +0000 (01:53 +0000)]
am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:49:12 +0000 (01:49 +0000)]
am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
6ccb72e685da6769d43545c21182ca44e039da3e':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:44:43 +0000 (01:44 +0000)]
am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
a303121168f1e3cfe62f6836a38ba1a33f3e336d':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:44:39 +0000 (01:44 +0000)]
am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
e4249f29ea56f35aab1337323a0e55992ee9247f':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:41:58 +0000 (01:41 +0000)]
am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
e0063faa8707e2424a33625aaf2228540fa67e85':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:37:23 +0000 (01:37 +0000)]
am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
b86c3b80db09da85b50c1809520bbf893cb83d93':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:37:21 +0000 (01:37 +0000)]
am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:32:17 +0000 (01:32 +0000)]
Merge "docs: linux requirements update" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:30:43 +0000 (01:30 +0000)]
Merge "docs: Card View for Android TV training" into lmp-docs
Alan Viverette [Fri, 30 Jan 2015 01:21:21 +0000 (17:21 -0800)]
Avoid bug in LinearLayout measurement
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.
Bug:
19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
Amit Mahajan [Fri, 30 Jan 2015 00:52:49 +0000 (00:52 +0000)]
Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
Sailesh Nepal [Fri, 30 Jan 2015 00:31:11 +0000 (00:31 +0000)]
Merge "Fix crash when making emergency calls" into lmp-mr1-dev
Christopher Tate [Fri, 30 Jan 2015 00:06:17 +0000 (00:06 +0000)]
Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
Christopher Ferris [Thu, 29 Jan 2015 01:56:32 +0000 (17:56 -0800)]
Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.
Bug:
19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
(cherry picked from commit
e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)
Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
Christopher Tate [Thu, 29 Jan 2015 21:17:37 +0000 (13:17 -0800)]
Don't run full-data backups when backup is disabled
If the scheduled job fires but backup is disabled or the device is
not yet provisioned (i.e. has not yet finished going through setup),
bow out gracefully without running any backup operations. Also, even
if a backup is directly invoked (e.g. via adb), verify again right
before we start collecting app data, and abandon the operation in
that path as well.
(This is redundant; having only the latter test would suffice, but
this lets us distinguish in the logging more easily.)
Finally, make sure that if we were waiting on setup before permitting
backup operations to begin, that we startup the full-data scheduling
as well as the [separate] key/value scheduling.
Bug
19197062
Change-Id: I3d8fb650c50f946d8ed7ac7170df361c707f2528
Raph Levien [Thu, 29 Jan 2015 23:04:14 +0000 (23:04 +0000)]
Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
Igor Viarheichyk [Thu, 11 Sep 2014 22:07:05 +0000 (15:07 -0700)]
Use constants instead of resources for ellipsis.
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.
(cherry-pick of
ed0daa93e48d38e54a7ad1c99c461510a4c07599.)
Bug:
18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
Jinsuk Kim [Thu, 29 Jan 2015 22:33:42 +0000 (22:33 +0000)]
Merge "CEC: Discard key event to itself" into lmp-mr1-dev
Jinsuk Kim [Thu, 29 Jan 2015 07:38:36 +0000 (16:38 +0900)]
CEC: Discard key event to itself
Should discard keyevents if the target address is the device itself.
Bug:
19188660
Change-Id: Id47d79c996f60c9d90540f28c4b2509976d2f378
Jinsuk Kim [Thu, 29 Jan 2015 22:22:30 +0000 (22:22 +0000)]
Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
Jinsuk Kim [Thu, 29 Jan 2015 22:21:53 +0000 (22:21 +0000)]
Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev
Raph Levien [Thu, 29 Jan 2015 22:10:59 +0000 (22:10 +0000)]
Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
Sanket Padawe [Thu, 29 Jan 2015 21:44:04 +0000 (21:44 +0000)]
Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
Jon Larimer [Thu, 29 Jan 2015 20:54:43 +0000 (15:54 -0500)]
Fix build breakage in older branches by avoiding <> notation
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
Raph Levien [Thu, 29 Jan 2015 20:49:19 +0000 (12:49 -0800)]
Refine resolution order for typeface and fontFamily
Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.
Bug:
16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
John Reck [Thu, 29 Jan 2015 20:13:04 +0000 (20:13 +0000)]
Merge "Allow ~Layer() to happen after onGLContextDestroyed" into lmp-mr1-dev
Tyler Gunn [Thu, 29 Jan 2015 19:47:24 +0000 (11:47 -0800)]
Fixing conference merge where only one party is added to conference.
- Adding "onConferenceStarted" listener for Connections.
- This is necessary so that an ImsCall can report the fact that it has
went from being a single party call to a multiparty call. This was not
previously necessary since the multiparty bit change would be detected
when one of the connections being merged changed state. Since we now must
defer the establishment of the conference until all connections have been
merged, we need a means of detecting when the call becomes multiparty.
Bug:
18960042
Change-Id: I3ba138cb546e3efdf89b29d6676d00257a5e00cd
Jon Larimer [Thu, 29 Jan 2015 19:46:00 +0000 (19:46 +0000)]
am
320f505e: am
52fba8d1: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge:
ea63fd7 automerge:
bebfd58
* commit '
320f505ed52f8970b08eb93766af831de0332415':
Jon Larimer [Thu, 29 Jan 2015 19:45:56 +0000 (19:45 +0000)]
am
64bdf77d: am
8bb65246: am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge:
48dad94 -s ours automerge:
6fe42f0 -s ours
* commit '
64bdf77d9515f587f31998b614e524c26b2415a4':
Jon Larimer [Thu, 29 Jan 2015 19:38:51 +0000 (19:38 +0000)]
am
52fba8d1: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge:
ea63fd7 automerge:
bebfd58
* commit '
52fba8d13428665fde405ef91857c00f0d399610':
Jon Larimer [Thu, 29 Jan 2015 19:38:48 +0000 (19:38 +0000)]
am
8bb65246: am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge:
48dad94 -s ours automerge:
6fe42f0 -s ours
* commit '
8bb65246f2655fae8d807db973c5eaeff78733cc':
Jon Larimer [Thu, 29 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge:
ea63fd7
automerge:
bebfd58
* commit '
bebfd58604ae8a70c08056f3a5cd9289b27fe11c':
Jon Larimer [Thu, 29 Jan 2015 19:29:31 +0000 (19:29 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge:
48dad94 -s ours
automerge:
6fe42f0 -s ours
* commit '
6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
Sanket Padawe [Thu, 29 Jan 2015 19:21:34 +0000 (11:21 -0800)]
Suppress logging to avoid showing phone no.
Bug:
19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
Scott Rowe [Thu, 29 Jan 2015 19:01:33 +0000 (11:01 -0800)]
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
Jon Larimer [Thu, 29 Jan 2015 18:57:20 +0000 (18:57 +0000)]
am
8b8d6195: am
9570e144: am
ea63fd7f: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
8b8d61952a4599439f3308a5f73bb0a2a0610563':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:57:17 +0000 (18:57 +0000)]
am
470f3a98: am
0a63d817: am
48dad949: (-s ours) am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
470f3a98be8ecff3beca275c20b085da928e8943':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:55:25 +0000 (18:55 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
automerge:
ea63fd7
* commit '
ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:54:16 +0000 (18:54 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
automerge:
48dad94 -s ours
* commit '
48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
Scott Rowe [Wed, 3 Dec 2014 21:21:53 +0000 (13:21 -0800)]
docs: Card View for Android TV training
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
Jon Larimer [Thu, 29 Jan 2015 18:50:24 +0000 (18:50 +0000)]
am
9570e144: am
ea63fd7f: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
9570e144fe38a53c507838cc5234225c7a0da315':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:50:21 +0000 (18:50 +0000)]
am
0a63d817: am
48dad949: (-s ours) am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
0a63d8176d8c3099c2e40bdbb00220f5aeeff69e':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:43:47 +0000 (18:43 +0000)]
am
ea63fd7f: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:43:43 +0000 (18:43 +0000)]
am
48dad949: (-s ours) am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:40:14 +0000 (18:40 +0000)]
am
9a2793e0: am
074c1116: am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge:
7ab0ac6 -s ours automerge:
f8571c8a -s ours
* commit '
9a2793e0ba11336b57457cde0d6dbc3628e853ed':
Jon Larimer [Thu, 29 Jan 2015 18:36:59 +0000 (18:36 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:36:55 +0000 (18:36 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
a43742ec620cb11faffa2c2b1847dc1accce5736':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:33:34 +0000 (18:33 +0000)]
am
074c1116: am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge:
7ab0ac6 -s ours automerge:
f8571c8a -s ours
* commit '
074c11161aecb1e0e1fc2e5db5588ca5519e4b46':