Commit Graph

14191 Commits

Author SHA1 Message Date
Tyler Gunn
bd6dfcc205 Merge \\"Add onConferenceSupportedChanged callback, carrier config.\\" into nyc-mr1-dev am: 780648be53
am: da457b206e

Change-Id: I8d2c147c2455dcf6dfcedfde43890b4962f7b4cd
2016-06-28 00:06:48 +00:00
Tyler Gunn
da457b206e Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev
am: 780648be53

Change-Id: I71c24e971bf8d36fd5448497b85660be43417632
2016-06-27 21:40:04 +00:00
Tyler Gunn
780648be53 Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev 2016-06-27 21:35:49 +00:00
Yohei Yukawa
a3fd8bfdfe Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp
am: c58ffb3f9c

Change-Id: Iddc693412d20b86c3a916dd09764d14d23c4fcf4
2016-06-27 20:34:58 +00:00
Yohei Yukawa
badcecb2aa Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev
am: cb56978912

Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
2016-06-27 20:30:49 +00:00
Yohei Yukawa
cb56978912 Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev 2016-06-27 20:18:51 +00:00
Sanket Padawe
2031d69810 Merge \\"Fix documentation of getTelephonyHistogram() api.\\" into nyc-mr1-dev am: afcc40f818
am: fe84c788e0

Change-Id: I7d666c23212797b824ea0387112636fb0861a2d5
2016-06-27 19:37:00 +00:00
Sanket Padawe
fe84c788e0 Merge \"Fix documentation of getTelephonyHistogram() api.\" into nyc-mr1-dev
am: afcc40f818

Change-Id: I82a3f890479ce0358b28d1ec6a42c9f154e0d3f0
2016-06-27 19:29:39 +00:00
Sanket Padawe
afcc40f818 Merge "Fix documentation of getTelephonyHistogram() api." into nyc-mr1-dev 2016-06-27 19:21:56 +00:00
Sanket Padawe
7f89016579 Fix documentation of getTelephonyHistogram() api.
Bug: 29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
2016-06-27 11:57:01 -07:00
Tyler Gunn
7d633d3337 Add onConferenceSupportedChanged callback, carrier config.
Used to inform listeners when a connection can or cannot be part of a
conference.  Used to inform the conference controller so that it can
recalculate the conferencable connections.

Adding carrier config for carrier requirement.

Bug: 29059073
Change-Id: Iab028fd44d87c8dc2bbbe8bba7ba9ccdc223fe51
2016-06-27 10:49:04 -07:00
Sungsoo Lim
d7e7813734 MediaMetadata: Unhide METADATA_KEY_MEDIA_URI
Bug: 29025504
Change-Id: I38973366ead5878a121b266ce7daf63689858cd0
2016-06-27 11:49:09 +09:00
TreeHugger Robot
57a289865b Merge "Make getTransition a @TestApi for CTS tests." 2016-06-24 21:46:58 +00:00
George Mount
f239f99113 Make getTransition a @TestApi for CTS tests.
Bug 29570647

Change-Id: I85b2b215fbad2ca72e67b17a29cc9b122ae5945e
2016-06-24 11:53:42 -07:00
Yi Kong
dc13e467f0 Merge \\\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\\" into stage-aosp-master am: a725dbd6c7 am: 79f65e5d67
am: a5f5a0ec51

Change-Id: Ifc906ae9d7e23b86397ab425b04309897803b45a
2016-06-24 17:11:27 +00:00
Yi Kong
a5f5a0ec51 Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage-aosp-master am: a725dbd6c7
am: 79f65e5d67

Change-Id: I02446be0c5ce1840dcb21b4019b7a02cf0bee3f5
2016-06-24 17:01:06 +00:00
Yi Kong
79f65e5d67 Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
2016-06-24 16:55:38 +00:00
Yi Kong
a725dbd6c7 Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master 2016-06-24 16:47:31 +00:00
Przemyslaw Szczepaniak
f4c09099ea Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06 am: 3606de0fb4
am: 9dcaf12623

