OSDN Git Service
Svetoslav [Wed, 3 Jun 2015 22:44:46 +0000 (22:44 +0000)]
Merge "Adding missing permission API to fragment" into mnc-dev
Svetoslav [Wed, 3 Jun 2015 22:43:59 +0000 (15:43 -0700)]
Adding missing permission API to fragment
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
Clara Bayarri [Wed, 3 Jun 2015 22:33:58 +0000 (22:33 +0000)]
Merge "Fix Floating tool bar covers text during long press + drag" into mnc-dev
Winson Chung [Wed, 3 Jun 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Fixing case where we were not preloading tasks correctly." into mnc-dev
Mady Mellor [Wed, 3 Jun 2015 21:15:17 +0000 (21:15 +0000)]
Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev
Clara Bayarri [Fri, 15 May 2015 11:18:24 +0000 (12:18 +0100)]
Fix Floating tool bar covers text during long press + drag
The existing implementation started the ActionMode even when knowing
a drag would start. Moved this logic to once the drag is complete,
to avoid the toolbar popping up while the user is still dragging.
Since the existing method selected the initial word when no other
selection existed, refactored that logic so it is also performed at
the start of the drag. Otherwise, the user sees no selection until
he drags over 2 or more words.
Bug:
21144634
Change-Id: I97cf89b1c4c3ebdbbd1af50bd1ce5aa4af72164b
Eino-Ville Talvala [Wed, 3 Jun 2015 21:06:29 +0000 (21:06 +0000)]
Merge "ImageFormat: Update definition of depth formats for confidence." into mnc-dev
Alex Klyubin [Wed, 3 Jun 2015 21:00:34 +0000 (21:00 +0000)]
Merge "Expose RSA Cipher from Android Keystore Provider." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 21:22:54 +0000 (14:22 -0700)]
Expose RSA Cipher from Android Keystore Provider.
The RSA Cipher supports OAEPPadding, PKCS1Padding and NoPadding
padding schemes.
Bug:
18088752
Bug:
20912868
Change-Id: Ie050e12705bb553a402760a1d253fdb2247a1d50
Jonathan Basseri [Wed, 3 Jun 2015 20:59:11 +0000 (20:59 +0000)]
Merge "Document procedure for adding carrier config variables." into mnc-dev
James Cook [Wed, 3 Jun 2015 20:58:50 +0000 (20:58 +0000)]
Merge "Fix TabHost stealing focus on hardware keyboard keypress" into mnc-dev
Chris Craik [Wed, 3 Jun 2015 00:40:58 +0000 (17:40 -0700)]
Delete MAKE_ENUM_FLAGS
bug:
21595702
Settle on namespace-enum for consistency. Also removes k prefix.
Change-Id: Ib89f94cb9263de40b6e4636577dca4860867d0d8
Jeff Tinker [Wed, 3 Jun 2015 20:03:28 +0000 (20:03 +0000)]
Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-dev
Mady Mellor [Fri, 22 May 2015 17:31:12 +0000 (10:31 -0700)]
Ensure to reset state of selecting by word/char for new selections
Previously this value was only updated when interacting with the
selection handles, so if you started a selection, entered by-char mode,
and then started another selection you would still be in by-char mode.
This resulted in incorrect behavior.
This CL alters the logic to update the handle state whenever the cursor
is placed which will included the initial long press to select a word.
Bug:
21301589
Change-Id: I15dbe6f2b76c7edd8ea4b3ba53e7107c47bc48fa
Adam Powell [Wed, 3 Jun 2015 19:52:25 +0000 (19:52 +0000)]
Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev
Winson Chung [Tue, 2 Jun 2015 21:11:49 +0000 (14:11 -0700)]
Fixing case where we were not preloading tasks correctly.
- Should use the actual isTopTaskHome check when preloading.
Bug:
21516523
Bug:
20882957
Change-Id: I60cf1e97f7704828426f72a45329c8c7b962a78c
Geoff Mendal [Wed, 3 Jun 2015 19:47:34 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 19:41:03 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ad8251f4d867e6f2a64782541d7afba1b2bf4a7
Auto-generated-cl: translation import
Vinit Deshpande [Wed, 3 Jun 2015 19:27:04 +0000 (19:27 +0000)]
Merge "make WiFi No Network Periodic Scans Interval to 5 minutes" into mnc-dev
Dmitriy Ivanov [Wed, 3 Jun 2015 19:19:47 +0000 (19:19 +0000)]
Merge "Fix build" into mnc-dev
Dmitriy Ivanov [Wed, 3 Jun 2015 19:02:59 +0000 (12:02 -0700)]
Fix build
Bug:
21602590
Change-Id: Iffb9a7b74dc97bf30aea2014b0e3d2a96097291b
Robert Shih [Wed, 3 Jun 2015 19:07:26 +0000 (19:07 +0000)]
Merge "media Utils: remove parse integer logspam" into mnc-dev
Pierre Vandwalle [Tue, 2 Jun 2015 20:09:57 +0000 (13:09 -0700)]
make WiFi No Network Periodic Scans Interval to 5 minutes
Bug:
21274132
Change-Id: I751319e82deca1e40a3926fd210dd71a55a785f7
(cherry picked from commit
5fcff4ed7db9f0897d8fdae78c05cbdefe258455)
Svetoslav [Wed, 3 Jun 2015 18:46:06 +0000 (18:46 +0000)]
Merge "Fix finding views by accessibility id." into mnc-dev
Svetoslav [Wed, 3 Jun 2015 18:38:30 +0000 (11:38 -0700)]
Fix finding views by accessibility id.
1. If a view has a node provider, then the latter takes over
representation of the view tree. Hence, find by accessibility
id should not return children of a view with a provider.
2. Views can change their importantce for accessibility, so an
accessibility service may get a node and try to act on it
but the node became not important in the meantime. Hence,
find by accessibility id should respect importance.
Change-Id: Ib4d738c00f46c91300605a2928550f40705ea47b
Alan Viverette [Wed, 3 Jun 2015 18:28:49 +0000 (18:28 +0000)]
Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
Jonathan Basseri [Wed, 3 Jun 2015 17:11:47 +0000 (10:11 -0700)]
Fix logic error in CarrierService.
CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.
This was tricky to track down because clients get no clear signal that
onBind is returning null.
Bug:
21571360
Change-Id: Id82fce8dfa73a75fae1ce69f73b922addc7daa3e
Jonathan Basseri [Wed, 3 Jun 2015 18:16:04 +0000 (18:16 +0000)]
Merge "Fix logic error in CarrierService." into mnc-dev
Adrian Roos [Tue, 2 Jun 2015 20:44:46 +0000 (13:44 -0700)]
Continuous brightness slider
Changes the brightness slider to have no visible steps
when in auto brightness mode. Also changes mirror
logic to dispatching touches instead of forwarding values.
Bug:
19516826
Change-Id: Ib0233c2dcc6807da96a71d1f5619a117ca2a73bd
Riley Andrews [Wed, 3 Jun 2015 18:14:22 +0000 (18:14 +0000)]
Merge "Lower the priority of the LazyTaskWriter thread." into mnc-dev
Riley Andrews [Wed, 3 Jun 2015 01:24:48 +0000 (18:24 -0700)]
Lower the priority of the LazyTaskWriter thread.
This worker thread shouldn't be prioritized at the same level as user
tasks, preemptions of ui threads may result. Additionally, if we lower
its priority level, it will be scheduled on more efficient cores
in big little systems.
Change-Id: I49a7df6fb43d6c067aeacf9ff0cbd5477cb42f7d
Jason Monk [Wed, 3 Jun 2015 18:13:12 +0000 (18:13 +0000)]
Merge "SettingsLib/Wifi: Run pause/resumes on main thread" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 18:06:34 +0000 (14:06 -0400)]
SettingsLib/Wifi: Run pause/resumes on main thread
To avoid our objects from disappearing out from under us.
Bug:
21581533
Change-Id: Ia6fc9e56271f79c7d8b0f86f9c35351c39c35d29
Raph Levien [Wed, 3 Jun 2015 18:04:02 +0000 (18:04 +0000)]
Merge "Apply contextStart consistently in getRunAdvance" into mnc-dev
Raph Levien [Wed, 3 Jun 2015 17:58:33 +0000 (10:58 -0700)]
Apply contextStart consistently in getRunAdvance
The contextStart needs to be applied to all offsets relative to the
actual start of context. The code was missing "offset", which caused
mischief especially in mixed LTR and RTL text.
Bug:
21573666
Change-Id: I47a1b6cde5862442b9c7236ee72b2ceb0df9b2e9
Adam Powell [Wed, 3 Jun 2015 00:47:50 +0000 (17:47 -0700)]
Properly restore RTL state in HorizontalScrollView
Fix an incorrect unparceling of the previous saved state in
HorizontalScrollView. Remove an unneeded field in the saved state by
storing scroll offset from start instead of scrollX + isRtl.
Bug
20666194
Change-Id: I1ec45b3e3bd0846b5f659356df7ff94f42e61055
Eino-Ville Talvala [Sat, 23 May 2015 00:13:02 +0000 (17:13 -0700)]
ImageFormat: Update definition of depth formats for confidence.
DEPTH16: Use high 3 bits for confidence measurement, with
0 = 100% confidence, 1 = 0% confidence, 2 = 1/7 (14.3%) confidence, etc.
DEPTH_POINT_CLOUD: Add confidence as 4th entry to each point,
with a value in range 0.f - 1.f inclusive.
Bug:
20123879
Change-Id: I23317b922ac727751156fa418ed239a696a898e5
Robert Shih [Wed, 3 Jun 2015 17:15:59 +0000 (10:15 -0700)]
media Utils: remove parse integer logspam
Bug:
21569707
Change-Id: I808ce760f55cf6aad8376bc7ca3b3c5a88cb6b01
Filip Gruszczynski [Wed, 3 Jun 2015 17:50:43 +0000 (17:50 +0000)]
Merge "Fix NPE when requesting outsets for detached view." into mnc-dev
Abodunrinwa Toki [Wed, 3 Jun 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev
Filip Gruszczynski [Wed, 3 Jun 2015 17:32:26 +0000 (10:32 -0700)]
Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.
Bug:
21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
Yohei Yukawa [Wed, 3 Jun 2015 17:40:05 +0000 (17:40 +0000)]
Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev
Alan Viverette [Wed, 3 Jun 2015 17:35:44 +0000 (10:35 -0700)]
Call dispatchFinishTemporaryDetach before returning a transient view
ListView caches transient state views for reuse during layout, which calls
dispatchStartTemporaryDetach() before caching the view. This should always
be followed by a corresponding dispatchFinishTemporaryDetach() before
removing the view from the cache and returning it for reuse. While this
was the case for other types of cached views, we missed this call for
views placed in one of the two transient view caches.
Bug:
17387206
Change-Id: I360945006558b2783c098183a7cc9bc28d05d9ab
Jonathan Basseri [Wed, 3 Jun 2015 17:11:47 +0000 (10:11 -0700)]
Fix logic error in CarrierService.
CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.
This was tricky to track down because clients get no clear signal that
onBind is returning null.
Bug:
21571360
Change-Id: If37a52e30d0c7fd0205f23595f39be3d55db69d4
Alex Klyubin [Wed, 3 Jun 2015 17:25:36 +0000 (17:25 +0000)]
Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 17:22:05 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 17:20:00 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 17:19:35 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Reck [Wed, 3 Jun 2015 17:16:46 +0000 (17:16 +0000)]
Merge "Fix warning" into mnc-dev
Arunesh Mishra [Wed, 3 Jun 2015 17:13:53 +0000 (17:13 +0000)]
Merge "Use config.xml parameters instead of System properties." into mnc-dev
Tyler Gunn [Wed, 3 Jun 2015 17:12:41 +0000 (17:12 +0000)]
Merge "API Cleanup: Remove VideoState class." into mnc-dev
Tyler Gunn [Wed, 3 Jun 2015 17:09:59 +0000 (10:09 -0700)]
API Cleanup: Remove VideoState class.
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.
Bug:
21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
Nick Kralevich [Wed, 3 Jun 2015 16:59:40 +0000 (16:59 +0000)]
Merge "UsbDeviceManager: Don't unnecessarily touch properties" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 16:58:05 +0000 (11:58 -0500)]
Import translations. DO NOT MERGE
Change-Id: I885d3ce3321af31b87a4817037557914d9679a4e
Auto-generated-cl: translation import
Doris Liu [Wed, 3 Jun 2015 16:57:44 +0000 (16:57 +0000)]
Merge "Fix calls to Rect.intersect(Rect)" into mnc-dev
Abodunrinwa Toki [Wed, 3 Jun 2015 16:54:36 +0000 (16:54 +0000)]
Merge "More FloatingToolbar styles." into mnc-dev
John Reck [Wed, 3 Jun 2015 16:52:01 +0000 (09:52 -0700)]
Fix warning
Bug:
21608208
Change-Id: I1d1cf1fbc8c0a4561bf76e307c56be580fb4baef
Geoff Mendal [Wed, 3 Jun 2015 16:51:22 +0000 (11:51 -0500)]
Import translations. DO NOT MERGE
Change-Id: I7855e24fc4715b1bf7cf978dd40b3bd66f242427
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Jun 2015 16:47:54 +0000 (11:47 -0500)]
Import translations. DO NOT MERGE
Change-Id: I8cb4cb369c064d934e671d9ae8086f9d079d79f3
Auto-generated-cl: translation import
Alex Klyubin [Mon, 1 Jun 2015 20:01:54 +0000 (13:01 -0700)]
Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
Alex Klyubin [Wed, 3 Jun 2015 16:35:19 +0000 (16:35 +0000)]
Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
Xiaohui Chen [Wed, 3 Jun 2015 16:35:06 +0000 (16:35 +0000)]
Merge "usb debugging: show alert to secondary user" into mnc-dev
Xiaohui Chen [Wed, 13 May 2015 20:18:36 +0000 (13:18 -0700)]
usb debugging: show alert to secondary user
Bug:
12785423
Change-Id: If7f60899cfdaca7bdad560bd59a78f5be74c24be
Yorke Lee [Wed, 3 Jun 2015 16:23:57 +0000 (16:23 +0000)]
Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev
John Spurlock [Wed, 3 Jun 2015 16:23:31 +0000 (16:23 +0000)]
Merge "Zen: Mute alarm (vibrations) in total silence." into mnc-dev
John Spurlock [Wed, 3 Jun 2015 16:17:46 +0000 (12:17 -0400)]
Zen: Mute alarm (vibrations) in total silence.
Bug:
21376328
Change-Id: I00b46e64a0ec8d9b5066b5a9be10fc859dca0126
John Spurlock [Wed, 3 Jun 2015 16:00:58 +0000 (16:00 +0000)]
Merge "Volume: Ripple tweaking on zen mode condition rows." into mnc-dev
John Spurlock [Wed, 3 Jun 2015 15:56:08 +0000 (11:56 -0400)]
Volume: Ripple tweaking on zen mode condition rows.
Bug:
21335622
Change-Id: Ifcd7e5a3c14625e0442dcdb23b9b27a01545953c
Abodunrinwa Toki [Wed, 3 Jun 2015 10:28:12 +0000 (11:28 +0100)]
Fix FloatingToolbar positioning for RTL.
-The position of the toolbar was forced to the left side in an attempt
to fix an RTL bug. This led to wrong positioning in LTR.
This is now fixed by using a dynamic "show" animation that takes into
consideration already set positions.
-The correct position of the toolbar wasn't recalculated on updates
for RTL. This is now fixed.
Bug:
21455067
Change-Id: I0b31a8fd3c95549f5f10133a47a4d3ef27689010
John Spurlock [Wed, 3 Jun 2015 15:17:53 +0000 (15:17 +0000)]
Merge "Audio policy: setting explicit non-zero volume unmutes the stream." into mnc-dev
Paul Jensen [Wed, 3 Jun 2015 15:17:09 +0000 (15:17 +0000)]
Merge "Disallow going back to initial empty page in captive portal app" into mnc-dev
Paul Jensen [Tue, 19 May 2015 16:30:56 +0000 (12:30 -0400)]
Disallow going back to initial empty page in captive portal app
This is a little tricky because WebView history can only be cleared
after the next page load and we don't want to allow hitting back
during the first page load.
Bug:
21147832
Change-Id: I639dfd27d4dc3af618282256ca02b9947e64a7b9
John Spurlock [Tue, 2 Jun 2015 20:26:43 +0000 (16:26 -0400)]
Audio policy: setting explicit non-zero volume unmutes the stream.
And vice versa.
Bug:
21584884
Change-Id: I2cd6a84ab40edba4c6fc2b219693e0d4f0527d8d
John Spurlock [Wed, 3 Jun 2015 13:24:42 +0000 (13:24 +0000)]
Merge "Volume footer uglification." into mnc-dev
Paul Jensen [Wed, 3 Jun 2015 13:17:56 +0000 (13:17 +0000)]
Merge "Update captive portal sign-in app SSL error page UI." into mnc-dev
Paul Jensen [Wed, 6 May 2015 18:40:59 +0000 (14:40 -0400)]
Update captive portal sign-in app SSL error page UI.
Add text and update image as per UX team recommendations.
Add "Use as is and open browser" link.
Bug:
18791346
Bug:
20038019
Bug:
20486308
Change-Id: Ibf6d1493f5332e7905154cc7306645ac4c1a6283
Erik Kline [Wed, 3 Jun 2015 07:10:08 +0000 (16:10 +0900)]
Delete unsed mDnsLock.
Bug:
21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603
Yoshiki Iguchi [Wed, 3 Jun 2015 06:05:34 +0000 (06:05 +0000)]
Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev
Lorenzo Colitti [Wed, 3 Jun 2015 06:03:42 +0000 (06:03 +0000)]
Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev
* changes:
Remove the IPv4 address from the interface when DHCP fails.
Make the dumpsys connectivity shorter and easier to read.
Shawn Willden [Wed, 3 Jun 2015 05:21:52 +0000 (05:21 +0000)]
Merge "Track changes to the keystore binder API" into mnc-dev
Jan Nordqvist [Mon, 1 Jun 2015 23:14:55 +0000 (16:14 -0700)]
Cleaned out "isValid" from WifiConfig.
Change-Id: I028615e55700aa92889670297f1130397eba650f
(cherry picked from commit
c50315e014efded84b8f1981602951011816360b)
Soonil Nagarkar [Wed, 27 May 2015 18:23:37 +0000 (11:23 -0700)]
Add NO_BATCH flag to WifiScanner
Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit
b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241)
Vinit Deshpande [Wed, 3 Jun 2015 05:09:15 +0000 (05:09 +0000)]
Merge changes from topic 'mwd-merge-wifi-
0602015' into mnc-dev
* changes:
keep hal based pno disabled by default
fix annoying typo
enable SSID whitelist
Rename HandlerThread name in RttManager The sHandlerThread name in RttManager is called "WifiScanner". It should be changed to RTTManager
Seigo Nonaka [Wed, 3 Jun 2015 04:58:38 +0000 (04:58 +0000)]
Merge "Use final in favor of initialization safety." into mnc-dev
Seigo Nonaka [Tue, 2 Jun 2015 07:27:12 +0000 (16:27 +0900)]
Use final in favor of initialization safety.
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug
18945456 or not.
Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
Casper Bonde [Tue, 21 Apr 2015 11:12:05 +0000 (13:12 +0200)]
Add support for MITM for BluetoothSockets (1/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.
Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Lorenzo Colitti [Tue, 2 Jun 2015 07:50:36 +0000 (16:50 +0900)]
Remove the IPv4 address from the interface when DHCP fails.
Bug:
19704592
Change-Id: I9b96cdcfc7c9442b3f8d6797aca63559ed4bdb9b
Lorenzo Colitti [Wed, 3 Jun 2015 02:18:24 +0000 (11:18 +0900)]
Make the dumpsys connectivity shorter and easier to read.
- Print NetworkFactories on one line.
- Only print LegacyTypeTracker networks if they are connected,
and record supported network types on a separate summary line.
- Print all tethering upstreams on one line.
- Summarize the state of the transition wakelock on one line.
- Don't print Inet condition reports if there are none.
(Currently there can never be any.)
Bug:
21449922
Change-Id: Ib4b29a7fd882e6c105839a255fffecf4f346cf7e
Erik Kline [Wed, 3 Jun 2015 01:59:46 +0000 (01:59 +0000)]
Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
Adrian Roos [Mon, 1 Jun 2015 20:59:59 +0000 (13:59 -0700)]
Prevent panel and QS expansion before device is decrypted
Bug:
21514179
Change-Id: Ia36409a2645a00fc2c2630eb39c05d3a0599fd8a
Svetoslav [Wed, 3 Jun 2015 01:01:39 +0000 (01:01 +0000)]
Merge "Add annotations to a new API" into mnc-dev
Andres Morales [Wed, 3 Jun 2015 01:01:07 +0000 (01:01 +0000)]
Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev
Svetoslav [Wed, 3 Jun 2015 00:59:31 +0000 (17:59 -0700)]
Add annotations to a new API
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
Jun Mukai [Wed, 3 Jun 2015 00:59:13 +0000 (00:59 +0000)]
Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
Roozbeh Pournader [Wed, 3 Jun 2015 00:56:22 +0000 (00:56 +0000)]
Merge "Load hyphenation data for more languages." into mnc-dev
Chris Craik [Wed, 3 Jun 2015 00:26:59 +0000 (00:26 +0000)]
Merge "Handle shader matrix correctly when ignoring canvas transform" into mnc-dev
Yohei Yukawa [Tue, 2 Jun 2015 23:50:14 +0000 (16:50 -0700)]
Convert subtypes whose locale is "tl" to "fil".
On Android, "tl" is a historic hack for what should really
be "fil". Now that we properly support 3-letter language codes,
we should be using "fil" throughout. Given this historical usage,
IMEs that really want to support Tagalog (and not Filipino)
should use the ISO-639-3 code for Tagalog, which is "tgl".
For backward compatibility reasons, this CL uses the similar
approach to I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10.
InputMethodSubtype.getLocale() continues to return the "locale"
string parameter passed to the constructor as is, but in the
Android framework we do normalizations/conversions whenever
we need a valid ISO-639-3 code.
In I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10, we rely on the
conversion in the Locale constructor. In this CL, we do replace
"tl" with "fil" by ourselves.
This CL also adds InputMethodSubtype#getLocaleObject() a hidden
API so that we can start relying on the Locale object at least
in the framework.
This CL is based on the investigation by Narayan Kamath and his
patch.
Bug:
20696126
Change-Id: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
Nick Kralevich [Tue, 2 Jun 2015 23:56:06 +0000 (16:56 -0700)]
UsbDeviceManager: Don't unnecessarily touch properties
Before setting the properties persist.sys.usb.config or sys.usb.config,
check the existing values. If the values are the same as what we'd set it
to, don't perform the set.
Any USB property set, even if setting the property to the value it already
has, triggers one of the "on property" triggers in system/core/rootdir/init.usb.rc .
The script then reconfigures the driver unnecessarily, which causes instability
and dropped connections when trying to use ADB.
Avoid this instability by not performing property sets which would have
no effect.
Bug:
21404762
Bug:
18905620
Change-Id: Id3c2543308df994a0114a0661e20ca799c2dc0e8
Casper Bonde [Thu, 16 Apr 2015 13:28:21 +0000 (15:28 +0200)]
SAP: Change to use new SDP Api (4/4)
Added class to carry SAP SDP record data.
Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Geoff Mendal [Wed, 3 Jun 2015 00:03:28 +0000 (00:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev