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

148145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rachad
2c401029e5 am eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev 
* commit 'eca07a163ac37e1c72c2e174679068789df977dc':
  Added Tunneled video playback support to MediaCodec
 2014-08-09 05:06:38 +00:00
Adam Lesinski
4649fdfb65 am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '96dc06291a7fc8779730419d0a9fcd00d526285f':
  AAPT support for feature splits
 2014-08-09 01:58:10 +00:00
Winson Chung
2ce27629d4 am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit '038561b5d34ed2b97d3e0d8e236f3ce30b7557ef':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 00:56:46 +00:00
Jean-Michel Trivi
8b72930bc0 Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev 2014-08-09 00:51:24 +00:00
Jeff Sharkey
3d1232f351 Merge "GID-based permissions are defined by "android"." into lmp-dev 2014-08-09 00:45:27 +00:00
Jeff Sharkey
fb2c4d1861 GID-based permissions are defined by "android". 
This matches all other permissions defined by framework-res.apk,
instead of leaving it null.

Bug: 16907551
Change-Id: I7e2d671443d987906b2f29aa1579bef6380e8a52
 2014-08-10 13:58:05 -07:00
Jae Seo
d86eb6f8a4 Merge "TIF: Move watch history logging to TvProvider" into lmp-dev 2014-08-09 00:45:27 +00:00
Jae Seo
7eb75dff7a TIF: Move watch history logging to TvProvider 
There are only two kinds of watch events that can happen on the system:
 1. The current TV input session is tuned to a new channel.
 2. The session is released for some reason.
The former indicates the end of the previous log entry, if any, followed by the
start of a new entry. The latter indicates the end of the most recent entry for
the given session. Here the system supplies the database the smallest set of
information only that is sufficient to consolidate the log entries while
minimizing database operations in the system service.

Bug: 14791151, Bug: 15921205, Bug: 15988715, Bug: 16831555
Change-Id: Ifcb1a1273c14ee234919d819d082b1004eb92ebc
 2014-08-10 10:39:52 -07:00
Rachad
6adf47eacc Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev 2014-08-09 00:45:27 +00:00
Rachad
73fc533b2e Added Tunneled video playback support to MediaCodec 
Bug:16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
 2014-08-09 01:29:43 +00:00
Barnaby James
d78e811498 Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev 2014-08-09 00:45:27 +00:00
Barnaby James
b8850040c4 Remove constants for VOICE_CONTROL_ZEN_MODE. 
Change-Id: I197d68e66d9a1b197e7c35fd140101458cf5bfc7
 2014-08-08 22:48:35 -07:00
Jae Seo
186b869020 Merge "Ensure that custom label isn't empty" into lmp-dev 2014-08-09 00:40:15 +00:00
Jaewan Kim
05abff10e3 Ensure that custom label isn't empty 
This also changes getHiddenTvInputIds to return mutable ArrayList.

Bug: 16876078
Change-Id: Ib84a071e7a7cf390ac4f9cf69f3d8daf218d657d
 2014-08-11 21:01:36 +09:00
Vinit Deshpande
88992bc90c Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev 2014-08-09 00:40:15 +00:00
Vinit Deshpande
894651bab5 Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE 
This is unhiding some unwanted changes too; but we'll fix that later.

Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457
 2014-08-10 19:30:00 +00:00
Christopher Tate
83b2fb8f73 Merge "Start using cancelFullBackup() when appropriate" into lmp-dev 2014-08-09 00:40:15 +00:00
Christopher Tate
bf1a4a81eb Start using cancelFullBackup() when appropriate 
The API was in place but the framework wasn't yet calling it.

Bug 16524520

Change-Id: Ie368758c830a7d0ad11e7dd3142a0ed896069944
 2014-08-09 00:48:47 +00:00
Sailesh Nepal
ea201b31a3 Merge "Use thread safe set for RemoteConnection.mListeners" into lmp-dev 2014-08-09 00:40:15 +00:00
Sailesh Nepal
d5bcb68cb7 Use thread safe set for RemoteConnection.mListeners 
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.

Bug: 16901565
Change-Id: I7666ef61e94994963b2c2634a9a250365e753888
 2014-08-09 16:36:35 -07:00
Tyler Gunn
c4d63d705c Merge "Adding camera failure/ready session events." into lmp-dev 2014-08-09 00:40:15 +00:00
Jay Shrauner
745ba00491 Merge "Use thread safe set for adapter set" into lmp-dev 2014-08-09 00:40:15 +00:00
Adam Lesinski
ec64709ce0 Merge "AAPT support for feature splits" into lmp-dev 2014-08-09 00:40:15 +00:00
Jay Shrauner
b0c0e36faf Use thread safe set for adapter set 
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.

