OSDN Git Service
Pierre Vandwalle [Wed, 1 Jul 2015 19:48:26 +0000 (12:48 -0700)]
correctly print wificonfiguration creation and update time
Change-Id: I1c4abf9bed86cddea3592f0604def1a7727b73fc
Doris Liu [Tue, 30 Jun 2015 21:34:58 +0000 (21:34 +0000)]
Merge "Allow null child view when checking whether divider should draw" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 21:22:24 +0000 (21:22 +0000)]
Merge "Don't display layout bounds of GONE views" into mnc-dev
Doris Liu [Tue, 30 Jun 2015 20:42:22 +0000 (13:42 -0700)]
Allow null child view when checking whether divider should draw
The beginning divider should draw before the first child that is not
set to GONE. Incidentally, there needs to be a check for such a child,
which involves checking the visibility of all the children with lower
indices. This CL takes into account the scenarios where children with
lower indices could be null, in which case we'll treat them as if they
were GONE.
Bug:
22199594
Change-Id: Iefc73ef87beec219898c967b9a3ccebd1e3b5b4c
Alan Viverette [Tue, 30 Jun 2015 20:53:28 +0000 (20:53 +0000)]
Merge "Handle null argument in ImageView.setImageIcon()" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 20:52:24 +0000 (20:52 +0000)]
Merge "Saturate alpha values when overlaying glyphs" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 20:51:25 +0000 (13:51 -0700)]
Don't display layout bounds of GONE views
bug:
22126532
Change-Id: Ib7816346e0f6ff54fcf7b180bf4042ce113728b9
Alex Klyubin [Tue, 30 Jun 2015 20:48:16 +0000 (20:48 +0000)]
Merge "Enforce IND-CPA requirement when generating asymmetric keys." into mnc-dev
Alan Viverette [Tue, 30 Jun 2015 20:32:27 +0000 (13:32 -0700)]
Handle null argument in ImageView.setImageIcon()
Provides consistency with setImageDrawable(). Also updates docs and
annotations for setImageZzz() methods that can take null.
Bug:
21664964
Change-Id: Ia9b7f8ee9edb23eeea457520bea4dd261decc794
Adam Lesinski [Tue, 30 Jun 2015 20:31:18 +0000 (20:31 +0000)]
Merge "Add round/notround qualifier to docs" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 20:30:44 +0000 (20:30 +0000)]
Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
Chris Craik [Tue, 30 Jun 2015 20:12:24 +0000 (13:12 -0700)]
Saturate alpha values when overlaying glyphs
bug:
19062769
Glyphs were stored to the output buffer with the assumption of
non-overlap, which is incorrect for certain fonts/strings. Instead,
blend src into dst, so new glyphs don't clobber existing content.
Change-Id: I6e22037500e67d5348ee2a43d939416c23c4d1ea
Bryce Lee [Tue, 30 Jun 2015 20:15:31 +0000 (20:15 +0000)]
Merge "Merge commit '
91d2cbf4' into manualmerge" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Don't allow do not disturb when volume restricted" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 19:54:41 +0000 (12:54 -0700)]
BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Bug:
18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
Adam Lesinski [Tue, 30 Jun 2015 18:49:41 +0000 (11:49 -0700)]
Add round/notround qualifier to docs
Bug:
22203014
Change-Id: Icc05b93f0c1beddce3bd26ae169c2e8c0e3cb898
Bryce Lee [Tue, 30 Jun 2015 19:31:41 +0000 (12:31 -0700)]
Merge commit '
91d2cbf4' into manualmerge
Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158
Svet Ganov [Tue, 30 Jun 2015 19:24:02 +0000 (19:24 +0000)]
Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
John Spurlock [Tue, 30 Jun 2015 19:22:15 +0000 (19:22 +0000)]
Merge "Volume: Defend against monkeys pulling tags too early." into mnc-dev
John Spurlock [Tue, 30 Jun 2015 19:14:27 +0000 (15:14 -0400)]
Volume: Defend against monkeys pulling tags too early.
Bug:
22197117
Change-Id: I0f944fbc7fd6dd5176300c4fd0fd7b79234efe2d
Maxim Bogatov [Tue, 30 Jun 2015 18:45:46 +0000 (18:45 +0000)]
Merge "Let TextView clear accessibility selection index" into mnc-dev
Bryce Lee [Tue, 30 Jun 2015 18:34:47 +0000 (18:34 +0000)]
am
cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
* commit '
cc2ba2200ddc9d95753fa930aa245540fac880e8':
Only enable theater mode by button press after setup.
David Friedman [Tue, 30 Jun 2015 17:57:45 +0000 (17:57 +0000)]
am
eb7f1a94: am
9f2e92ee: Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
* commit '
eb7f1a948a202cec51c0c09c3fbc1c557674380b':
Docs: Localized M-Preview pages Bug:
21789313
Andrew Solovay [Tue, 30 Jun 2015 17:57:36 +0000 (17:57 +0000)]
am
4653cdec: am
350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '
4653cdecab5eb6b08f23183f83034ccf50e93451':
docs: Clarified when you can put the fragments in the root view.
Yorke Lee [Tue, 30 Jun 2015 17:47:08 +0000 (17:47 +0000)]
Merge "Fix TelecomManager.isVoicemailNumber" into mnc-dev
Chris Wren [Tue, 30 Jun 2015 17:20:27 +0000 (17:20 +0000)]
Merge "add more power manager metrics" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 17:15:44 +0000 (10:15 -0700)]
Installer is a part of the system with unrevocable permissions
1. Mark the installer permissions as not revocable.
2. Make the permission result dispatch more robust to handle installer death.
bug:
22012614
Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
Yorke Lee [Tue, 30 Jun 2015 17:07:40 +0000 (10:07 -0700)]
Fix TelecomManager.isVoicemailNumber
Provide an overload of PhoneNumberUtil.isVoiceMailNumber that
takes a context to prevent an NPE.
This does not fix PhoneNumberUtil.isVoicemailNumber(String number),
that will require a follow up CL.
Bug:
22184528
Change-Id: I300b70948e5ff7230989bb887ad17e222c61685d
Bryce Lee [Tue, 30 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
Abodunrinwa Toki [Tue, 30 Jun 2015 16:56:20 +0000 (16:56 +0000)]
Merge "Fix Floating toolbar overflow width." into mnc-dev
Abodunrinwa Toki [Tue, 30 Jun 2015 16:53:23 +0000 (16:53 +0000)]
Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 16:50:51 +0000 (16:50 +0000)]
Merge "Update the stroage icon." into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 16:50:15 +0000 (16:50 +0000)]
Merge "Add read/write external storage app ops" into mnc-dev
Filip Gruszczynski [Tue, 30 Jun 2015 15:19:32 +0000 (15:19 +0000)]
Merge "resolved conflicts for merge of
e89d821e to mnc-dev" into mnc-dev
Andres Morales [Tue, 30 Jun 2015 15:19:26 +0000 (15:19 +0000)]
Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:54:48 +0000 (10:54 -0400)]
Don't allow do not disturb when volume restricted
Bug:
21642285
Change-Id: I8e31f809506b48855eb90c67727c026deb120af5
John Spurlock [Tue, 30 Jun 2015 14:22:21 +0000 (14:22 +0000)]
Merge "Volume: Mark inactive sliders as focusable." into mnc-dev
George Mount [Tue, 30 Jun 2015 14:21:45 +0000 (14:21 +0000)]
Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
John Spurlock [Tue, 30 Jun 2015 14:17:37 +0000 (10:17 -0400)]
Volume: Mark inactive sliders as focusable.
Enabled but inactive sliders ought to be focusable, just not
focused.
Bug:
22096089
Change-Id: I95cdfc1b1258ca0e4562761031f4ee59bd35e7e3
Chris Wren [Mon, 29 Jun 2015 16:02:13 +0000 (12:02 -0400)]
add more power manager metrics
dream start/stop
dream duration
screen timeout setting
Bug:
21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
Chris Wren [Mon, 29 Jun 2015 15:27:18 +0000 (11:27 -0400)]
only count clicks on zen mode selector
We were counting all changes of mode while the panel was visible, including the
first initialization of the selector.
Bug:
21196323
Change-Id: Icf2165056f03507b0b8c6a21ec1f07830c29173a
Kenny Guy [Tue, 30 Jun 2015 13:03:29 +0000 (13:03 +0000)]
Merge "Deprecate APIs for admin to create users." into mnc-dev
Paul Jensen [Tue, 30 Jun 2015 11:11:12 +0000 (11:11 +0000)]
Merge "Don't reevaluate disconnected networks" into mnc-dev
Billy Lau [Tue, 30 Jun 2015 09:05:31 +0000 (09:05 +0000)]
Merge "Bug:
21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
Esteban Talavera [Tue, 30 Jun 2015 08:55:35 +0000 (08:55 +0000)]
Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
Benjamin Franz [Tue, 30 Jun 2015 07:45:47 +0000 (07:45 +0000)]
Merge "Make ContentObservers work across profiles" into mnc-dev
Dianne Hackborn [Tue, 30 Jun 2015 07:41:15 +0000 (07:41 +0000)]
Merge "Fix issue #
22185268: apps crash with missing permissions and NPE on AppOpsManager" into mnc-dev
Dianne Hackborn [Tue, 30 Jun 2015 06:45:45 +0000 (23:45 -0700)]
Fix issue #
22185268: apps crash with missing permissions and NPE on AppOpsManager
Turn off GET_ACCOUNTS permission assigning for now.
Change-Id: I576117b26a43ca2da10db8bb2b1e4e176109ae39
Erik Kline [Tue, 30 Jun 2015 06:32:19 +0000 (06:32 +0000)]
Merge "Fix use of reachable DNS server logic" into mnc-dev
Andreas Gampe [Tue, 30 Jun 2015 05:40:06 +0000 (05:40 +0000)]
Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 05:15:55 +0000 (22:15 -0700)]
Update the stroage icon.
bug:
22172919
Change-Id: Ie3ff2a7ceb76123462e3f2dcbd44028d976de19b
Andreas Gampe [Tue, 30 Jun 2015 05:07:30 +0000 (22:07 -0700)]
Frameworks/base: Remove UsageEvents finalizer
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.
Bug:
22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
Svet Ganov [Tue, 30 Jun 2015 04:51:41 +0000 (21:51 -0700)]
Add read/write external storage app ops
bug:
22104418
Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
Abodunrinwa Toki [Tue, 30 Jun 2015 04:17:22 +0000 (21:17 -0700)]
Fix Floating toolbar overflow width.
Also clean out unused methods.
Bug:
22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
Abodunrinwa Toki [Tue, 30 Jun 2015 03:43:14 +0000 (20:43 -0700)]
Fix floating toolbar flicker in ExtractEditText mode.
Fixed by making sure to update visibility immediately after setting a
hide flag on the FloatingToolbarVisibilityHelper.
Bug:
22101632
Change-Id: Iea2d9786c14f6451da836e55f0d880025aa00ed2
Svet Ganov [Tue, 30 Jun 2015 03:19:25 +0000 (20:19 -0700)]
Fix build
Change-Id: I64fc25c9ddd79c31e5bf34ec7bb4e21541be315b
Erik Kline [Fri, 26 Jun 2015 10:21:34 +0000 (19:21 +0900)]
Fix use of reachable DNS server logic
Move reachable DNS server computation out of ConnectivityService
and split it into LinkProperties#isReachable() and a companion
change in WifiStateMachine's makeLinkProperties().
Restore previous ConnectivityService#updateDnses() behaviour, as
the pruning is done in WifiStateMachine now.
Bug:
19470192
Bug:
20733156
Bug:
22098233
Change-Id: I810ef74d504e5dc1ca2017d435cdadd6b82171e6
David Friedman [Tue, 30 Jun 2015 01:58:57 +0000 (01:58 +0000)]
am
9f2e92ee: Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
* commit '
9f2e92eebd05d8f37ae5f8383b4a0d63d51a9654':
Docs: Localized M-Preview pages Bug:
21789313
David Friedman [Tue, 30 Jun 2015 01:51:35 +0000 (01:51 +0000)]
Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
Svetoslav [Tue, 30 Jun 2015 00:49:06 +0000 (00:49 +0000)]
Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
Jorim Jaggi [Tue, 30 Jun 2015 00:47:51 +0000 (00:47 +0000)]
Merge "Disable Keyguard chatyness" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 02:07:31 +0000 (19:07 -0700)]
Grant default permissons to the default SMS, Phone, Browser app.
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.
bug:
22104986
Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
Jorim Jaggi [Fri, 26 Jun 2015 00:26:10 +0000 (17:26 -0700)]
Add accessibility event for assist disclosure
Bug:
21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
Jorim Jaggi [Tue, 30 Jun 2015 00:25:46 +0000 (17:25 -0700)]
Disable Keyguard chatyness
Bug:
21320918
Change-Id: I71a52b5a2f27dcf0d81710b16d9d36fc4e73ec04
Jorim Jaggi [Tue, 30 Jun 2015 00:24:34 +0000 (00:24 +0000)]
Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev
Jorim Jaggi [Fri, 26 Jun 2015 23:40:00 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (1/2)
Bug:
22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
Dianne Hackborn [Tue, 30 Jun 2015 00:15:07 +0000 (00:15 +0000)]
Merge "Auto grant GET_ACCOUNTS where appropriate." into mnc-dev
Filip Gruszczynski [Tue, 30 Jun 2015 00:07:33 +0000 (17:07 -0700)]
resolved conflicts for merge of
e89d821e to mnc-dev
Change-Id: I3dea6a0947df26b99a779979d68f018d1ad678dc
Christopher Tate [Mon, 29 Jun 2015 23:46:36 +0000 (23:46 +0000)]
Merge "Don't crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
Santos Cordon [Mon, 29 Jun 2015 23:40:13 +0000 (23:40 +0000)]
Merge "Telecom API council changes." into mnc-dev
Tyler Gunn [Mon, 29 Jun 2015 23:31:33 +0000 (23:31 +0000)]
Merge "IMS: Map pay phone and unknown presentation with OIR." into mnc-dev
Santos Cordon [Thu, 25 Jun 2015 23:41:48 +0000 (16:41 -0700)]
Telecom API council changes.
- adding more javadocs.
- fixing javadoc on isEnabled
- renaming to CONFIGURE_PHONE_ACCOUNT
Bug:
21573551
Change-Id: Ice035b8573a08ea18181a73c9e9a462520a934f1
Christopher Tate [Mon, 29 Jun 2015 22:43:26 +0000 (15:43 -0700)]
Don't crash in JNI: add DeadObjectException(String msg) ctor
Bug
22104446
Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
David Friedman [Mon, 29 Jun 2015 23:03:08 +0000 (16:03 -0700)]
Docs: Localized M-Preview pages
Bug:
21789313
Change-Id: Ifb4a45a65acd7b786e05bdf7b7dd86698093fbdf
Shriram Ganesh [Thu, 5 Mar 2015 11:13:03 +0000 (16:43 +0530)]
IMS: Map pay phone and unknown presentation with OIR.
Current code does not map pay phone and unknown
presentation with OIR.
Add code to map pay phone and unknown presentation
with OIR correctly.
Bug:
22123243
Change-Id: I7610db8547a0f0f5529c2627879047dd9a45cf9f
Jean-Michel Trivi [Mon, 29 Jun 2015 22:11:33 +0000 (22:11 +0000)]
Merge "Volume change intent carries stream alias" into mnc-dev
Andrew Solovay [Mon, 29 Jun 2015 21:55:09 +0000 (21:55 +0000)]
am
350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '
350286e613cdde99f347bd115c406e790a242f87':
docs: Clarified when you can put the fragments in the root view.
Andrew Solovay [Mon, 29 Jun 2015 21:42:46 +0000 (21:42 +0000)]
Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
Alex Klyubin [Mon, 29 Jun 2015 21:39:29 +0000 (14:39 -0700)]
Enforce IND-CPA requirement when generating asymmetric keys.
This enforces the randomized encryption requirement (IND-CPA), if
requested, when generating asymmetric key pairs. Whether randomized
encryption is used depends on the encryption padding modes authorized
for the key pair. Thus, if randomized encryption is required, the
KeyPairGenerator must reject attempts to generate keys authorized for
encryption using non-compliant padding schemes.
This is similar to the existing check in AndroidKeyStoreImpl during
asymmetric key import.
Bug:
22179911
Change-Id: I3d85367259c17bd44198a736ace853d0d3567d5e
Filip Gruszczynski [Mon, 29 Jun 2015 20:59:50 +0000 (20:59 +0000)]
am
b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev
* commit '
b6c158f9d863768d5d8315f2a4a4bb87c4db2fea':
Dump of previous vibrations.
Filip Gruszczynski [Mon, 29 Jun 2015 20:47:07 +0000 (20:47 +0000)]
Merge "Dump of previous vibrations." into cw-d-mr1-dev
Yohei Yukawa [Mon, 29 Jun 2015 20:42:52 +0000 (20:42 +0000)]
Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev
Yang Ni [Mon, 29 Jun 2015 20:38:05 +0000 (20:38 +0000)]
Merge "Add Java doc comments on script group name reuse" into mnc-dev
Eddie Ringle [Sun, 29 Jun 2014 20:43:28 +0000 (16:43 -0400)]
Fix FragmentTransaction replace() behavior
Bug
22174959
According to FragmentTransaction's reference, replace()
should be equivalent to remove()'ing every fragment in
a given container and then adding the specified fragment
to replace those that were removed.
Commit
ee76efb74b5886f98cdfebfbefe9b69224e016fb broke
this intended behavior in the framework.
This patch makes it so that the removal loop doesn't
end prematurely. It also fixes an issue where the
replace operation would remove fragments regardless
of their container after encountering the first fragment
with a matching container ID.
Relevant issues:
http://b.android.com/43265
http://b.android.com/52112
http://b.android.com/53393
http://b.android.com/68856
http://b.android.com/70803
Change-Id: Ica4691746ab8979ed974a998e85324e4feacc5e3
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
John Spurlock [Mon, 29 Jun 2015 20:08:42 +0000 (20:08 +0000)]
Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev
Alan Viverette [Mon, 29 Jun 2015 19:39:27 +0000 (19:39 +0000)]
Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
John Spurlock [Mon, 29 Jun 2015 19:34:18 +0000 (15:34 -0400)]
Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
Use ACTION_CLOSE_SYSTEM_DIALOGS as an additional signal to immediately
dismiss the volume dialog, if showing. Otherwise nav bar navigation
will not immediately dismiss the dialog.
Bug:
22173890
Change-Id: I3eee85a4579b4673b19402cf0f4048068009be35
Christopher Tate [Mon, 29 Jun 2015 18:54:56 +0000 (18:54 +0000)]
Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev
Christopher Tate [Mon, 29 Jun 2015 18:00:15 +0000 (11:00 -0700)]
Throw DeadObjectException on failed transaction, not RuntimeException
In practice we only see failed transactions with small payloads when
the remote dies while the binder operation is in flight. Throw the
applicable exception type rather than the generic "oops binder went
haywire" one.
Bug
22104446
Change-Id: I785c15617db7a1f4d505aa11f16e61551c8357ba
Wale Ogunwale [Mon, 29 Jun 2015 18:12:54 +0000 (18:12 +0000)]
Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev
Jean-Michel Trivi [Fri, 26 Jun 2015 00:38:35 +0000 (17:38 -0700)]
Volume change intent carries stream alias
Define a new extra, AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, to be
sent along with the volume change intent, VOLUME_CHANGED_ACTION.
When sending VOLUME_CHANGED_ACTION, attach the stream type alias.
Bug
17955277
Change-Id: I04fd279e223504e3ee1581086d7e9205344a6808
Jae Seo [Mon, 29 Jun 2015 17:14:41 +0000 (17:14 +0000)]
Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
Nicolas Prevot [Mon, 29 Jun 2015 17:08:31 +0000 (17:08 +0000)]
Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
Makoto Onuki [Mon, 29 Jun 2015 16:56:07 +0000 (16:56 +0000)]
Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev
Geoff Mendal [Mon, 29 Jun 2015 16:50:55 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 29 Jun 2015 16:45:56 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7c3e19454b5350971e62e79804cc45512436b98
Auto-generated-cl: translation import
Esteban Talavera [Mon, 29 Jun 2015 16:41:39 +0000 (17:41 +0100)]
Marking some globals from setGlobalSetting as not supported
Those globals don't have the intended behaviour any more.
Bug:
19967818
Change-Id: I8c7891e59280f9deb88b1f0ffead3de07f4eca56
Filip Gruszczynski [Fri, 26 Jun 2015 01:35:00 +0000 (18:35 -0700)]
Dump of previous vibrations.
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.
Bug:
21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
Jason Monk [Mon, 29 Jun 2015 16:19:46 +0000 (16:19 +0000)]
Merge "Fix weird case of multi cell icons" into mnc-dev
Andres Morales [Fri, 26 Jun 2015 20:56:39 +0000 (13:56 -0700)]
[LockSettings] adjust legacy patterns to base 0 for unlocking keystore
Otherwise, L keys will be lost as they're encrypted with the base 0
pattern. Keystore password is then re-enrolled with the base '1'
pattern.
Bug:
22118231
Change-Id: I37aea2afc3069f1ba48cb073268f1d66978b723e