159263 Commits

Author SHA1 Message Date
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
2014-11-12 22:24:24 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates.
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
2014-11-12 22:20:46 +00:00
Alan Viverette
667ec63c9e Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 2014-11-12 22:19:06 +00:00
George Mount
70cb4f3e71 Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 2014-11-12 22:11:45 +00:00
Renato Mangini
1b657d9243 Fix the order of sample categories left nav.
Bug: 18323953
Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
2014-11-12 14:07:48 -08:00
Ignacio Solla
c3631b985f Merge "Fix docs build breakage" into lmp-mr1-dev 2014-11-12 21:58:46 +00:00
Dianne Hackborn
fabb70b2ef Add reporting of Parcel memory/count.
Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
2014-11-12 21:56:30 +00:00
Ignacio Solla
53f2569487 Fix docs build breakage
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
2014-11-12 21:55:47 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Nick Kralevich
451a6f8f9a fix crash on invalid base64 key
An invalid adb public key can cause a system server crash.

  AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: android.fg
  AndroidRuntime: java.lang.IllegalArgumentException: bad base-64
  AndroidRuntime:        at android.util.Base64.decode(Base64.java:161)
  AndroidRuntime:        at android.util.Base64.decode(Base64.java:136)
  AndroidRuntime:        at com.android.server.usb.UsbDebuggingManager.getFingerprints(UsbDebuggingManager.java:235)
  AndroidRuntime:        at com.android.server.usb.UsbDebuggingManager.access$500(UsbDebuggingManager.java:49)
  AndroidRuntime:        at com.android.server.usb.UsbDebuggingManager$UsbDebuggingHandler.handleMessage(UsbDebuggingManager.java:210)
  AndroidRuntime:        at android.os.Handler.dispatchMessage(Handler.java:102)
  AndroidRuntime:        at android.os.Looper.loop(Looper.java:135)
  AndroidRuntime:        at android.os.HandlerThread.run(HandlerThread.java:61)
  AndroidRuntime:        at com.android.server.ServiceThread.run(ServiceThread.java:46)
  Process : Sending signal. PID: 824 SIG: 9

Bug: 17389885
Change-Id: Id20d7c0ee35229b14c800fd9e07716239179989c
2014-11-12 13:40:30 -08:00
ztenghui
d46cf7138a Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev
automerge: ffcb5e2

* commit 'ffcb5e210ad82e0f2a33d6644bc6690552a1785f':
  AVD: Requires all animator has stopped before start again.
2014-11-12 21:22:18 +00:00
Alan Viverette
1c252a6f8b Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev
automerge: 26478ba

* commit '26478bad42dd3d446131ae65ee0bf6880a950889':
  Fix default attributes in ScaleDrawable
2014-11-12 21:20:41 +00:00
Eric Laurent
ac598888e3 Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev
automerge: edd4a22

* commit 'edd4a227e5f49b859f16105a100568fcef4927a3':
  audiosystem JNI: check env pointer before use.
2014-11-12 21:19:15 +00:00
Sandeep Siddhartha
5f02d29550 Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev
automerge: 850ec91

* commit '850ec91e88c2b0911f8460f909eabf4078b78582':
  Don't unload the sound model on stopRecognition
2014-11-12 21:17:53 +00:00
Ignacio Solla
10ece9c9d5 Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 2014-11-12 21:17:07 +00:00
ztenghui
4e50ee4f42 Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 2014-11-12 21:16:31 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
2014-11-12 13:16:06 -08:00
Ruben Brunk
b70dca2d21 Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev
automerge: 68ced89

* commit '68ced89949fc1cce198f25e09bf9bdb12616a98c':
  Frameworks/base: Right transform in DngCreator
2014-11-12 21:15:19 +00:00
ztenghui
3932063bc7 Shadow: Fix the crash in spot shadow
Fix the crash from searching for closest umbra vertex by initialized the
starting index correctly.

Fix another potential crash related to ray intersection by introducing epsilon.

b/18315089

Change-Id: I9ac9a781a885701a8388714d44f79a1d905e5d33
2014-11-12 12:58:08 -08:00
ztenghui
ffcb5e210a Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev 2014-11-12 20:47:45 +00:00
Wale Ogunwale
89b3ecc7b3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev.
Change-Id: I01920b0dc8185d8efb9431bfad911e4733b43e1d
2014-11-12 12:46:45 -08:00
Jason Monk
f13b4b39f2 SysUI: Add basic test coverage for signal levels
Add some tests that verify for varios wifi, and mobile signal
strengths and types that the correct icons are sent out in the
callbacks. Still in prep for MSIM refactoring.

