Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
147,978 Commits 3 Branches 0 Tags
449709fb9da3054a210c3e968aad5e2020cc366c
Commit Graph

147978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sandeep Siddhartha
449709fb9d am 0edd1360: Merge "Add the capture session (and its availability) in the EventPayload" into lmp-dev 
* commit '0edd136087cb8a1b4b91dd581e347337878f10f9':
  Add the capture session (and its availability) in the EventPayload
 2014-08-08 22:23:39 +00:00
Jinsuk Kim
080b754177 am ca4fb8cd: Merge "CEC: Content observer to handle TV Setting update" into lmp-dev 
* commit 'ca4fb8cde4fe3c1dd7a4d8c572d96b0a0f5dbc30':
  CEC: Content observer to handle TV Setting update
 2014-08-08 22:23:34 +00:00
Dongwon Kang
8cbd00749a am e2ba5b0b: Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 
* commit 'e2ba5b0bfc2ecb33bf31f919f4f09957bd871534':
  TIF: introducing TvInputSettings for put/getting user preferences from Settings.
 2014-08-08 22:23:29 +00:00
Nancy Chen
3fc948b48a am 7bbac19e: Merge "Better comments for the CONNECTING state." into lmp-dev 
* commit '7bbac19ecafb8f87dabf2025996ccb73e18ea05f':
  Better comments for the CONNECTING state.
 2014-08-08 22:15:09 +00:00
Dongwon Kang
b9cc15c85c am 84e195cd: TIF: fix a regression introduced while addressing merge conflict in TIS 
* commit '84e195cdf794b590a070accded45e228fe1fbfd3':
  TIF: fix a regression introduced while addressing merge conflict in TIS
 2014-08-08 22:15:02 +00:00
Jay Shrauner
d8336e73c9 am d6b5cd19: Merge "Rename Internet calls SIP calls" into lmp-dev 
* commit 'd6b5cd19fdd58c90ce51b397c621c1d89aa2e187':
  Rename Internet calls SIP calls
 2014-08-08 21:39:02 +00:00
Dongwon Kang
c566ca54b1 TIF: fix a regression introduced while addressing merge conflict in TIS 
Plus, a small code refactoring on DO_CREATE_SESSION for lower indentation
depth.

Bug: 16833301
Change-Id: Id0cb2df26015ea8286a1cf03024c44fa15f2628e
 2014-08-08 21:36:38 +00:00
Svetoslav
5873861ccb am 3b94d0d8: Merge "Polish the new cross-profile app widget APIs" into lmp-dev 
* commit '3b94d0d84b69717829fec51653e83580d3148fb8':
  Polish the new cross-profile app widget APIs
 2014-08-08 21:17:01 +00:00
ztenghui
1b41552385 am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit '6ab0f21f2c838da710659e9cc5e2d5813d16ca49':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:08:29 +00:00
Winson Chung
f62ff50168 am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '14176afa349fb17ba6327e12882e503fd84f41a0':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 20:56:09 +00:00
Amith Yamasani
377d926096 am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit 'c35d3ebb1381e52db1929206524a72d258ba6aea':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 20:56:04 +00:00
John Reck
972466f7e9 am 4f215996: Fix damage for layers for projection receivers 
* commit '4f2159960c7a8921834677f748d7018774685a21':
  Fix damage for layers for projection receivers
 2014-08-08 20:43:52 +00:00
Dongwon Kang
9dfd731db5 Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 2014-08-08 20:34:05 +00:00
Dongwon Kang
4d933a0ef0 TIF: introducing TvInputSettings for put/getting user preferences from Settings. 
Reference:
  - Settings.Secure.ENABLED_INPUT_METHODS
  - InputMethodSettings

Bug: 16876078
Change-Id: I72c1770517052188694f21c10da383338edc8ee2
 2014-08-08 21:36:50 +00:00
John Reck
a7c2ea20c4 Fix damage for layers for projection receivers 
Bug: 16880228

Change-Id: I59ab760a21f49cc2cac0d8936b173cff292e6114
 2014-08-08 20:24:34 +00:00
John Spurlock
f36a999bf4 am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit '508dc373dd3eda0da7ff104fd60acbd1338ae718':
  New api to sync zen mode state from listeners.
 2014-08-08 20:16:53 +00:00
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
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
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
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
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
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
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
Winson Chung
4f70cacd45 Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 2014-08-08 16:09:03 +00:00
Winson Chung
e9217a0729 Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622) 2014-08-08 11:27:41 -07:00
Alan Viverette
0df0e19f29 Merge "Don't make ripples respond to selection state" into lmp-dev 2014-08-08 16:09:03 +00:00
Alan Viverette
dbcbca4475 Don't make ripples respond to selection state 
Also exports view pressed state for hierarchyviewer.

BUG: 16622634
Change-Id: I754428dd1d59f3b7450b01976a73d5151d27152e
 2014-08-08 12:23:41 -07: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
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