OSDN Git Service
Yohei Yukawa [Thu, 4 Jun 2015 08:05:04 +0000 (08:05 +0000)]
Merge "Show more logs when switching users and IMMS#DEBUG==true." into mnc-dev
Lorenzo Colitti [Thu, 4 Jun 2015 08:00:39 +0000 (08:00 +0000)]
Merge "Actually fall back from yiaddr to ciaddr." into mnc-dev
Yohei Yukawa [Thu, 4 Jun 2015 06:50:27 +0000 (23:50 -0700)]
Show more logs when switching users and IMMS#DEBUG==true.
This CL changes nothing but adds more logging points in IMMS when
switching users and IMMS#DEBUG==true.
No impact in production code.
Bug:
19340792
Bug:
19587437
Bug:
21612582
Change-Id: Ibaeb77ae50d246fc322cb023da7750d7415a58ab
Keisuke Kuroyanagi [Thu, 4 Jun 2015 06:06:48 +0000 (06:06 +0000)]
Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev
Lorenzo Colitti [Tue, 2 Jun 2015 08:46:24 +0000 (17:46 +0900)]
Actually fall back from yiaddr to ciaddr.
The initial implementation of toDhcpResults attempted to get the
leased IP address from ciaddr if yiaddr was 0.0.0.0, but it never
actually did so because a) it used == instead of equals(), and b)
the parsing code never populated mClientIp for a DhcpOfferPacket
or DhcpAckPacket.
Fix this and add a test for it.. Technically DHCP does not use
ciaddr (only bootp uses it), but in 5.0 we would use ciaddr if
yiaddr was 0.0.0.0 and a bit more compatibility shouldn't hurt.
Bug:
19704592
Change-Id: I1f58555f0c10b9c576995a6edb759a83d8938ea0
Lorenzo Colitti [Thu, 4 Jun 2015 05:42:21 +0000 (05:42 +0000)]
Merge "Make RenewingState time out as well." into mnc-dev
Lorenzo Colitti [Thu, 4 Jun 2015 05:31:56 +0000 (05:31 +0000)]
Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev
Chris Craik [Thu, 4 Jun 2015 02:42:50 +0000 (02:42 +0000)]
Merge "FastJNI for android.os.Trace" into mnc-dev
Svetoslav Ganov [Thu, 4 Jun 2015 02:20:36 +0000 (02:20 +0000)]
Merge "Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe." into mnc-dev
Nirmal Patel [Wed, 3 Jun 2015 01:11:32 +0000 (18:11 -0700)]
Make node retrieval methods in AccessibilityManagerService use separate Region instances to make them thread safe.
b/
21087793
Change-Id: Ice690e3d7494788fb9e1e234a54f14831bd4e0d3
(cherry picked from commit
ebd8eb4610d6bb9322a374f8965a78ba1c39ee63)
Zhijun He [Thu, 4 Jun 2015 01:58:30 +0000 (01:58 +0000)]
Merge "Camera2: add high speed video APIs" into mnc-dev
Zhijun He [Thu, 4 Jun 2015 01:58:09 +0000 (01:58 +0000)]
Merge "camera_metadata: update high speed video recording API" into mnc-dev
Vinit Deshpande [Thu, 4 Jun 2015 01:00:38 +0000 (18:00 -0700)]
Remove trivial GScan logs
These helped once; but now this is just noise. Also
given that GMSCore starts/stops scans many times it is
taking too much of log real estate.
Bug:
20416721
Change-Id: I965ed919afbac56e123e8d019be84d7d33abf3f9
Adrian Roos [Thu, 4 Jun 2015 00:06:46 +0000 (17:06 -0700)]
Be more conservative about initial keyguard state
Prevents a race condition that could lead to leaking the home screen
if Keyguard is too slow at pushing its state to the window manager while
booting.
Bug:
21128921
Change-Id: I992066c2c4e1bc4f797776c7804408a53b658b03
Zhijun He [Thu, 28 May 2015 19:51:52 +0000 (12:51 -0700)]
Camera2: add high speed video APIs
Interface only.
Bug:
21442271
Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
Nick Vaccaro [Thu, 4 Jun 2015 00:48:42 +0000 (00:48 +0000)]
Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into mnc-dev
Amith Yamasani [Thu, 4 Jun 2015 00:45:52 +0000 (00:45 +0000)]
Merge "Allow packagemanager checks for secondary user packages" into mnc-dev
Zhijun He [Wed, 27 May 2015 02:46:31 +0000 (19:46 -0700)]
camera_metadata: update high speed video recording API
Update high speed video recording API to support batch mode recording.
Bug:
21442271
Change-Id: I62de6067c75fcfbe6320dd987cce65843d810021
Amith Yamasani [Thu, 4 Jun 2015 00:39:40 +0000 (17:39 -0700)]
Allow packagemanager checks for secondary user packages
Clear calling identity when calling into package manager for
package info.
Bug:
21613139
Change-Id: I0655122f69cc886a395b7195d108222697769b06
Abodunrinwa Toki [Thu, 4 Jun 2015 00:10:41 +0000 (00:10 +0000)]
Merge "Fix floating toolbar position issues." into mnc-dev
Wale Ogunwale [Thu, 4 Jun 2015 00:01:50 +0000 (00:01 +0000)]
Merge "Fixed outOfBoundsException when logging discarded receiver." into mnc-dev
Alan Viverette [Wed, 3 Jun 2015 23:48:40 +0000 (23:48 +0000)]
Merge "Fix drop down layout inflation in ThemedSpinnerAdapter classes" into mnc-dev
Adrian Roos [Wed, 3 Jun 2015 21:41:18 +0000 (14:41 -0700)]
Prevent windows below the keyguard from showing
Fixes a bug where windows below the lock screen
could become visible if a SHOW_WHEN_LOCKED activity
hides the status bar.
Bug:
21450145
Change-Id: Ie660394cb96d7e6839bd4fb7c2729133bac2dfc5
Alan Viverette [Wed, 3 Jun 2015 23:34:56 +0000 (23:34 +0000)]
Merge "Update number picker styling for Material" into mnc-dev
Alan Viverette [Wed, 3 Jun 2015 23:29:05 +0000 (23:29 +0000)]
Merge "Synchronize selected item data on-demand after data set invalidation" into mnc-dev
Alan Viverette [Wed, 3 Jun 2015 23:27:36 +0000 (16:27 -0700)]
Fix drop down layout inflation in ThemedSpinnerAdapter classes
Bug:
21209640
Change-Id: I32aed1b70977fae25f43714eb3ef6edca53e51e9
Alan Viverette [Wed, 3 Jun 2015 23:19:53 +0000 (23:19 +0000)]
Merge "Pass setEnabled() value in calendar-mode DatePicker delegate" into mnc-dev
Raph Levien [Wed, 3 Jun 2015 23:09:47 +0000 (23:09 +0000)]
Merge "Rename setTextDir to setTextDirection" into mnc-dev
Adam Powell [Wed, 3 Jun 2015 22:52:40 +0000 (22:52 +0000)]
Merge "Fix view foreground tinting" into mnc-dev
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
Adam Powell [Wed, 3 Jun 2015 22:26:51 +0000 (15:26 -0700)]
Fix view foreground tinting
Copy and paste is bad, mmkay?
Bug
21209639
Change-Id: I6c17e8a30fad6d5110f18e4723a5f5e6ddb814b8
Alan Viverette [Wed, 3 Jun 2015 22:19:13 +0000 (15:19 -0700)]
Synchronize selected item data on-demand after data set invalidation
Previously, the selected item data could become inconsistent between a
call to Adapter.notifyDataSetChanged()/Invalidated() and the subsequent
layout pass.
Bug:
21614294
Change-Id: I45c9c98b2f6a8d8b8fb17de2065efa505cbf3c92
Wale Ogunwale [Wed, 3 Jun 2015 16:59:45 +0000 (09:59 -0700)]
Fixed outOfBoundsException when logging discarded receiver.
Bug:
21607321
Change-Id: I6f7ee4581ae2f0a0b7caedb84190fadc0edccfe8
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
Alan Viverette [Wed, 3 Jun 2015 21:07:26 +0000 (14:07 -0700)]
Pass setEnabled() value in calendar-mode DatePicker delegate
Fixes mContainer referencing wrong view. Also cleans up getCalendarView()
exception message.
Bug:
21211308
Change-Id: I4ad18206a8071b2c9b75d488e14fd53da6f5fa5b
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 20:46:11 +0000 (13:46 -0700)]
FastJNI for android.os.Trace
bug:
21566713
Change-Id: I129e405fe46268b9d40974d3a43f06a1faf4cadd
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
Raph Levien [Wed, 3 Jun 2015 20:20:45 +0000 (13:20 -0700)]
Rename setTextDir to setTextDirection
StaticLayout.Builder used "setTextDir" as a shorthand, but it's not
as clear as spelling it out. So, setTextDirection.
Bug:
21572282
Change-Id: Ia94476562d70678f963196b87bb63511d30836b6
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
Abodunrinwa Toki [Wed, 27 May 2015 19:31:01 +0000 (20:31 +0100)]
Fix floating toolbar position issues.
This CL makes the toolbar respect a viewport specified by
the content area (calculated from the globalVisibleRect and
windowInsets). By doing this the toolbar positions
itself appropraitely avoiding the status and nav bars.
Bug:
21324303
Change-Id: I3de9e114194dd43888b7f581ef12c3f8b813b3ca
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