drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,189 Commits 1 Branch 0 Tags
Commit Graph

157189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
eb205b8819 Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev 2014-11-13 17:52:02 +00:00
Mike Lockwood
9c803fa526 MTP: Update JNI for new packet getters 
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
 2014-11-13 09:40:42 -08:00
Jorim Jaggi
a77a37c48a Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev 2014-11-13 17:02:18 +00:00
Jorim Jaggi
048af1f727 Fix doze jank by removing a fullscreen layer of overdraw 
Move all doze related stuff into DozeScrimController, and combine
both alpha values from the regular ScrimController and
DozeScrimController before applying it to a view. Move the black
background from NotificationPanelView to DozeScrimController, which
saves a fullscreen layer of overdraw during the transition.

Bug: 18238168
Change-Id: Ifb133bf4a0f8255f5c2f5e205509af339cac8c8f
 2014-11-13 17:54:21 +01:00
Jorim Jaggi
d0d23c80da Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 2014-11-13 16:46:57 +00:00
Craig Mautner
30bd3bb77b Revert "Debug for bug 18017409" 
The bug has been fixed. No longer needed.

This reverts commit 5a3c231dc832c205d2bb2f7f0881925b92c9e5e2.

Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
 2014-11-13 08:45:39 -08:00
Jorim Jaggi
68b83a784a Fix wrong states when waking up from doze via touch 
Bug: 18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
 2014-11-13 17:09:29 +01:00
Alexandra Gherghina
c61cabe5b3 Merge "Update current.txt with the new extra" into lmp-mr1-dev 2014-11-13 15:31:11 +00:00
Ignacio Solla
bf79cbaba9 Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev 2014-11-13 15:03:45 +00:00
Alexandra Gherghina
a73766790a Update current.txt with the new extra 
Bug: 17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
 2014-11-13 14:43:03 +00:00
Alexandra Gherghina
6e33f0fbb5 Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895 Add extra for account migration in the DevicePolicyMamager 
This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
 2014-11-13 12:46:16 +00:00
Geoff Mendal
f030e66f9d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-13 09:43:51 +00:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Geoff Mendal
0df377c7a6 Import translations. DO NOT MERGE 
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
 2014-11-12 23:20:52 -08:00
Jeff Brown
fef1e0e7f0 Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 2014-11-13 07:11:37 +00:00
Andrew Lee
990bbbb352 Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev 2014-11-13 02:15:15 +00:00
Yorke Lee
5e783896a2 Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev 2014-11-13 00:50:02 +00:00
xinhe
031d8feaa9 Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev 2014-11-13 00:38:00 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
Chris Craik
075b2b4ff9 Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev 2014-11-13 00:05:59 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +00:00
xinhe
c93802b993 Update enabe/disableCellBroadcast with RAN argument 
Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.

Bug: 18202935
Change-Id: Ibf12be65c60807834705e7cc9e94ec485ce6b60a
 2014-11-12 15:58:16 -08:00
Andrew Lee
840162d2b4 Add telephony.DisconnectCause for merged IMS call. 
When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.

We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).

Bug: 18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
 2014-11-12 15:52:32 -08:00
Renato Mangini
19865ccd44 am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '5d7f91c77605a5c444eaaae2b812280c57ca244c':
  Fix the order of sample categories left nav.
 2014-11-12 23:47:14 +00:00
Geoff Mendal
57f06e94eb am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d28d697f6235c497237a11abb973b9109999e38':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:57 +00:00
Renato Mangini
5d7f91c776 am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '40ac90e99da90956f26cf7f7bb4c205e28bbbc66':
  Fix the order of sample categories left nav.
 2014-11-12 23:39:11 +00:00
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
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
George Mount
fa781f8c2c Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 2014-11-12 23:10:35 +00: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
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
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
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
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
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