Bug: 18222975
Change-Id: I477bf9a90e5c32fb1cba9c150ec6314f4b707108
2014-11-12 15:42:15 -05:00
Raph Levien
c1bf285966 Update hint text color even when text present
When text is present (so the hint doesn't show), updating the hint color
was suppressed. This patch updates the hint color in all cases, but
still skips the invalidate when the hint text is not showing.

Bug: 17454233
Change-Id: I3887908fb184a10f7a1d7e64f1d92b4955323227
2014-11-12 12:41:24 -08:00
Alan Viverette
26478bad42 Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev 2014-11-12 20:33:31 +00:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
2014-11-12 12:25:24 -08:00
Eric Laurent
edd4a227e5 Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev 2014-11-12 20:19:52 +00:00
Sandeep Siddhartha
850ec91e88 Merge "Don't unload the sound model on stopRecognition" into lmp-mr1-dev 2014-11-12 20:12:39 +00:00
Fyodor Kupolov
d01ff6d4c3 Added synchronization to handlePackagesChanged method
Method handlePackagesChanged modifies the policy data without holding the
lock. It also calls methods which expect a lock to be held -
validatePasswordOwnerLocked, syncDeviceCapabilitiesLocked, saveSettingsLocked.

Bug: 18262633
Change-Id: Ia4bdc6edc66bccf8a4288e048171ff20858ae2f6
2014-11-12 11:27:21 -08:00
Eric Laurent
449c588710 audiosystem JNI: check env pointer before use.
Bug: 18332935.
Change-Id: I1ec820f0282833e13444ec05d50da3ce70d19d8d
2014-11-12 11:07:48 -08:00
Ruben Brunk
68ced89949 Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev 2014-11-12 18:46:47 +00:00
Adam Powell
05f35127e3 Optimize setting padding and backgrounds for views
Don't reset the entire chain of child views whenever we set our own
padding or background; clear our own bidi resolution bits only. This
prevents doing a lot of extra recursive work when changing properties
of a parent view that cannot affect children.

Bug 18159214

Change-Id: I94300402785c79c3199e768ad7b6d7027d8d5d5f
2014-11-12 10:26:32 -08:00
Alan Viverette
f9afb46bf7 Fix default attributes in ScaleDrawable
Reverts default scales to correct value of -1, uses existing state
values when updating from typed array.

BUG: 18351309
Change-Id: I45d21fe017a7bea10e3cbda50f6db65d053aa2ec
2014-11-12 10:24:40 -08:00
Wale Ogunwale
2755644d32 Merge "Fix build breakage from missing close brace." into lmp-mr1-dev 2014-11-12 18:22:12 +00:00
smain@google.com
e9e96e7f0e am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '7d0d2f6c95aa01d6aa43217dec2e183403e7c514':
  fix code type and mention api level 21 exception for bindService()
2014-11-12 18:04:11 +00:00
Renato Mangini
68fde80a47 am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
* commit '2a3ce1853cb5aba8dc1bb9cb9479ec962f8b1e86':
  Add "notification" category for samples.
2014-11-12 18:04:05 +00:00
Sandeep Siddhartha
45c00b5877 Don't unload the sound model on stopRecognition
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
2014-11-12 09:57:27 -08:00
smain@google.com
7d0d2f6c95 am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit 'c6bd0155a76842e39ea0bb75eca33e6e3804437c':
  fix code type and mention api level 21 exception for bindService()
2014-11-12 17:56:26 +00:00
Renato Mangini
2a3ce1853c am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
* commit 'ca011519b61e2ae57dfe760547d7d073f7ec42f3':
  Add "notification" category for samples.
2014-11-12 17:56:20 +00:00
smain@google.com
c6bd0155a7 am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '8d88f19bfe8ec0afb27593c0dea9b547d8c80b48':
  fix code type and mention api level 21 exception for bindService()
2014-11-12 17:52:06 +00:00
Renato Mangini
ca011519b6 am a53b8bad: am 4b7b68d8: Add "notification" category for samples.
* commit 'a53b8badb994c3825140f68eba94888b3274c0b5':
  Add "notification" category for samples.
2014-11-12 17:52:02 +00:00
Wale Ogunwale
1dfab89aff Fix build breakage from missing close brace.
Change-Id: Ib0e58844b8b208d255ff8d9409d0e7c53f27378f
2014-11-12 09:46:10 -08:00
smain@google.com
8d88f19bfe am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit 'f9c4f6b56e1392a411e2996a2bf372873ebf14da':
  fix code type and mention api level 21 exception for bindService()
2014-11-12 17:44:52 +00:00
Renato Mangini
a53b8badb9 am 4b7b68d8: Add "notification" category for samples.
* commit '4b7b68d824ee8bf184f6bfb05f75c74c129a9f8e':
  Add "notification" category for samples.
2014-11-12 17:44:48 +00:00
smain@google.com
f9c4f6b56e Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 2014-11-12 17:41:36 +00:00
smain@google.com
9adc33a658 fix code type and mention api level 21 exception for bindService()
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
2014-11-12 09:38:00 -08:00
Alan Viverette
c164b97f46 am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
  Ensure time picker dialog fits on small screens
2014-11-12 17:35:58 +00:00
Alan Viverette
4fc2ea8402 Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 2014-11-12 17:32:31 +00:00
Alan Viverette
d9f3fdf45b Ensure time picker dialog fits on small screens
Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.

BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
2014-11-12 09:31:22 -08:00
Wale Ogunwale
c3672cd3f7 Cancel or drop key events if activity is stopped.
After an activity instance state is saved due to onStop()/onPause(),
there is a small window where it can still get key events like the
back button since we still allow the ActivityThread to handle
pending messages (like memory trim request) before informing the
activity manager that we are done. If the activity is stopped,
we will now drop non-terminal input events and set the cancel
flag on terminal events.

Bug: 18151331
Change-Id: I370d7c871530eea4b16fa42428d0248f1a87abb6
2014-11-12 09:23:22 -08:00
Geoff Mendal
832f0770c7 am cfefab71: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'cfefab71b1db5500fa3c294a816a3ccb0990242c':
  Import translations. DO NOT MERGE
  Fixed constant window switching on lock screen with Swype KB.
2014-11-12 17:15:48 +00:00