Change-Id: Ifa23e2d020195c326fd41889bb9ffc5186db7617
2016-06-24 12:02:23 +00:00
Przemyslaw Szczepaniak
9dcaf12623 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06
am: 3606de0fb4

Change-Id: I65867f77e21821fdcd62247bf242def4807f09dd
2016-06-24 11:58:07 +00:00
Przemyslaw Szczepaniak
3606de0fb4 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
am: ab3d167f06

Change-Id: Ie65f8c8d85ea689c210a40b3ee6373c146488cd1
2016-06-24 11:53:57 +00:00
Przemyslaw Szczepaniak
a0ba0fb7eb Merge \\\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\\" am: 36ce097dbb am: 12bb15c1d3 am: 387191bc64
am: 89d16125be

Change-Id: Ife2190fa27996f78152e2bbe0fbb0649ac969acf
2016-06-24 11:42:22 +00:00
Przemyslaw Szczepaniak
89d16125be Merge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce097dbb am: 12bb15c1d3
am: 387191bc64

Change-Id: I4bede82fd01c3a80a67dadf545e9ffdc1ab7c8e0
2016-06-24 11:38:01 +00:00
Przemyslaw Szczepaniak
387191bc64 Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb
am: 12bb15c1d3

Change-Id: I5a44a8a58c0f90396c95755e919c05fdd500a3cd
2016-06-24 11:33:42 +00:00
Przemyslaw Szczepaniak
ab3d167f06 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
version with test-current.txt

Bug: 28666126
Change-Id: Ib97b5124e0cf28370b0deee81306e761c9bf9059
2016-06-24 11:33:27 +00:00
Przemyslaw Szczepaniak
12bb15c1d3 Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am: 36ce097dbb

Change-Id: Ida8dcbbd72df17bbcc49bbccc0cec562d4a6a0e7
2016-06-24 11:23:01 +00:00
Przemyslaw Szczepaniak
18d9fb485c Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
This change reverts previous fix for b/27582395 and makes
AbstractStringBuffer an Appendable. 

Bug: 28666126
Bug: 27582395 
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b
2016-06-24 10:53:06 +00:00
Yi Kong
88b878505e Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259
Bug: 29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
(cherry picked from commit fdbf33126e)
2016-06-24 11:15:33 +01:00
Dmitri Plotnikov
abcc4392e9 Merge \\"Unhiding DEVICE_NAME\\" into nyc-mr1-dev am: b1ca092db8
am: 89858c58af

Change-Id: Id7ccc6d627574bb1a1d0198f72ab70f921d8c9d9
2016-06-24 00:37:57 +00:00
Dmitri Plotnikov
89858c58af Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
2016-06-24 00:32:44 +00:00
Dmitri Plotnikov
b1ca092db8 Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev 2016-06-24 00:23:13 +00:00
Yohei Yukawa
45700fa135 Use a flag to grant a temporary URI permission.
It turns out that we can let the system to call
InputMethodService#exposeContent(InputContentInfo, EditorInfo), which
added in my previous CL [1], during the IME is calling
InputConnection#commitContent() as follows.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  getCurrentInputConnection().commitContent(
          inputContentInfo,
          InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION,
          null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

This gives us flexibility to let InputConnection#commitContent() do all
the magic for IME developers like other APIs such as
Context#startActivity(), rather than asking them to call one more API to
grant a temporary URI permission like a scenario where
Context#grantUriPermission() is used.

 [1]: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
      25e0813e6e

Bug: 29450031
Change-Id: I99536cd58c9984af30b0bafb4a1dd25a26634a2d
2016-06-23 17:12:59 -07:00
Tyler Gunn
d6d8745bb2 Add support for dropping fg video call on answer of audio call. am: 4b6614e576
am: b90e2dc722

Change-Id: I09a322e50a6989375f2ba1ec4a81b2fb0ee8876b
2016-06-23 20:52:30 +00:00
Tyler Gunn
b90e2dc722 Add support for dropping fg video call on answer of audio call.
am: 4b6614e576

