drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
149,256 Commits 1 Branch 0 Tags
Commit Graph

149256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calin Juravle
9bb0988760 am a5c7194a: am 6db95fc3: am 3d274434: Merge "Pass the name of the native bridge library to the runtime" 
* commit 'a5c7194a476c948ce25beda278804b4100a8a85f':
  Pass the name of the native bridge library to the runtime
 2014-08-08 18:07:30 +00:00
Nicolas Prevot
110b156fd1 am f29ede65: am 528e27a3: am 836bfd4f: Merge "Validate that the authority of incoming uris matches." into lmp-dev 
* commit 'f29ede65fe242b681b0bad6ff4e1cc9e9fc52189':
  Validate that the authority of incoming uris matches.
 2014-08-08 17:59:36 +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
Torne (Richard Coles)
8042822de2 am 534bfb23: am 0a6c1bd5: am 91eb4fc1: Merge "Make WebViewFactory more robust." into lmp-dev 
* commit '534bfb23957030bb6315584ac28dce15d8e0ba9c':
  Make WebViewFactory more robust.
 2014-08-08 17:59:32 +00:00
Narayan Kamath
27c2e62c12 am d641b764: am b6926548: am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev 
* commit 'd641b7648ee3103ed525eb116a46c2242a3b09a9':
  Reduce the frequency of calls to isDexOptNeededInternal.
 2014-08-08 17:59:28 +00:00
Nicolas Prevot
d8f114bbef am a7842a29: am fbd2b316: am f943eff8: Merge "Making getProviderMimeType work across users." into lmp-dev 
* commit 'a7842a29acb742084d6e973e4c16e4f57473ed4d':
  Making getProviderMimeType work across users.
 2014-08-08 17:59:24 +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
c660d0266c am 7e63287b: am 7a312929: am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev 
* commit '7e63287b7d1732df3015d102b508fff9eb3a3afd':
  Combine MediaSession Callback and TransportControlsCallback
 2014-08-08 17:52:46 +00:00
RoboErik
c1500bacf7 am 38d14489: am dfa64e7e: am 027ffc1f: Merge "Change URI type metadata back to text" into lmp-dev 
* commit '38d14489b16a9d389ca35f6c0f1e1d4112f80216':
  Change URI type metadata back to text
 2014-08-08 17:52:41 +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
RoboErik
5ee166565c am aa69645e: am d5a2bc2d: am b64e9e56: Unhide MediaMetadata.Description 
* commit 'aa69645edfab276c4884a5d78331f92c35858a81':
  Unhide MediaMetadata.Description
 2014-08-08 17:47:51 +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
Ji-Hwan Lee
66b07bf79b am ab2a0a9d: am 7664ab3a: am 001c9ab3: Merge "TIF: Make TvContract URI consistent" into lmp-dev 
* commit 'ab2a0a9d97d3d9005887dc2e0a94acf017c53511':
  TIF: Make TvContract URI consistent
 2014-08-08 17:35:00 +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
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
ce41bf8ef0 am 2aff6f41: am ac585d29: am b0b521ea: Update exception handling for MediaCodec 
* commit '2aff6f410d16ed1205ab8765f578d75b1496f509':
  Update exception handling for MediaCodec
 2014-08-08 16:34:54 +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
Craig Mautner
b7e6cf9171 am a1c8a0da: am 408f22c1: am 6cb91260: Make next activity opaque when media stops 
* commit 'a1c8a0da35c09fa086fce43600a399d2831cd057':
  Make next activity opaque when media stops
 2014-08-08 16:17: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
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
7d950a5cd5 am 20c8e5c9: am 9e11f8b9: am 58a56c45: Merge "New screen shut down animation." into lmp-dev 
* commit '20c8e5c964ac29b59a68bcd32079d388c2e32edc':
  New screen shut down animation.
 2014-08-08 15:36:51 +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
cd377d7c97 am 7dd6da02: am 54dc2316: am d1bf647f: Use native ISA for dex code (in case there\'s a NativeBridge) 
* commit '7dd6da02dacfe72e9b4e650bff69eab2cc236942':
  Use native ISA for dex code (in case there's a NativeBridge)
 2014-08-08 14:58:07 +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
e3e6010e69 am 77977566: am 23589caa: am 1d4ad01f: Merge "Volume: Hide zen options during setup." into lmp-dev 
* commit '77977566ca75920f4f4767339249e065a8f7d313':
  Volume: Hide zen options during setup.
 2014-08-08 14:23:45 +00: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
9ee4ca49ef am 2ab1222a: am 85720da2: am 761c4d0e: QS: Make user switcher RTL aware 
* commit '2ab1222a36b0114287302086a4dd22304a21242a':
  QS: Make user switcher RTL aware
 2014-08-08 14:19:39 +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