Commit Graph

164750 Commits

Author SHA1 Message Date
Geoff Mendal
2d28d697f6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:37:57 +00:00
Renato Mangini
40ac90e99d am 1b657d92: Fix the order of sample categories left nav.
* commit '1b657d924301d1caa132797f2ab397ba48429e6b':
  Fix the order of sample categories left nav.
2014-11-12 23:33:47 +00:00
Cheuksan Wang
f9c50c45c6 new sms/mms carrier app API
BUG: 18005911

Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
2014-11-12 15:29:41 -08:00
Etan Cohen
c3dfc34012 am 00ead120: Fix VoLTE configuration on secondary TMO MCC/MNC.
* commit '00ead12087846eed465ffa5c9989878e7d2d0784':
  Fix VoLTE configuration on secondary TMO MCC/MNC.
2014-11-12 23:29:08 +00:00
Etan Cohen
00ead12087 Fix VoLTE configuration on secondary TMO MCC/MNC.
Added in ag/573693. But underlying mechanism changed in ag/573692 and
not adjusted.

Change-Id: I2e4784df38ba35aec477d657753974b7918b08b0
2014-11-12 23:23:08 +00:00
Ye Wen
bdc3a46312 Delay connecting to MmsService until APIs are called for imms
Eagerly connecting to MmsService in MmsServiceBroker during system
bootup caused a 2-second delay. Removing the connection in this CL. The
connection will be made when any of the API is called.

b/18085396

Change-Id: I201abcb5f8c5ac69e347e2c69fd20b8215bb0654
2014-11-12 15:15:49 -08:00
George Mount
4978ebe04f am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev
* commit 'fa781f8c2cdbd176d8ab8c9c82fcd6496e73e3be':
  Update GhostView properly when underlying view changes.
2014-11-12 23:14:55 +00:00
George Mount
fa781f8c2c Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 2014-11-12 23:10:35 +00:00
Raph Levien
d82f8a9a38 Check bounds on CharSequence drawText methods
The canvas drawText() methods on CharSequence arguments didn't check
whether the start and end offsets were within bounds, which triggered
native crashes. This patch checks the bounds and throws
IndexOutOfBoundsException when invalid.

Bug: 18282500
Change-Id: I1935bf21f828b960c817b40ebce6affd4ce8bb99
2014-11-12 15:05:16 -08:00
Geoff Mendal
978f85c3da Import translations. DO NOT MERGE
Change-Id: I3395ff410dc14afb14c0626368fd66da77996963
Auto-generated-cl: translation import
2014-11-12 15:01:37 -08:00
Jeff Sharkey
a2781fdac3 am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '521ca5f8fba355f526e82dc3a8fc6520e4379874':
  Recover apps with malformed certificates.
2014-11-12 22:54:47 +00:00
Ignacio Solla
451e338c51 [WebView] Allow the WebView to be compiled against the system SDK.
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
2014-11-12 22:49:56 +00:00
Alan Viverette
5f876974d0 am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev
* commit '667ec63c9ed695ca71f6639f18c31995fb8ff880':
  Don't propagate AnimatedStateListDrawable state change to super()
2014-11-12 22:46:14 +00:00
George Mount
3ba2c7c681 am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev
* commit '70cb4f3e7131cda1e58c1f6d422e296c4935289d':
  Fix getChildVisibleRect to clip correctly.
2014-11-12 22:46:08 +00:00
Ignacio Solla
ba1d4cd4fe am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev
* commit 'c3631b985f51fcce97b0111cdd8297a58c44a5ec':
  Fix docs build breakage
2014-11-12 22:41:56 +00:00
Dianne Hackborn
caf3cddd5b am fabb70b2: Add reporting of Parcel memory/count.
* commit 'fabb70b2efbd125f74923d19ab12bc8e1371ed1f':
  Add reporting of Parcel memory/count.
2014-11-12 22:41:51 +00:00
Alan Viverette
4acd0ecc7b Account for window bounds in accessibility view click point computation
BUG: 18177402
Change-Id: If591d1b9e5a8a7c4cade3ef4f3ec5e42d623b53c
2014-11-12 22:37:36 +00:00
Rob Tsuk
ccc956b2b4 am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
* commit '41a8043b30a289bdba55a2469e598b3fe67c3bf1':
  Add a way to override Xfermode DO NOT MERGE
2014-11-12 22:36:18 +00:00
Ignacio Solla
dfb25b3dec am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
* commit '10ece9c9d5c2134a6ea04bf593a2b76d167dbd7a':
  [WebView] Interface to access hidden APIs.
2014-11-12 22:36:09 +00:00
ztenghui
ab6515f621 am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev
* commit '4e50ee4f42e4fdf753b9f681a6236f4a46e25bb0':
  Shadow: Fix the crash in spot shadow
2014-11-12 22:36:04 +00:00
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