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

149347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dake Gu
68a9804301 am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev 
* commit 'afb539e6746f19498dced6758cf59b5074e7c76b':
  Transition: remap if views in calling activity became invalid
 2014-08-08 19:36:01 +00:00
Alan Viverette
ad43b0450d am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 
* commit '4f048817789e7d7a4f6c84ebd7d1624b87470f5f':
  Don't make ripples respond to selection state
 2014-08-08 19:35: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
e758fa1d0e am 53eb8f73: am d78521f7: am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev 
* commit '53eb8f738fcf31f827b826af170ce653d4a7e1c4':
  Don't use ViewPropertyAnimatorRT yet
 2014-08-08 19:20:52 +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
72f6564e92 am 3c4c0848: am a61a2b3a: am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev 
* commit '3c4c0848a39311ad5320c0f2482fc1355f956961':
  freeze screen rotation during memory and app launch test
 2014-08-08 18:51:00 +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
John Spurlock
5c8ea2c369 Merge "New api to sync zen mode state from listeners." into lmp-dev 2014-08-08 18:15:47 +00:00
Calin Juravle
e1909c3fc0 am 351ef8e6: am e998bb17: (-s ours) am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops." 
* commit '351ef8e6a34d75daf282983885a7ad727538932a':
  Fix the instruction set for dex file during (re)moving ops.
 2014-08-08 18:12:23 +00:00
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
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
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
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
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
ztenghui
61a6184681 Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 2014-08-08 17:26:08 +00:00
ztenghui
d0d0f1ff59 Update attrs / public.xml for VectorDrawable opacity removal 
bug:16850076

Change-Id: Ib6fea828b14e85cacccc8a901227a8fb068f9121
 2014-08-08 19:48:36 +00:00
Amith Yamasani
40bc0186d0 Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 2014-08-08 17:26:08 +00:00
Amith Yamasani
c2f20b66fd No need to send PRE_BOOT_COMPLETED for new users 
Since the primary purpose is to upgrade databases, no need
to send this broadcast. If system apps care to be informed early
on new user creation, USER_INITIALIZE is an early broadcast.

Also remove some logs that spew when switching users.

Bug: 16846465
Change-Id: Ibd7f8630ce1f41f8cadbda616de05844b127d1a8
 2014-08-08 12:15:17 -07: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
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