191455 Commits

Author SHA1 Message Date
Derek Sollenberger
2a94a10bec Update the rowBytes when reconfiguring to match the new imageInfo.
bug: 20872840
Change-Id: Ic98a9d16e095c27ddcc193a18641732c1ee4bad0
2015-05-07 14:26:01 -04:00
Doris Liu
c7e56e9df1 Merge "Take into account scroll offset for transition animation" into mnc-dev 2015-05-07 17:56:46 +00:00
Alex Klyubin
a4ead5b0d5 Merge "Document that new APIs for asymmetric crypto have no effect." into mnc-dev 2015-05-07 17:54:53 +00:00
Alex Klyubin
e91768d4b5 Merge "Check parameters in KeyGenerator.init." into mnc-dev 2015-05-07 17:54:28 +00:00
Alan Viverette
43ea92b8ef Merge "Remove dead code from EpicenterTranslateClipReveal" into mnc-dev 2015-05-07 17:52:53 +00:00
Alex Klyubin
a6e551c68c Check parameters in KeyGenerator.init.
KeyGenerator.init is supposed to check whether all provided parameters
are OK. This is because KeyGenerator.generateKey cannot throw checked
exceptions. This CL makes AndroidKeyStore KeyGenerator implementation
do just that. Unfortunately, keymaster/kestore doesn't provide a way
to check whether all the parameters are OK without actually generating
a key. Thus, this KeyGenerator does its best inside init method
(before Keymaster is called), and then surfaces any remaining issues
(flagged by Keymaster/keystore) as unchecked IllegalStateException.

Bug: 18088752
Change-Id: I9a04da880dcbe26c37f41d1477e41bdc74db04c9
2015-05-07 10:50:10 -07:00
Alex Klyubin
14bc1c58d4 Merge "Use ProviderException in AndroidKeyStore." into mnc-dev 2015-05-07 17:43:30 +00:00
Alex Klyubin
ca84b19f10 Document that new APIs for asymmetric crypto have no effect.
Bug: 18088752
Change-Id: Idfcf57251e76185425b9271d6a2001c5556f9f59
2015-05-07 10:41:54 -07:00
Alex Klyubin
38dc15421e Merge "Always mix in additional entropy into keymaster." into mnc-dev 2015-05-07 17:38:40 +00:00
Alan Viverette
6689a013b3 Remove dead code from EpicenterTranslateClipReveal
Change-Id: Id2ba801b61cf419b43188514b36cf869b4f836a6
2015-05-07 10:38:26 -07:00
Yorke Lee
e0895660da Merge "Filter list of possible default dialers" into mnc-dev 2015-05-07 17:34:54 +00:00
Alex Klyubin
f555887237 Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev 2015-05-07 17:34:25 +00:00
Alex Klyubin
8d7455fbe4 Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev 2015-05-07 17:34:01 +00:00
Alan Viverette
83ce3b26b6 Merge "Make popup window enter animation more like app transition enter" into mnc-dev 2015-05-07 17:25:37 +00:00
Chris Elliott
80f232deae am b65b66cc: am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit 'b65b66ccc251371c817abe75176a73f84565410e':
  bootanimation: fix garbage line issue when screen height is odd.
2015-05-07 17:17:03 +00:00
Alan Viverette
b4b4437801 Merge "Remove tools attributes from framework XML" into mnc-dev 2015-05-07 17:13:09 +00:00
Alan Viverette
4ea5ee2330 Make popup window enter animation more like app transition enter
Merges the translate and clip reveal so that we can adjust the clip
position based on the current translate position. This ensures the
clip appears to expand from the center of the translated popup and
never extends outside the window bounds.

Change-Id: I8bbb9c0e2293a25f7807d71d9b8779bb782d4784
2015-05-07 10:07:42 -07:00
Chris Elliott
b65b66ccc2 am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev
* commit '2224eac30375a731f4ad38d6930dbc37b0855a0d':
  bootanimation: fix garbage line issue when screen height is odd.