Change-Id: Id51de6ca0d6f885a22374e2a2c0a38477a5e2df7
2016-06-23 20:21:09 +00:00
Tyler Gunn
4b6614e576 Add support for dropping fg video call on answer of audio call.
Adding two new carrier config options:
1. treat_downgraded_video_calls_as_video_calls_bool - when there is an ongoing
call which was previously a video call (or is currently video call), some
carriers require that this is treated as if it is a video call for
telephony logic such as in (2).
2. drop_video_call_when_answering_audio_call_bool - if the user is in an
active video call (see (1)) over wifi, and an incoming audio call comes in,
when this carrier config option is "TRUE", the video call will be dropped
when the audio call is answered.

Adding new connection extra to indicate to the dialer app that answering
a ringing call will cause the current active video call to drop.

Bug: 29275420
Change-Id: Ied5dbabc8ff09045ba41c5eba2136adad10db80e
2016-06-23 12:48:43 -07:00
Andrew Sapperstein
7fe3adcf26 Merge \"Merge \\"Add colorSecondary theme attribute.\\" into nyc-mr1-dev am: ddb980de05\" into nyc-mr1-dev-plus-aosp
am: cd10a1fce1

Change-Id: I645b91c902e1772b40a42b10504316990ef74ae6
2016-06-23 19:09:33 +00:00
Andrew Sapperstein
d861ae9847 Merge \"Add colorSecondary theme attribute.\" into nyc-mr1-dev
am: ddb980de05

Change-Id: I4da850a2d146ed594ac76e66b34e367dac03b821
2016-06-23 18:44:57 +00:00
Andrew Sapperstein
ddb980de05 Merge "Add colorSecondary theme attribute." into nyc-mr1-dev 2016-06-23 18:37:42 +00:00
Ta-wei Yen
3bfaeb7c6f Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am: fbb87a0591
am: 6b4c1e2d9b

Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36
2016-06-23 02:41:07 +00:00
Ta-wei Yen
6b4c1e2d9b Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev
am: fbb87a0591

Change-Id: I2e1e11c5ef9ec8a166d232efd4f167de6a4d55f2
2016-06-23 02:35:38 +00:00
Ta-wei Yen
fbb87a0591 Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev 2016-06-23 02:28:24 +00:00
Yohei Yukawa
bf055ba658 Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13
am: d02470f5a8

Change-Id: Id551d53ae3d7c34157ddf166aa44bdef67d46853
2016-06-23 01:37:10 +00:00
Yohei Yukawa
d02470f5a8 Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev
am: dc42d7dd13

Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
2016-06-23 01:29:58 +00:00
Yohei Yukawa
dc42d7dd13 Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev 2016-06-23 01:25:39 +00:00
Ta-wei Yen
1121017213 Add more configuration state for visual voicemail
Bug: 26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
2016-06-22 17:48:52 -07:00
Jim Miller
f0db3158fb Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641
am: 0a7efa1e47

Change-Id: Id8de76d28e581f5a4fa448dd48dc33870d81b538
2016-06-23 00:25:06 +00:00
Jim Miller
0a7efa1e47 Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
am: 0520091641

Change-Id: I285f751bd449c89685a88ad30073cd011dfe5061
2016-06-23 00:20:57 +00:00
Yohei Yukawa
25e0813e6e Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.

With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission.  Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.

Here is a sample code snippet about how to use this mechanism.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  exposeContent(contentInfo, getCurrentInputEditorInfo());
  getCurrentInputConnection().commitContent(inputContentInfo, null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

 [1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
      152944f490
 [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
      adebb52588

Bug: 29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
2016-06-22 16:31:41 -07:00
Jim Miller
07e0384a4e Enable fingerprint sensor navigation to invoke QuickSettings
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"

Fixes bug 28869612

Change-Id: I321240ee54506633d63a29e987b8d8638c652391
2016-06-22 15:18:13 -07:00
Makoto Onuki
02f355df6b Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp
am: 24c52732d7

Change-Id: Ib54aff79c823b6819d94ef0ef6194e4541bf734f
2016-06-22 00:55:32 +00:00