OSDN Git Service
Sandeep Siddhartha [Mon, 11 Aug 2014 17:14:55 +0000 (17:14 +0000)]
Merge "Add debugging info to VIS via dump()" into lmp-dev
Yorke Lee [Sun, 10 Aug 2014 20:52:21 +0000 (13:52 -0700)]
Block access to call logs from the corp profile
Bug:
16812842
Change-Id: Ie4342b5efb2419097c35c0ddebd486a098cea523
Sandeep Siddhartha [Fri, 8 Aug 2014 22:28:46 +0000 (15:28 -0700)]
Add debugging info to VIS via dump()
Change-Id: I9e8f4536de309256db835b30d94765bfc27d4e80
Etan Cohen [Fri, 8 Aug 2014 22:44:23 +0000 (15:44 -0700)]
Add configuration flag controlling whether IMS can be completely disabled.
Change-Id: I70e6fc163d65bba7d1260df0acb74ca614e54b68
Craig Stout [Mon, 11 Aug 2014 15:12:29 +0000 (15:12 +0000)]
Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev
Barnaby James [Mon, 11 Aug 2014 14:31:39 +0000 (14:31 +0000)]
Merge "Make Test Voice Interactor support new requirements." into lmp-dev
Barnaby James [Sat, 9 Aug 2014 21:10:14 +0000 (14:10 -0700)]
Make Test Voice Interactor support new requirements.
Add settings activity and stub RecognizerService to voice interactor test.
Change-Id: I3c3dda7d2c30eac5e0b889c0c7305dc8f4dfbcb9
Rachad [Sat, 9 Aug 2014 04:56:24 +0000 (04:56 +0000)]
Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev
Rachad [Wed, 30 Jul 2014 00:20:48 +0000 (17:20 -0700)]
Added Tunneled video playback support to MediaCodec
Bug:
16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
Adam Lesinski [Sat, 9 Aug 2014 01:48:35 +0000 (01:48 +0000)]
Merge "AAPT support for feature splits" into lmp-dev
John Spurlock [Mon, 11 Aug 2014 14:27:09 +0000 (14:27 +0000)]
Merge "QS: Fix some QS layout issues." into lmp-dev
John Spurlock [Sun, 10 Aug 2014 22:04:16 +0000 (18:04 -0400)]
QS: Fix some QS layout issues.
- Make the tile list configurable for testing.
- Support an external tile backed by a sticky broadcast intent.
- Ensure tiles clean up properly when no longer needed.
Bug:
16818269
Bug:
16822505
Change-Id: Ie24f878aae0d19c7f1feca4c519d10667023bef3
Jae Seo [Mon, 11 Aug 2014 14:21:43 +0000 (14:21 +0000)]
Merge "Ensure that custom label isn't empty" into lmp-dev
Jaewan Kim [Sun, 10 Aug 2014 13:52:38 +0000 (22:52 +0900)]
Ensure that custom label isn't empty
This also changes getHiddenTvInputIds to return mutable ArrayList.
Bug:
16876078
Change-Id: Ib84a071e7a7cf390ac4f9cf69f3d8daf218d657d
Calin Juravle [Thu, 7 Aug 2014 13:45:53 +0000 (14:45 +0100)]
Pass the name of the native bridge library to the runtime
Bug:
16843953
(cherry picked from commit
2f4cf2cfd1125abfe928d6137f3d1553b0888f61)
Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
Vinit Deshpande [Sun, 10 Aug 2014 22:00:30 +0000 (22:00 +0000)]
Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev
Vinit Deshpande [Fri, 8 Aug 2014 21:46:56 +0000 (14:46 -0700)]
Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE
This is unhiding some unwanted changes too; but we'll fix that later.
Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457
Nicolas Prevot [Mon, 11 Aug 2014 12:46:52 +0000 (12:46 +0000)]
Merge "Removing the personal icon, which was only a placeholder." into lmp-dev
Nicolas Prevot [Mon, 11 Aug 2014 11:19:14 +0000 (12:19 +0100)]
Removing the personal icon, which was only a placeholder.
This icon should never show up: the avatar of the personal space should show up instead.
If something goes wrong and correct avatar fails to show, the systems falls back to the green android now, which is desired behaviour.
BUG:
15875652
Change-Id: I41beb4cbd5e707d27ef6d4cf35d02ec9cfa1b61d
Jeff Sharkey [Sun, 10 Aug 2014 23:12:14 +0000 (23:12 +0000)]
Merge "GID-based permissions are defined by "android"." into lmp-dev
Jeff Sharkey [Sun, 10 Aug 2014 20:57:45 +0000 (13:57 -0700)]
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
Sailesh Nepal [Sun, 10 Aug 2014 02:50:35 +0000 (02:50 +0000)]
Merge "Use thread safe set for RemoteConnection.mListeners" into lmp-dev
Sailesh Nepal [Sat, 9 Aug 2014 23:36:35 +0000 (16:36 -0700)]
Use thread safe set for RemoteConnection.mListeners
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.
Bug:
16901565
Change-Id: I7666ef61e94994963b2c2634a9a250365e753888
Dianne Hackborn [Sat, 9 Aug 2014 00:35:50 +0000 (17:35 -0700)]
Fix issues
16739817 and
16709247 in voice interaction service.
Issue #
16739817 VIS doesn't start for non-primary user(s)
Issue #
16709247 GSA is not the default voice interaction agent
These are both fixed by getting rid of the existing code for applying
the default voice recognizer, moving it in to the voice interaction
manager service, and extending it to also set up the default voice
interaction service.
Change-Id: If8d5936c28aebfa7eff77c8d99241c3a2ffdb0a4
Barnaby James [Sat, 9 Aug 2014 19:55:55 +0000 (19:55 +0000)]
Merge "Remove constants for VOICE_CONTROL_ZEN_MODE." into lmp-dev
Barnaby James [Sat, 9 Aug 2014 05:48:35 +0000 (22:48 -0700)]
Remove constants for VOICE_CONTROL_ZEN_MODE.
Change-Id: I197d68e66d9a1b197e7c35fd140101458cf5bfc7
Tyler Gunn [Sun, 10 Aug 2014 02:12:41 +0000 (02:12 +0000)]
Merge "Adding camera failure/ready session events." into lmp-dev
Tyler Gunn [Fri, 8 Aug 2014 22:22:40 +0000 (15:22 -0700)]
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
Craig Stout [Thu, 7 Aug 2014 22:25:04 +0000 (15:25 -0700)]
Fix NPEs when inflating a ValueAnimator.
Change-Id: I4489b9e80635053792668a2f8032635893fb4afd
John Spurlock [Sat, 9 Aug 2014 18:41:24 +0000 (18:41 +0000)]
Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev
John Spurlock [Sat, 9 Aug 2014 16:04:36 +0000 (12:04 -0400)]
Doze: Pulse once when a pickup gesture is received.
- If configured, wire up the default sensor of TYPE_PICK_UP_GESTURE
as a signal to pulse (once) when dozing.
- Extend the duration that a pulse is visible.
- Skip the pre-pulse delay for the sensor signals.
Bug:
15863249
Change-Id: I70e39fc5626fef5570ef74464c919427e0721c32
Jay Shrauner [Sat, 9 Aug 2014 16:35:53 +0000 (16:35 +0000)]
Merge "Use thread safe set for adapter set" into lmp-dev
John Spurlock [Sat, 9 Aug 2014 15:10:03 +0000 (11:10 -0400)]
SysUI: Null check around ranking map in isAmbient call.
Bug:
16907252
Change-Id: Id21e089b99c1836ac0bbffd205ba89dc05f07b9a
Jay Shrauner [Fri, 8 Aug 2014 23:31:48 +0000 (16:31 -0700)]
Use thread safe set for adapter set
Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.
Bug:
16898286
Change-Id: I5d94b403469e98c5f5431fc1d0ad020985100cfd
Jose Lima [Fri, 8 Aug 2014 23:59:28 +0000 (23:59 +0000)]
Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev
Amith Yamasani [Fri, 8 Aug 2014 00:58:39 +0000 (17:58 -0700)]
Allow singleton providers to accept connections from other users
This is required for singleton providers like sms log.
Change-Id: Icb18a764c27dc1b43f8b8bcc24c21c91274995fd
Jose Lima [Fri, 8 Aug 2014 23:09:59 +0000 (16:09 -0700)]
Added StatusBarNotification.aidl to frameworks/base/Android.mk
Change-Id: I98fb4821642e3431bb41506de3d8905f90a40729
George Mount [Fri, 8 Aug 2014 23:44:53 +0000 (23:44 +0000)]
Merge "Move shared elements to overlay when in a transition group." into lmp-dev
Jeff Sharkey [Fri, 8 Aug 2014 22:10:03 +0000 (15:10 -0700)]
Move DocumentsUI settings into overflow menu.
Also use different strings based on device type to make clearer.
Bug:
13437894
Change-Id: I4053780de2c7197fb45cc53aee7659e9d0d75c0a
Igor Murashkin [Fri, 8 Aug 2014 01:02:51 +0000 (18:02 -0700)]
camera2: Fix TotalCaptureResult#getKeys not to return empty list
Bug:
16680352
Change-Id: Ie6b8a8bff6f9b87d058a21b07eb3447371a62b6b
Adam Lesinski [Fri, 8 Aug 2014 22:36:37 +0000 (22:36 +0000)]
Merge "Second iteration of the UsageStats API" into lmp-dev
Jeff Sharkey [Fri, 8 Aug 2014 21:46:18 +0000 (14:46 -0700)]
Separate MIME icons for some office formats.
Bug:
12548097
Change-Id: I11808854e0a4fae2636a04f75599e022b4a8440f
Jeff Sharkey [Fri, 8 Aug 2014 20:08:56 +0000 (13:08 -0700)]
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
Adam Lesinski [Mon, 21 Jul 2014 22:25:30 +0000 (15:25 -0700)]
Second iteration of the UsageStats API
Based on feedback from API council, updated the API.
Also added support for querying the event log.
Change-Id: Ibaa008b9e5bd145acdfe8e20c25c2ed2d96be123
George Mount [Wed, 9 Jul 2014 00:25:25 +0000 (17:25 -0700)]
Move shared elements to overlay when in a transition group.
Bug
15744995
Change-Id: Icf1ee603de23c7bb3bce3723cb24009e36f153d7
Andy Hung [Wed, 30 Jul 2014 22:48:21 +0000 (15:48 -0700)]
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
Craig Mautner [Tue, 5 Aug 2014 18:16:41 +0000 (11:16 -0700)]
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
Nicolas Prevot [Fri, 8 Aug 2014 17:42:21 +0000 (17:42 +0000)]
Merge "Validate that the authority of incoming uris matches." into lmp-dev
Nicolas Prevot [Thu, 7 Aug 2014 18:23:17 +0000 (19:23 +0100)]
Validate that the authority of incoming uris matches.
BUG:
16864837
Change-Id: I2d4473985777b9525b101c1b02ad2395342b9722
Torne (Richard Coles) [Fri, 8 Aug 2014 17:42:10 +0000 (17:42 +0000)]
Merge "Make WebViewFactory more robust." into lmp-dev
Torne (Richard Coles) [Fri, 8 Aug 2014 17:24:12 +0000 (18:24 +0100)]
Make WebViewFactory more robust.
Catch and discard any exception thrown in getWebViewNativeLibraryPaths
to avoid the system server crashing if there is something wrong with the
update APK. prepareWebViewInSystemServer(nativePaths) is safe to call
even if nativePaths is null or invalid, and must be called to ensure
that any process waiting for relro processing is unblocked.
Bug:
16894062
Change-Id: I76c759bebcb7c4643fb50979376afea764c859c4
RoboErik [Fri, 8 Aug 2014 17:33:20 +0000 (17:33 +0000)]
Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
RoboErik [Wed, 6 Aug 2014 20:43:22 +0000 (13:43 -0700)]
Combine MediaSession Callback and TransportControlsCallback
This combines them into a single Callback class and adds default
handling to media buttons to check the available actions and call
one of the other methods if appropriate.
Change-Id: If9897d8cf6d8d8046aa85a646c22382f1db1461b
RoboErik [Thu, 7 Aug 2014 23:53:06 +0000 (16:53 -0700)]
Change URI type metadata back to text
Was accidentally changed in a previous CL. We decided against adding
the URI type.
Change-Id: Ifccf0e784d3fe3196e80cca238de6f8c4456e85e
Narayan Kamath [Fri, 8 Aug 2014 17:40:57 +0000 (17:40 +0000)]
Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev
Narayan Kamath [Fri, 8 Aug 2014 12:43:59 +0000 (13:43 +0100)]
Reduce the frequency of calls to isDexOptNeededInternal.
The package manager maintains a set of dexopted instruction
sets as a fast path to avoid calling expensive code. We were
correctly adding elements to that list while performing dexopt,
but were *not* adding elements to the list when isDexOptNeededInternal
told us things were up to date. As a result, we'd hit the slow path
100% of the time on userdebug builds in the steady state, i.e, when
the system did not dexopt anything since boot.
With this change, we make sure isDexOptNeededInternal is called
precisely once per boot in such case.
This patch also fixes broken logic for apps that have multiple
code paths. We must mark the paths as dexopted only if we've
processed all paths.
bug:
16828525
bug:
16868741
Change-Id: Icb59121fe915d892e677d9b7e9a4efd11555ae27
Svetoslav [Fri, 8 Aug 2014 21:11:49 +0000 (21:11 +0000)]
Merge "Polish the new cross-profile app widget APIs" into lmp-dev
Svetoslav [Fri, 8 Aug 2014 19:48:06 +0000 (12:48 -0700)]
Polish the new cross-profile app widget APIs
bug:
14991269
Change-Id: I5996f8c69a3d151ff1ecd8f19403dd606f588150
John Spurlock [Fri, 8 Aug 2014 20:14:21 +0000 (20:14 +0000)]
Merge "New api to sync zen mode state from listeners." into lmp-dev
ztenghui [Fri, 8 Aug 2014 21:03:28 +0000 (21:03 +0000)]
Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev
ztenghui [Thu, 7 Aug 2014 23:27:13 +0000 (16:27 -0700)]
Update attrs / public.xml for VectorDrawable opacity removal
bug:
16850076
Change-Id: Ib6fea828b14e85cacccc8a901227a8fb068f9121
Winson Chung [Fri, 8 Aug 2014 20:53:46 +0000 (20:53 +0000)]
Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug
16826622)" into lmp-dev
Winson Chung [Fri, 8 Aug 2014 18:27:10 +0000 (11:27 -0700)]
Exposing taskDescription for apps to read from their own AppTasks. (Bug
16826622)
Amith Yamasani [Fri, 8 Aug 2014 20:51:21 +0000 (20:51 +0000)]
Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev
John Reck [Fri, 8 Aug 2014 20:21:00 +0000 (13:21 -0700)]
Fix damage for layers for projection receivers
Bug:
16880228
Change-Id: I59ab760a21f49cc2cac0d8936b173cff292e6114
Amith Yamasani [Fri, 8 Aug 2014 19:10:36 +0000 (12:10 -0700)]
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
John Reck [Fri, 8 Aug 2014 19:05:00 +0000 (19:05 +0000)]
Merge "Don't use ViewPropertyAnimatorRT yet" into lmp-dev
John Reck [Fri, 8 Aug 2014 18:23:33 +0000 (11:23 -0700)]
Don't use ViewPropertyAnimatorRT yet
Bug:
16894195
Needs more work and soak time
Change-Id: I8d38492b32780f5bba8a3439bfe3dbd30da3811c
Guang Zhu [Fri, 8 Aug 2014 18:33:09 +0000 (18:33 +0000)]
Merge "freeze screen rotation during memory and app launch test" into lmp-dev
Guang Zhu [Fri, 8 Aug 2014 18:30:21 +0000 (11:30 -0700)]
freeze screen rotation during memory and app launch test
Change-Id: I2a039be383562019a0af9470c5053cd3cb1e6142
Christopher Tate [Thu, 7 Aug 2014 23:16:27 +0000 (23:16 +0000)]
Merge "API to tell the transport to cancel a full backup in progress" into lmp-dev
Christopher Tate [Thu, 7 Aug 2014 21:19:50 +0000 (14:19 -0700)]
API to tell the transport to cancel a full backup in progress
Bug
16524520
Change-Id: If2cbffd3c8a03bf4eb7b11ff1ae784c437e27e7f
Winson Chung [Thu, 7 Aug 2014 22:55:37 +0000 (15:55 -0700)]
Fixing regression with scrolling and launching an out-of-view task. (Bug
16875419)
Change-Id: Ib64e18f9a0f1de02de28a29251dd1d159d5d89ee
Nicolas Prevot [Fri, 8 Aug 2014 17:40:49 +0000 (17:40 +0000)]
Merge "Making getProviderMimeType work across users." into lmp-dev
Nicolas Prevot [Mon, 7 Jul 2014 16:44:58 +0000 (17:44 +0100)]
Making getProviderMimeType work across users.
For apps with cross-user uri grants, but without INTERACT_ACROSS_USERS.
BUG:
16128346
Change-Id: I0136cd274eaf457804d196c09f746f66c1fe599f
Santos Cordon [Wed, 6 Aug 2014 11:46:17 +0000 (04:46 -0700)]
Remove ldaps from AOSP code.
Bug:
16327484
Change-Id: I1fbeed8e1642e8228310cf0e7b95c4809b50901b
RoboErik [Thu, 7 Aug 2014 23:16:18 +0000 (23:16 +0000)]
Merge "Add descriptions to MediaController buttons" into lmp-dev
RoboErik [Wed, 6 Aug 2014 01:16:43 +0000 (18:16 -0700)]
Add descriptions to MediaController buttons
This widget was missing some accessibility descriptions.
bug:
16536697
Change-Id: I6f50fd1f4fc0a804151ff465b612128d71a1fde6
Raph Levien [Thu, 7 Aug 2014 23:03:43 +0000 (23:03 +0000)]
Merge "Add new fonts.xml" into lmp-dev
Raph Levien [Thu, 7 Aug 2014 20:52:37 +0000 (13:52 -0700)]
Add new fonts.xml
This adds a new configration file for fonts with several more features,
most notably the ability to specify numeric weights for fonts in a
family, and specify aliases for weights. This will help help choose an
appropriate font for a "bold" weight request, rather than just applying
auto-bolding.
Bug:
14538154
Change-Id: Ib4d54d66a0c68b7d46e665d7cd94e97b72468e95
Yuncheol Heo [Mon, 11 Aug 2014 08:43:58 +0000 (08:43 +0000)]
Merge "Make it not to go to sleep when changing TV's input to the others." into lmp-dev
Yuncheol Heo [Mon, 11 Aug 2014 02:17:54 +0000 (11:17 +0900)]
Make it not to go to sleep when changing TV's input to the others.
- Previously, we decided to make it go to sleep when changing TV's input
to the others. But, we found that the current molly couldn't wake up by
CEC commands actively. So, we'll revert the decision.
- In addition, during investigating this issue, we found that currently
molly couldn't work with Samsung (SS) TV harmoniously. SS TV will send
<RoutingChange> and <RequestActiveSource> when it wakes up. If there
is no <ActiveSource> response, then it will change the input to the
internal. This CL handles this issue also.
Bug:
16803105
Change-Id: I5179561775b186b486fc3f2a042e759fcb07451b
Sungsoo Lim [Mon, 11 Aug 2014 08:26:38 +0000 (08:26 +0000)]
Merge "TIF: Add content rating systems" into lmp-dev
Sungsoo Lim [Sun, 10 Aug 2014 00:44:40 +0000 (09:44 +0900)]
TIF: Add content rating systems
- Change the strings for translation to English only.
- Add content rating systems for many countries.
- Update javadoc of TvContentRating which is auto-generated based on
tv_content_rating_systems.xml and strings.xml
Bug:
16862855, Bug:
16889743
Change-Id: Ifd81c85934b8631e8ae00633639989275982ecfb
Jungshik Jang [Fri, 8 Aug 2014 01:46:54 +0000 (10:46 +0900)]
Add IHdmiSystemAudioModeChangeListner to TvInputHardwareManager.
This is to update audio patch when HDMI-CEC system audio mode is changed.
Bug:
16113320
Change-Id: I312fffe511c0bce1c973bb66e9c16875e5dcee56
Jungshik Jang [Fri, 8 Aug 2014 02:38:28 +0000 (11:38 +0900)]
Hook up device power status change to TIF
Instead of introducing new api update existing
IDeviceEventListener
Bug:
16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
Yohei Yukawa [Mon, 11 Aug 2014 11:56:21 +0000 (11:56 +0000)]
Merge "Fix handling of line-end and RTL characters in CursorAnchorInfo" into lmp-dev
Yohei Yukawa [Fri, 8 Aug 2014 15:11:41 +0000 (00:11 +0900)]
Fix handling of line-end and RTL characters in CursorAnchorInfo
This CL addresses line-end handling and RTL characters handling
in CursorAnchorInfo.
BUG:
16499624
Change-Id: Ie23569fb136751c40f79dd9886e279dc01cefae9
Vinit Deshpande [Sun, 10 Aug 2014 20:22:50 +0000 (20:22 +0000)]
Merge "Support EAP-SIM and EAP-AKA" into lmp-dev
Vinit Deshpande [Mon, 21 Jul 2014 23:18:04 +0000 (16:18 -0700)]
Support EAP-SIM and EAP-AKA
This change un-hides constants for these two methods and
also un-hides RADIUS/AAA FQDN field to allow creating
Passpoint release 1 credentials.
Change-Id: Ia3501017dc1f5c0b4932bb45e1e9c5bf7262d7fe
Christopher Tate [Sun, 10 Aug 2014 19:38:16 +0000 (19:38 +0000)]
Merge "Start using cancelFullBackup() when appropriate" into lmp-dev
Christopher Tate [Fri, 8 Aug 2014 22:05:48 +0000 (15:05 -0700)]
Start using cancelFullBackup() when appropriate
The API was in place but the framework wasn't yet calling it.
Bug
16524520
Change-Id: Ie368758c830a7d0ad11e7dd3142a0ed896069944
Jae Seo [Sun, 10 Aug 2014 17:40:35 +0000 (17:40 +0000)]
Merge "TIF: Move watch history logging to TvProvider" into lmp-dev
Jae Seo [Sat, 9 Aug 2014 05:20:48 +0000 (22:20 -0700)]
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
Jean-Michel Trivi [Sun, 10 Aug 2014 17:33:24 +0000 (17:33 +0000)]
Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev
Jean-Michel Trivi [Mon, 21 Jul 2014 23:06:33 +0000 (16:06 -0700)]
Define FLAG_BEACON in android.media.AudioAttributes
Define FLAG_BEACON as @SystemAPI
Keep track of which flags are public, and the list of all
supported flags for easier code maintenance.
Bug
15415971
Change-Id: Ia7675e8fa4bc7c4d7a8f727fd25ff92ecb68483c
Chulwoo Lee [Sun, 10 Aug 2014 07:15:50 +0000 (07:15 +0000)]
Merge "TIF: Fix a bug of incorrect watch history" into lmp-dev
Chulwoo Lee [Wed, 9 Jul 2014 18:56:39 +0000 (03:56 +0900)]
TIF: Fix a bug of incorrect watch history
When the user keeps watching one channel without tuning to the other
channel, the user can watch many programs. In this case as many watch
history records as the number of programs the user watched should be
inserted in watched_programs table.
But there is a bug now that only one record is logged for all the
programs and this CL fixes the bug and makes the watch history
logging work correctly for this case.
In addition, package information should be added to the content value
because it should be not null in programs table.
BUG:
16177411
Change-Id: I058f9db927b5d684a1af7852630f50ec2d2743b6
Calin Juravle [Mon, 4 Aug 2014 18:17:06 +0000 (19:17 +0100)]
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
John Spurlock [Fri, 8 Aug 2014 14:09:55 +0000 (14:09 +0000)]
Merge "Volume: Hide zen options during setup." into lmp-dev