2015-05-07 17:06:47 +00:00
Alan Viverette
31ee4f7d44 Remove tools attributes from framework XML
Bug: 20494934
Change-Id: Iaf43abddf6b533c107350254e467e7a029ccc88d
2015-05-07 10:01:01 -07:00
Doris Liu
18c2b0ef36 Take into account scroll offset for transition animation
This CL fixed the issue where scroll offset was ignored when shared
elements are added to the ghost view and when they are laid out.

Bug: 20349408
Change-Id: Ifaeb821bffe6fcfe303221a1732125bf1c4a91b7
2015-05-07 09:58:02 -07:00
Chet Haase
1bc3c849ba Merge "Fix leak in LayoutTransition" into mnc-dev 2015-05-07 16:56:43 +00:00
Alex Klyubin
27dd1a2227 Adjust the Javadoc for user authentication timeout.
The Javadoc incorrectly stated that:
* 0 means authentication required for every use.
* -1 means that timeout is not specified and the key can be any time.

Bug: 18088752
Change-Id: Ie5f37e74dc207f23443527ac1725ae8a37213d75
2015-05-07 09:51:21 -07:00
Chris Elliott
2224eac303 Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev 2015-05-07 16:51:09 +00:00
Niels Egberts
dd44179540 Merge "Don't strip country and variant from locale." into mnc-dev 2015-05-07 16:22:52 +00:00
John Reck
b59642bf49 Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev 2015-05-07 16:16:16 +00:00
Paul Jensen
ffe2dda135 Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 2015-05-07 15:30:47 +00:00
Niels Egberts
837fba984e Don't strip country and variant from locale.
When the synthesizer returns LANG_AVAILABLE or LANG_COUNTRY_AVAILABLE
for a certain locale, we strip the country and variant from the locale
before asking the synthesizer for the default voice name for this
locale.

This can prevent the synthesizer from picking the right locale. For
instance it prevents the synthesizer from picking en-gb if en-au is
requested, now it can only have a single preferred voice for all English
countries.

The solution is not to strip the country and variant from the locale.
This is not likely to break anything, because the input to
onGetDefaultVoiceNameFor was never expected to be a subset of all
supported language-country-variant combinations. The default
implementation handles this correctly.

Change-Id: I017f69d321039c7aa7a3ef5a09ba138e35b66670
(cherry picked from commit 4758e99783493fc546e6819b5fe9d44e1ef8c318)
2015-05-07 15:02:46 +00:00
Paul Jensen
d0d420587a Avoid NPE when sendMessage is called after disconnect.
This avoids an NPE that could occur when:
1. disconnect() is called
2. sendMessage() is called but encounters a RemoteException
3. replyDisconnected() will attempt to dereference mSrcHandler
There does not appear to be any callers that rely on the NPE.
All callers erase their reference to the AsyncChannel after
calling disconnect(), except for NetworkAgentInfo which can
cause ConnectivityService to crash.  This fix addresses that.

bug:20647016
Change-Id: I89864885dc3371941407a036b7b7647e0ec037b8
2015-05-07 10:44:32 -04:00
George Mount
fa21641122 Merge "Add CallbackRegistry." into mnc-dev 2015-05-07 14:34:58 +00:00
George Mount
b3ba213895 Merge "Fix crash during Activity Transition with TextureView." into mnc-dev 2015-05-07 14:34:02 +00:00
Neil Fuller
d6a2135262 Remove FloatMath methods from the API
Also removing FloatMathTest. The tests are being
moved into a legacy CTS suite.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
2015-05-07 13:16:18 +00:00
Jeff Brown
dbf62ace0d Merge "Remove incomplete media router API." into mnc-dev 2015-05-07 08:00:03 +00:00
Jinsuk Kim
dd0f3964ef Merge "CEC: Make wakeup on hotplug optional" into mnc-dev 2015-05-07 07:12:20 +00:00
Joe Fernandez
38de061b8b am b53420d0: am e7866887: docs: M Preview landing page
* commit 'b53420d02def4277cf5b8a04da289b4291a9f24a':
  docs: M Preview landing page
