Andrew Lee
8afa54206e
am 295e0c8a: am 9ce25877: Aidl changes related to VideoCallProvider in Ims.
...
* commit '295e0c8a7a4ee8757630a7a21a8459a4e67aaa5b':
Aidl changes related to VideoCallProvider in Ims.
2014-08-08 19:50:57 +00:00
Andrew Lee
27273215a8
am 9ce25877: Aidl changes related to VideoCallProvider in Ims.
...
* commit '9ce25877dcaf82d799a9bffac6180bb56d10e66c':
Aidl changes related to VideoCallProvider in Ims.
2014-08-08 19:31:38 +00:00
John Reck
0f5e6b8b36
am d78521f7: am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev
...
* commit 'd78521f7d69630be3f32907de7b5da4358805485':
Don't use ViewPropertyAnimatorRT yet
2014-08-08 19:13:22 +00:00
Andrew Lee
752217bfc6
Aidl changes related to VideoCallProvider in Ims.
...
+ Added a getVideoCallProvider function in IImsCallSession
+ Added IImsVideoCallProvider aidl. This is used for communication
between Telephony and the ImsService. It is redundant with
IVideoCallProvider on some level, but see associated bug and comments
in the class for more detail.
+ Added IImsVideoCallCallback. This is used for communicationing
callback invocations from ImsService to Telephony. It is redundant
with IVideoCallCallback for same reason in bugs/comments.
+ Some minor formatting changes.
Bug: 16886403
Change-Id: I03de12d4432f837e0930bc077307509b645493e0
2014-08-08 12:09:54 -07:00
John Reck
8406a9ea09
am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev
...
* commit '30f8cc8db6286ad4e2508bce3a48ee7ae0eb9b4c':
Don't use ViewPropertyAnimatorRT yet
2014-08-08 19:08:58 +00:00
Guang Zhu
a117d7b28e
am a61a2b3a: am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev
...
* commit 'a61a2b3a3c437fa41e3916eb4aa423cf70604532':
freeze screen rotation during memory and app launch test
2014-08-08 18:46:46 +00:00
Guang Zhu
4d98b3a3d9
am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev
...
* commit '011caab6fd12db45d314868f113bbc2ec38626d3':
freeze screen rotation during memory and app launch test
2014-08-08 18:38:59 +00:00
Calin Juravle
f7256837f1
am e998bb17: (-s ours) am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops."
...
* commit 'e998bb173657b1c1adb88e1a5df6375158a2936a':
Fix the instruction set for dex file during (re)moving ops.
2014-08-08 18:06:38 +00:00
Calin Juravle
773c268874
am 6db95fc3: am 3d274434: Merge "Pass the name of the native bridge library to the runtime"
...
* commit '6db95fc33969b303cc4d1aecb07c593f22dd4d18':
Pass the name of the native bridge library to the runtime
2014-08-08 17:59:35 +00:00
Calin Juravle
e998bb1736
am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops."
...
* commit '94f3e47da5acc48b1003b64acdc539cdf6cbe30c':
Fix the instruction set for dex file during (re)moving ops.
2014-08-08 17:53:50 +00:00
Calin Juravle
6db95fc339
am 3d274434: Merge "Pass the name of the native bridge library to the runtime"
...
* commit '3d274434c78856388484a722da2887ca846907ee':
Pass the name of the native bridge library to the runtime
2014-08-08 17:53:46 +00:00
Nicolas Prevot
2ff92cbe22
am 528e27a3: am 836bfd4f: Merge "Validate that the authority of incoming uris matches." into lmp-dev
...
* commit '528e27a3b64d6ba9cbeb52bea3d7884c39de126c':
Validate that the authority of incoming uris matches.
2014-08-08 17:53:35 +00:00
Torne (Richard Coles)
55ed12ea79
am 0a6c1bd5: am 91eb4fc1: Merge "Make WebViewFactory more robust." into lmp-dev
...
* commit '0a6c1bd5118b6845185d96c70b16a62c19863f2e':
Make WebViewFactory more robust.
2014-08-08 17:53:31 +00:00
Narayan Kamath
b0be3d296a
am b6926548: am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev
...
* commit 'b6926548e3515f528b8e951ccebc18748b382d0a':
Reduce the frequency of calls to isDexOptNeededInternal.
2014-08-08 17:53:26 +00:00
Nicolas Prevot
5960d3b633
am fbd2b316: am f943eff8: Merge "Making getProviderMimeType work across users." into lmp-dev
...
* commit 'fbd2b316aa5c49a73d95ee0fc858ebf2e07fcbaf':
Making getProviderMimeType work across users.
2014-08-08 17:53:22 +00:00
RoboErik
8d285f6438
am 7a312929: am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
...
* commit '7a3129298716b022009fd3ce8c1d167204fd3f42':
Combine MediaSession Callback and TransportControlsCallback
2014-08-08 17:47:58 +00:00
RoboErik
422b14fe15
am dfa64e7e: am 027ffc1f: Merge "Change URI type metadata back to text" into lmp-dev
...
* commit 'dfa64e7e9ce4b8862f3b0c6a9b98e8f092fbd840':
Change URI type metadata back to text
2014-08-08 17:47:54 +00:00
Nicolas Prevot
3bc02c2487
am 836bfd4f: Merge "Validate that the authority of incoming uris matches." into lmp-dev
...
* commit '836bfd4f50c4061a70203bc90ebb74b6e0bc4ae6':
Validate that the authority of incoming uris matches.
2014-08-08 17:46:23 +00:00
Torne (Richard Coles)
f17f4cf9fc
am 91eb4fc1: Merge "Make WebViewFactory more robust." into lmp-dev
...
* commit '91eb4fc134d85ce552c5d1174288b78cb252ece4':
Make WebViewFactory more robust.
2014-08-08 17:46:19 +00:00
Narayan Kamath
e766c87762
am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev
...
* commit 'e00c3d3793983eb5fb2b29fb645121f7fcf05d89':
Reduce the frequency of calls to isDexOptNeededInternal.
2014-08-08 17:46:13 +00:00
Nicolas Prevot
e8b674be1c
am f943eff8: Merge "Making getProviderMimeType work across users." into lmp-dev
...
* commit 'f943eff8ba61e9b9b96f887feb727cc68d884e73':
Making getProviderMimeType work across users.
2014-08-08 17:46:08 +00:00
RoboErik
21fc24363e
am d5a2bc2d: am b64e9e56: Unhide MediaMetadata.Description
...
* commit 'd5a2bc2de189796b710b3cdd653ae86306b22b83':
Unhide MediaMetadata.Description
2014-08-08 17:41:53 +00:00
RoboErik
3bed27572e
am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
...
* commit '6ac104ce57c7337cfd17f53732ca2b645d472830':
Combine MediaSession Callback and TransportControlsCallback
2014-08-08 17:41:41 +00:00
RoboErik
9f2ada4260
am 027ffc1f: Merge "Change URI type metadata back to text" into lmp-dev
...
* commit '027ffc1ff48b14aac43e895d221b42953883cb98':
Change URI type metadata back to text
2014-08-08 17:41:37 +00:00
RoboErik
e20dd9f166
am b64e9e56: Unhide MediaMetadata.Description
...
* commit 'b64e9e56368001c87ac4decacb9a514980f49aff':
Unhide MediaMetadata.Description
2014-08-08 17:32:49 +00:00
Ji-Hwan Lee
f4472a21b7
am 7664ab3a: am 001c9ab3: Merge "TIF: Make TvContract URI consistent" into lmp-dev
...
* commit '7664ab3ad98e4525f24e81d9eace06bbedae6ceb':
TIF: Make TvContract URI consistent
2014-08-08 17:26:47 +00:00
John Reck
171927a62a
Merge "Don't use ViewPropertyAnimatorRT yet" into lmp-dev
2014-08-08 17:26:08 +00:00
John Reck
4937a70cc6
Don't use ViewPropertyAnimatorRT yet
...
Bug: 16894195
Needs more work and soak time
Change-Id: I8d38492b32780f5bba8a3439bfe3dbd30da3811c
2014-08-08 18:29:18 +00:00
RoboErik
6d9fe654b5
Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
2014-08-08 17:26:08 +00:00
Ji-Hwan Lee
fcbbd00050
am 001c9ab3: Merge "TIF: Make TvContract URI consistent" into lmp-dev
...
* commit '001c9ab3ff333e810404f5677a02f3ad684ea766':
TIF: Make TvContract URI consistent
2014-08-08 17:19:21 +00:00
RoboErik
67098d0963
Unhide MediaMetadata.Description
...
This unhides the method and inner class for getting a small version
of the metadata for display.
Change-Id: I22f484cecd5f0630ac22bb648baad842d211d135
2014-08-08 17:16:37 +00:00
Andy Hung
6687380bb9
am ac585d29: am b0b521ea: Update exception handling for MediaCodec
...
* commit 'ac585d2926fc351d671b01a42221f49dda23589f':
Update exception handling for MediaCodec
2014-08-08 16:27:56 +00:00
Andy Hung
f99a1c3a30
am b0b521ea: Update exception handling for MediaCodec
...
* commit 'b0b521eabde47301d1ff6d5b14ef54ffcdf24cdf':
Update exception handling for MediaCodec
2014-08-08 16:23:28 +00:00
Andy Hung
5f9aa0bcea
Update exception handling for MediaCodec
...
Throw MediaCodec.CodecException (versus IllegalStateException).
Print out status error codes as found (See MediaError.h for details).
Update error code mapping to CryptoException.
Bug: 12034929
Bug: 13976475
Change-Id: I23b951cb06807413f087c238a1d3526659f06e7b
2014-08-08 16:15:07 +00:00
Craig Mautner
8f3e9e2094
am 408f22c1: am 6cb91260: Make next activity opaque when media stops
...
* commit '408f22c1ebfac63f90d89fbad091974957af98ee':
Make next activity opaque when media stops
2014-08-08 16:13:30 +00:00
Guang Zhu
4ed52ab752
Merge "freeze screen rotation during memory and app launch test" into lmp-dev
2014-08-08 16:09:03 +00:00
Guang Zhu
e2a03fe43d
freeze screen rotation during memory and app launch test
...
Change-Id: I2a039be383562019a0af9470c5053cd3cb1e6142
2014-08-08 11:30:21 -07:00
Craig Mautner
b69451bd6b
am 6cb91260: Make next activity opaque when media stops
...
* commit '6cb9126068b084248276a21e2b72451d8618a30a':
Make next activity opaque when media stops
2014-08-08 16:08:48 +00:00
Craig Mautner
fa387ad6cf
Make next activity opaque when media stops
...
Call convertFromTranslucent on next activity when an activity below
it stops playing media.
Fixes bug 14469711.
Change-Id: I7e4346987cb620cb3a8c09096ff3a639cf344679
2014-08-08 16:05:02 +00:00
Michael Lentine
e64e4c6e43
am 9e11f8b9: am 58a56c45: Merge "New screen shut down animation." into lmp-dev
...
* commit '9e11f8b98c0c22600d196ba9c8231ea9fcd4f7f0':
New screen shut down animation.
2014-08-08 15:33:17 +00:00
Michael Lentine
84c242f1d1
am 58a56c45: Merge "New screen shut down animation." into lmp-dev
...
* commit '58a56c451bd5a994d358b764a016628e6088b6f4':
New screen shut down animation.
2014-08-08 15:28:45 +00:00
Calin Juravle
a98b7c28d5
am 54dc2316: am d1bf647f: Use native ISA for dex code (in case there\'s a NativeBridge)
...
* commit '54dc23162210fce71f5d86ab51ec1ff50b2f70de':
Use native ISA for dex code (in case there's a NativeBridge)
2014-08-08 14:54:24 +00:00
Calin Juravle
1881d5cf7e
am d1bf647f: Use native ISA for dex code (in case there\'s a NativeBridge)
...
* commit 'd1bf647fc6c3603238e96a4a99855344f134e81e':
Use native ISA for dex code (in case there's a NativeBridge)
2014-08-08 14:50:21 +00:00
Calin Juravle
8ad7f2051d
Use native ISA for dex code (in case there's a NativeBridge)
...
In the presence of a native bridge it is more efficient to compile the
dex directly to the native ISA than to use the shared library ISA as a
reference.
This can be achieve by configuring the readonly system properties to map
between the .so ISA and the desired dex code .ISA (e.g.
ro.dalvik.vm.isa.ISA1=ISA2).
Bug: 16185267
(cherry picked from commit I50baa7b37e1465b9adf72d6f6b96f526a08d59c7)
(cherry picked from commit I8fe453a800812e382e8f41b5f7922997aa9c18a9)
Change-Id: I6c9684149691285310c961189b58af8c7f47aff4
2014-08-08 15:37:17 +01:00
John Spurlock
91a21e2972
am 23589caa: am 1d4ad01f: Merge "Volume: Hide zen options during setup." into lmp-dev
...
* commit '23589caa88bb5a7fde62a9edff4ac189e56b8ccb':
Volume: Hide zen options during setup.
2014-08-08 14:19:43 +00:00
Adrian Roos
5814378fdd
am 85720da2: am 761c4d0e: QS: Make user switcher RTL aware
...
* commit '85720da2701a346f58b7f37b56c30f757c5632bc':
QS: Make user switcher RTL aware
2014-08-08 14:15:35 +00:00
John Spurlock
6b1fc808a1
am 1d4ad01f: Merge "Volume: Hide zen options during setup." into lmp-dev
...
* commit '1d4ad01f609ece9355693550c8d340f7f69866df':
Volume: Hide zen options during setup.
2014-08-08 14:15:23 +00:00
Adrian Roos
5d97914505
am 761c4d0e: QS: Make user switcher RTL aware
...
* commit '761c4d0e57d7a3b6d51185491d7f06d8619a0bc3':
QS: Make user switcher RTL aware
2014-08-08 14:10:54 +00:00
Adrian Roos
0832b48221
QS: Make user switcher RTL aware
...
Bug: 16406694
Change-Id: I00efaf34281945635aa91bc3871ca6361c946ffe
2014-08-08 15:59:03 +02:00
Adrian Roos
24cdf3c047
am 7ade8a29: am 7e690eb1: QS: Make user switcher expand when users don\'t fit
...
* commit '7ade8a297483baac876fc81b7b7e0f9bd57330ec':
QS: Make user switcher expand when users don't fit
2014-08-08 13:27:04 +00:00