Commit Graph

191429 Commits

Author SHA1 Message Date
a91a850419 Cleanup keystore password changing and unlocking
Add KeyStore.onUserPasswordChanged for the lockscreen to call when
the user changes their password. Keystore will then handle the logic of
deleting keys. Instead of calling Keystore.password_uid for both
unlocking and password changes the behavior has been split into
Keystore.unlock and onUserPasswordChanged.

Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
2015-05-08 11:11:43 -07:00
1bc3c849ba Merge "Fix leak in LayoutTransition" into mnc-dev 2015-05-07 16:56:43 +00:00
dd44179540 Merge "Don't strip country and variant from locale." into mnc-dev 2015-05-07 16:22:52 +00:00
b59642bf49 Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-dev 2015-05-07 16:16:16 +00:00
ffe2dda135 Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-dev 2015-05-07 15:30:47 +00:00
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 4758e99783)
2015-05-07 15:02:46 +00:00
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
fa21641122 Merge "Add CallbackRegistry." into mnc-dev 2015-05-07 14:34:58 +00:00
b3ba213895 Merge "Fix crash during Activity Transition with TextureView." into mnc-dev 2015-05-07 14:34:02 +00:00
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
dbf62ace0d Merge "Remove incomplete media router API." into mnc-dev 2015-05-07 08:00:03 +00:00
dd0f3964ef Merge "CEC: Make wakeup on hotplug optional" into mnc-dev 2015-05-07 07:12:20 +00:00
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
b53420d02d am e7866887: docs: M Preview landing page
* commit 'e78668876ed0dfc25fac604b5048509f72d92c53':
  docs: M Preview landing page
2015-05-07 06:29:57 +00:00
e78668876e docs: M Preview landing page
Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
2015-05-06 23:19:23 -07:00
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
f2cac4d495 Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 05:39:18 +00:00
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
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
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
9132c5ab07 Merge "Revert "Remove incomplete media router API."" into mnc-dev 2015-05-07 03:23:45 +00:00
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 2e5a2051de.

Change-Id: Ib9b3569bfebdc7bbfbcb7aee82733b93736c5bb5
2015-05-07 03:23:20 +00:00
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
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
1290748db3 Merge "Remove incomplete media router API." into mnc-dev 2015-05-07 02:55:33 +00:00
2e5a2051de Remove incomplete media router API.
Bug: 20641986
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
2015-05-06 19:54:46 -07:00
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
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
4b12583653 Merge "Added function to render a drawable in all available states" into lmp-mr1-dev 2015-05-07 02:28:51 +00:00
1b0888fe8e Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" into mnc-dev 2015-05-07 01:52:08 +00:00
d130bdc462 Revert "Always show auxiliary subtypes from NavBar keyboard icon."
CL is breaking the build.  Discussed with Seigo and verting until he can take a look at it.

This reverts commit 80ff4ed6bb.

Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
2015-05-07 01:51:28 +00:00
ee2e8fbe71 Merge changes from topic 'mr' into mnc-dev
* changes:
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
2015-05-07 01:31:28 +00:00
681c7d142a Added function to render a drawable in all available states
This reverts commit 01cdf8b135.

Change-Id: I596855047d78c3c718744ad61432fc45e1239634
(cherry picked from commit 1f158819bc)
2015-05-07 02:05:48 +01:00
f7f6fd2c0c am c2ba7391: am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit 'c2ba7391704cd4025c890b37148c16bf32b55a93':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
2015-05-07 01:02:41 +00:00
c000db78d7 am 9af506fb: am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '9af506fb5b5f1c7f36fb439c2b120ad2b0cda602':
  Make status and navigation bars widgets and usable from layouts
2015-05-07 00:49:57 +00:00
9207b8567a am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit 'ae4619dd7f3d48cae2e9b83681849a77a8201142':
  Move StatusBar to use statusBarColor theme attribute
2015-05-07 00:49:51 +00:00
c87fe129e5 am 52ef7fce: am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit '52ef7fce1626868d6be34f4038cd852259ad6a26':
  Make sure shaders use a color model compatible with the destination.
2015-05-07 00:49:46 +00:00
790f6925a7 am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit 'a131bfe094c007721d006fc9ca21cfa74f41dfef':
  More layoutlib tests.
2015-05-07 00:49:40 +00:00
c2ba739170 am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '613aef87cf6a5958ff2fd255348f92f8d3de152e':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
2015-05-07 00:47:08 +00:00
2ab7b46056 resolved conflicts for merge of a663e012 to mnc-dev
Change-Id: I279cad7db6e9b5e97da3ea3c3bb91e09cabc7076
2015-05-06 17:45:29 -07:00
d7a53dab44 am 9efcb308: am 21246bd9: am 8e75e307: am 1bc7fb2d: Merge "Fix isThemeAppCompat NPE when using an invalid theme" into lmp-mr1-dev
* commit '9efcb308615c0adaf418d430adabea3d271bcbb4':
  Fix isThemeAppCompat NPE when using an invalid theme
2015-05-07 00:34:32 +00:00
15432daa6e am 9c9bcd34: am cae76a70: am 46241071: am 4f8a9996: Merge "Nullity annotations to some tests." into lmp-mr1-dev
* commit '9c9bcd3486d9f7557329dea90b3c5fa1bdace91c':
  Nullity annotations to some tests.
2015-05-07 00:34:26 +00:00
dbcedeea20 am b2951490: am b19325be: am 2e3c41a4: am 92e79868: Merge "Fix title bar showing when not required." into lmp-mr1-dev
* commit 'b2951490eabf71e14c8fc5d50397adf869a2a291':
  Fix title bar showing when not required.
2015-05-07 00:34:21 +00:00
c49b8f9d1b am 88b193d7: am 047a28ec: am 96437fb4: am 9aa600e7: Merge "LayoutLib: fix crash when shadow size <=0." into lmp-mr1-dev
* commit '88b193d717bb73cbe555e4e621f7b6efdf49cdaa':
  LayoutLib: fix crash when shadow size <=0.
2015-05-07 00:34:14 +00:00
613aef87cf am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '86bff0bb63f3667f0b450420514c931b1f4d25d2':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
2015-05-07 00:33:51 +00:00
9af506fb5b am 143eaa81: am 2ea82244: am 263e6dfa: Merge "Make status and navigation bars widgets and usable from layouts" into lmp-mr1-dev
* commit '143eaa81934e47c8acb8338d1a2383eb79b690ef':
  Make status and navigation bars widgets and usable from layouts
2015-05-07 00:21:35 +00:00
ae4619dd7f am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit 'df4c977d760ccfcf929c77b100faa5f8f38df158':
  Move StatusBar to use statusBarColor theme attribute
2015-05-07 00:21:29 +00:00
52ef7fce16 am ffeb8117: am 9c13c8de: am bc47abe4: Merge "Make sure shaders use a color model compatible with the destination." into lmp-mr1-dev
* commit 'ffeb8117b139f61dd7c92bda6a7d47b83871cb66':
  Make sure shaders use a color model compatible with the destination.
2015-05-07 00:21:24 +00:00
86bff0bb63 am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev
* commit '0e20bd8e50724ab264425ba830cdf1beb96f7404':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
2015-05-07 00:21:19 +00:00
a131bfe094 am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev
* commit '3dbd18cdfe6af1a9c36261551ef98d39e849d389':
  More layoutlib tests.
2015-05-07 00:21:19 +00:00