2015-05-07 06:42:05 +00:00
Joe Fernandez
b53420d02d am e7866887: docs: M Preview landing page
* commit 'e78668876ed0dfc25fac604b5048509f72d92c53':
  docs: M Preview landing page
2015-05-07 06:29:57 +00:00
Joe Fernandez
e78668876e docs: M Preview landing page
Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
2015-05-06 23:19:23 -07:00
Jinsuk Kim
659c486beb CEC: Make wakeup on hotplug optional
Added a new system property to make the feature optional. True
by default.

Bug: 20897914
Change-Id: I8bfca5144b802b95361e63b29abd6371971c7dbb
2015-05-07 15:02:37 +09:00
Yohei Yukawa
f2cac4d495 Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 05:39:18 +00:00
Nitin Arora
bdfaa7f566 Bluetooth: Ensure Bluetooth interface handle is valid
This change adds null checks to Bluetooth interface handle to prevent
using null references when BluetoothService is not up. Also removed
the callbacks for the intermediate state removed for now as they are
not being used.

Change-Id: I0e72ff4da467a8bcf5a4e5ac48d8558e7f308c7e
2015-05-06 22:24:23 -07:00
Seigo Nonaka
14e139179b Retry "Always show auxiliary subtypes from NavBar keyboard icon."
This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was
reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build
breakage in 'layoutlib' target, with a proper fix.

Hereafter the original CL description is repeated.

The auxiliary subtypes should be listed if the input method picker is
opened from NavBar keyboard icon.  However there is only
IMM#showInputMethodPicker() API to open input method picker and this is
also used from LockScreen or Settings UI.  Auxiliary subtypes should not
be listed there(Id7cf5d122).  Thus framework shows auxiliary subtypes
based on IMMS#mInputShown and LockScreen state, but it is not a perfect
solution.  If a physical keyboard is connected, the soft input may be
gone.  As the result, auxiliary subtypes won't be listed even if it is
opened from NavBar keyboard icon.

To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean)
to be able to decide showing auxiliary subtypes by caller.
Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide.
There is no public API change in this CL.

Bug: 20763994
Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
2015-05-06 21:34:07 -07:00
Jeff Brown
20db98c5d8 Remove incomplete media router API.
This time not also accidentally deleting frameworks/base/Android.mk.
*sigh*

Bug: 20641986
Change-Id: I2e43ab1fdf4201fec4d5a5b73c04f27a4a848630
2015-05-06 21:00:06 -07:00
Bart Sears
9132c5ab07 Merge "Revert "Remove incomplete media router API."" into mnc-dev 2015-05-07 03:23:45 +00:00
Bart Sears
a8cc0584c6 Revert "Remove incomplete media router API."
This CL has broken all builds on mnc-dev.
Reverting until Jeff can take a look at it.

This reverts commit 2e5a2051de54e64612e1357d4534c7ec851aa508.

Change-Id: Ib9b3569bfebdc7bbfbcb7aee82733b93736c5bb5
2015-05-07 03:23:20 +00:00
Diego Perez
70280a20f3 am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '0fe14486211e3ade7f29ea76e16211853fe9cd7a':
  Added function to render a drawable in all available states
2015-05-07 03:14:30 +00:00
Diego Perez
0fe1448621 am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '2021c8773150dd47d8781375af94143cb22afd9d':
  Added function to render a drawable in all available states
2015-05-07 03:02:34 +00:00
Jeff Brown
1290748db3 Merge "Remove incomplete media router API." into mnc-dev 2015-05-07 02:55:33 +00:00
Jeff Brown
2e5a2051de Remove incomplete media router API.
Bug: 20641986
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
2015-05-06 19:54:46 -07:00
Diego Perez
2021c87731 am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '33e54563daa0db610f9dc8b9d4fca8f826ffec73':
  Added function to render a drawable in all available states
2015-05-07 02:49:50 +00:00
Diego Perez
33e54563da am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '4b12583653561f69a5780126485380cac187c478':
  Added function to render a drawable in all available states
2015-05-07 02:37:28 +00:00
Diego Perez
4b12583653 Merge "Added function to render a drawable in all available states" into lmp-mr1-dev 2015-05-07 02:28:51 +00:00