Bug:16898286
Change-Id: I5d94b403469e98c5f5431fc1d0ad020985100cfd
 2014-08-08 17:08:53 -07:00
Jose Lima
d2655891f1 am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '927d07eca6941c5c331a6491ff1b45850fa1bc44':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:03:44 +00:00
Amith Yamasani
e6e2d08938 am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '3cb156372b0b18030196e17f1d503e2a62531594':
  Allow singleton providers to accept connections from other users
 2014-08-08 23:56:48 +00:00
Amith Yamasani
a6f4d58b90 Allow singleton providers to accept connections from other users 
This is required for singleton providers like sms log.

Change-Id: Icb18a764c27dc1b43f8b8bcc24c21c91274995fd
 2014-08-08 16:50:42 -07:00
George Mount
8a881cc33a am 8011744b: Merge "Move shared elements to overlay when in a transition group." into lmp-dev 
* commit '8011744b52dbd2089b079fcd7e426550f40a8379':
  Move shared elements to overlay when in a transition group.
 2014-08-08 23:48:19 +00:00
Jeff Sharkey
0369cdf329 am 64f7e438: Move DocumentsUI settings into overflow menu. 
* commit '64f7e43838255464164b5dd56595590ec14eefab':
  Move DocumentsUI settings into overflow menu.
 2014-08-08 23:16:54 +00:00
Jose Lima
7f708ecc2f Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 2014-08-08 23:07:59 +00:00
Jose Lima
b6d77e2d16 Added StatusBarNotification.aidl to frameworks/base/Android.mk 
Change-Id: I98fb4821642e3431bb41506de3d8905f90a40729
 2014-08-08 16:39:28 -07:00
George Mount
9985aaf268 Merge "Move shared elements to overlay when in a transition group." into lmp-dev 2014-08-08 23:02:20 +00:00
Jeff Sharkey
669f8e7c70 Move DocumentsUI settings into overflow menu. 
Also use different strings based on device type to make clearer.

Bug: 13437894
Change-Id: I4053780de2c7197fb45cc53aee7659e9d0d75c0a
 2014-08-08 23:00:55 +00:00
Igor Murashkin
9346385035 am b4131ac5: camera2: Fix TotalCaptureResult#getKeys not to return empty list 
* commit 'b4131ac563d136ca7cb33afef876b0862522879f':
  camera2: Fix TotalCaptureResult#getKeys not to return empty list
 2014-08-08 22:48:37 +00:00
Igor Murashkin
696bbee963 camera2: Fix TotalCaptureResult#getKeys not to return empty list 
Bug: 16680352
Change-Id: Ie6b8a8bff6f9b87d058a21b07eb3447371a62b6b
 2014-08-08 22:45:00 +00:00
Adam Lesinski
911456c7d3 am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev 
* commit '38daa3c57a87a42bfbdce3d85535ff106fe6a8b4':
  Second iteration of the UsageStats API
 2014-08-08 22:39:56 +00:00
Jeff Sharkey
49049f62a2 am bc974e19: Separate MIME icons for some office formats. 
* commit 'bc974e19d92e72a146a3183938ebf1c11e941853':
  Separate MIME icons for some office formats.
 2014-08-08 22:28:23 +00:00
Jeff Sharkey
cad072ac48 am b5468f8e: More material updates to DocumentsUI. 
* commit 'b5468f8ec4bc42a70665c5f5581c4054afb5e1ea':
  More material updates to DocumentsUI.
 2014-08-08 22:28:18 +00:00
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
Jeff Sharkey
770a532886 Separate MIME icons for some office formats. 
Bug: 12548097
Change-Id: I11808854e0a4fae2636a04f75599e022b4a8440f
 2014-08-08 22:23:32 +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
Tyler Gunn
7edbe283be Adding camera failure/ready session events. 
The VT provider can use these to inform In-Call of a camera failure and
the camera becoming ready again after recovery.

Bug: 16900653
Change-Id: I279176860b30d02f55732b327ac3385eff8d19a8
 2014-08-08 15:22:40 -07:00
Jeff Sharkey
c29dd61cbf More material updates to DocumentsUI. 
All assets cut as alpha variants so we apply desired tinting at
runtime.  Small script to automatically generate XML resources.

Bug: 15836082, 16658537
Change-Id: I803b3f0bf6f121194a5445fd1c6600fabaf28f60
 2014-08-08 22:22:39 +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