OSDN Git Service
Alan Viverette [Thu, 13 Nov 2014 22:45:10 +0000 (22:45 +0000)]
Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
Alan Viverette [Thu, 13 Nov 2014 22:44:11 +0000 (22:44 +0000)]
Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev
ztenghui [Thu, 13 Nov 2014 22:41:53 +0000 (22:41 +0000)]
Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev
Nick Kralevich [Thu, 13 Nov 2014 22:37:01 +0000 (22:37 +0000)]
Merge "fix crash on invalid base64 key" into lmp-mr1-dev
kmccormick [Thu, 13 Nov 2014 22:34:03 +0000 (22:34 +0000)]
am
90bdbe8c: am
30aee7fc: am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
90bdbe8c999df88330b28daa492eeb4425863dab':
Doc update: new reg error code + snippet
kmccormick [Thu, 13 Nov 2014 22:29:45 +0000 (22:29 +0000)]
am
30aee7fc: am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
30aee7fccbbcbdd09ca9393636316813e222ba62':
Doc update: new reg error code + snippet
kmccormick [Thu, 13 Nov 2014 22:24:44 +0000 (22:24 +0000)]
am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
feb1347b2b411be03c640e8d61bfc3b428932e31':
Doc update: new reg error code + snippet
kmccormick [Thu, 13 Nov 2014 22:21:01 +0000 (22:21 +0000)]
Merge "Doc update: new reg error code + snippet" into lmp-docs
Jeff Sharkey [Thu, 13 Nov 2014 22:16:14 +0000 (22:16 +0000)]
Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev
Abhijith Shastry [Thu, 13 Nov 2014 22:15:44 +0000 (22:15 +0000)]
Merge "new sms/mms carrier app API" into lmp-mr1-dev
Alan Viverette [Thu, 13 Nov 2014 22:04:32 +0000 (14:04 -0800)]
Make indeterminate progress alpha consistent with determinate
Both should match the default disabledAlpha for controls.
BUG:
15900514
Change-Id: Ie7c801bc208a14f14926d38b462f49d1f91b28d0
Jeff Sharkey [Wed, 12 Nov 2014 18:39:56 +0000 (10:39 -0800)]
Move ringtone redirection to MediaPlayer.
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.
With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.
To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.
Bug:
18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
Alan Viverette [Thu, 13 Nov 2014 20:59:37 +0000 (12:59 -0800)]
Don't dismiss AutoCompleteTextView on focus change while temp detached
This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.
BUG:
18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
Geoff Mendal [Thu, 13 Nov 2014 20:58:23 +0000 (20:58 +0000)]
am
4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
4cc7bbc9fd937c6f25962fd6971e77773114aff2':
Import translations. DO NOT MERGE
Jeff Brown [Thu, 13 Nov 2014 20:58:19 +0000 (20:58 +0000)]
am
24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
* commit '
24c1d664c4f95a8c997bfc4683844e05b788c3db':
Remove an unnecessary condition from previous change.
Jeff Brown [Thu, 13 Nov 2014 20:58:15 +0000 (20:58 +0000)]
am
1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
* commit '
1cbff0e310b0fba6b25ca1c1e14eaefeabdee0d9':
Improve screen brightness boost behavior.
Renato Mangini [Thu, 13 Nov 2014 20:58:03 +0000 (20:58 +0000)]
am
ee291ca2: am
6f41522d: am
c9fc837f: Add new samples to what\'s new page.
* commit '
ee291ca2ce4092aaae556ebda46daf7337506f74':
Add new samples to what's new page.
ztenghui [Thu, 13 Nov 2014 00:19:03 +0000 (16:19 -0800)]
Fix the starting pen's position when a path close.
We have to cache the starting point for the latest "move", then apply it after
we close the path.
b/
18214929
Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
John Spurlock [Thu, 13 Nov 2014 20:20:23 +0000 (20:20 +0000)]
Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
Jeff Sharkey [Thu, 13 Nov 2014 20:17:30 +0000 (20:17 +0000)]
Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev
Jeff Sharkey [Thu, 13 Nov 2014 20:13:53 +0000 (12:13 -0800)]
Make package verifier broadcasts foreground.
We're using ordered broadcasts (sigh!) for package verification, and
we could be stuck behind dozens of other background broadcasts, so
hoist into foreground queue.
Bug:
18356768
Change-Id: Ib4abf771db0147f8fbd7227f32297602816c84ae
Simranjit Singh Kohli [Thu, 13 Nov 2014 19:18:28 +0000 (19:18 +0000)]
Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
Wale Ogunwale [Thu, 13 Nov 2014 19:00:05 +0000 (19:00 +0000)]
Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
Jean-Michel Trivi [Thu, 13 Nov 2014 18:47:32 +0000 (18:47 +0000)]
Merge "Support for delayed audio focus" into lmp-mr1-dev
Adam Powell [Thu, 13 Nov 2014 18:12:52 +0000 (18:12 +0000)]
Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
RoboErik [Thu, 13 Nov 2014 17:55:05 +0000 (17:55 +0000)]
Merge "Use the suggested stream if it's currently active" into lmp-mr1-dev
Mike Lockwood [Thu, 13 Nov 2014 17:52:00 +0000 (17:52 +0000)]
Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev
Mike Lockwood [Thu, 13 Nov 2014 17:40:42 +0000 (09:40 -0800)]
MTP: Update JNI for new packet getters
Bug:
18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
Jorim Jaggi [Thu, 13 Nov 2014 17:02:16 +0000 (17:02 +0000)]
Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev
Jorim Jaggi [Tue, 11 Nov 2014 21:51:10 +0000 (22:51 +0100)]
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
Jorim Jaggi [Thu, 13 Nov 2014 16:46:54 +0000 (16:46 +0000)]
Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev
Craig Mautner [Thu, 13 Nov 2014 00:55:53 +0000 (00:55 +0000)]
Revert "Debug for bug
18017409"
The bug has been fixed. No longer needed.
This reverts commit
5a3c231dc832c205d2bb2f7f0881925b92c9e5e2.
Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
Jorim Jaggi [Tue, 11 Nov 2014 22:16:28 +0000 (23:16 +0100)]
Fix wrong states when waking up from doze via touch
Bug:
18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
John Spurlock [Wed, 12 Nov 2014 14:16:49 +0000 (09:16 -0500)]
Zen: Update condition text for current condition.
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.
Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).
Also, clear the fired-alarm cache on time or time-zone resets.
Bug:
16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
Alexandra Gherghina [Thu, 13 Nov 2014 15:31:09 +0000 (15:31 +0000)]
Merge "Update current.txt with the new extra" into lmp-mr1-dev
Ignacio Solla [Thu, 13 Nov 2014 15:03:43 +0000 (15:03 +0000)]
Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
Alexandra Gherghina [Thu, 13 Nov 2014 14:43:02 +0000 (14:43 +0000)]
Update current.txt with the new extra
Bug:
17716971
Change-Id: Ice82394c681665aff96724faa2e8056656d2b1ab
Alexandra Gherghina [Thu, 13 Nov 2014 13:59:32 +0000 (13:59 +0000)]
Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
Alexandra Gherghina [Thu, 13 Nov 2014 12:46:15 +0000 (12:46 +0000)]
Add extra for account migration in the DevicePolicyMamager
This is in preparation for the implementation CL
Bug:
17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
Geoff Mendal [Thu, 13 Nov 2014 09:43:50 +0000 (09:43 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 13 Nov 2014 09:41:27 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Narayan Kamath [Thu, 13 Nov 2014 09:33:07 +0000 (09:33 +0000)]
Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
Geoff Mendal [Thu, 13 Nov 2014 07:20:52 +0000 (23:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
Jeff Brown [Thu, 13 Nov 2014 07:11:35 +0000 (07:11 +0000)]
Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
Jeff Brown [Thu, 13 Nov 2014 07:04:53 +0000 (07:04 +0000)]
Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
Jeff Brown [Thu, 13 Nov 2014 07:01:12 +0000 (23:01 -0800)]
Remove an unnecessary condition from previous change.
Change-Id: Ib966fbb373294ad60caf7f1d9cbb7fafd05ded6b
Jeff Brown [Thu, 13 Nov 2014 06:58:01 +0000 (06:58 +0000)]
Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
Geoff Mendal [Thu, 13 Nov 2014 05:07:02 +0000 (21:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b1c0b5c7530c8733d15551bb11211fa3e5585df
Auto-generated-cl: translation import
Renato Mangini [Thu, 13 Nov 2014 04:05:00 +0000 (04:05 +0000)]
am
6f41522d: am
c9fc837f: Add new samples to what\'s new page.
* commit '
6f41522d6847afa5bb7ce1cff2a64ec7e9f18ecf':
Add new samples to what's new page.
Renato Mangini [Thu, 13 Nov 2014 03:54:11 +0000 (03:54 +0000)]
am
c9fc837f: Add new samples to what\'s new page.
* commit '
c9fc837fb3d866484a8ed3e61f2ba551f76af66b':
Add new samples to what's new page.
Renato Mangini [Thu, 13 Nov 2014 02:55:06 +0000 (18:55 -0800)]
Add new samples to what's new page.
Also reverted the order on the page to show most recent samples first.
Bug:
18323953
Change-Id: I79b01fa71547f4a7d843f52bdd1853dd8fbe54a8
Jeff Brown [Thu, 13 Nov 2014 02:45:31 +0000 (18:45 -0800)]
Improve screen brightness boost behavior.
Wake-up when entering brightness boost mode, don't boost in ambient
mode since some display device drivers do strange things in that mode and
boost doesn't work. Waking up feels more natural as well.
Don't flutter the power HAL's interactive mode bit simply due to changes
in display ready state since that may result in visible artifacts
such as display flashes.
Don't stop the auto-brightness sensor while temporarily boosted.
Don't prevent the display from entering the ready state while in brightness
boost since that would unnecessarily delay the transition from DOZING to AWAKE
until boost is finished.
Restart the user activity timeout when brightness boost ends and prevent
the display from dimming while boosted.
The pixel fairies basked in the sunlight.
Bug:
18262044
Bug:
18261782
Change-Id: I8c42a1e6091b0fe1253e90265ac248087ebc24e1
Andrew Lee [Thu, 13 Nov 2014 02:15:13 +0000 (02:15 +0000)]
Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev
Yorke Lee [Thu, 13 Nov 2014 00:50:00 +0000 (00:50 +0000)]
Merge "Fix PhoneAccount parceling (1/2)" into lmp-mr1-dev
xinhe [Thu, 13 Nov 2014 00:37:58 +0000 (00:37 +0000)]
Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev
Adam Lesinski [Thu, 13 Nov 2014 00:32:59 +0000 (00:32 +0000)]
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev
Chris Craik [Thu, 13 Nov 2014 00:05:56 +0000 (00:05 +0000)]
Merge "Add details and performance warnings to save flag docs" into lmp-mr1-dev
Dianne Hackborn [Thu, 13 Nov 2014 00:03:51 +0000 (00:03 +0000)]
Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev
xinhe [Fri, 7 Nov 2014 23:14:24 +0000 (15:14 -0800)]
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
Andrew Lee [Wed, 12 Nov 2014 23:47:02 +0000 (15:47 -0800)]
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
Renato Mangini [Wed, 12 Nov 2014 23:47:14 +0000 (23:47 +0000)]
am
5d7f91c7: am
40ac90e9: am
1b657d92: Fix the order of sample categories left nav.
* commit '
5d7f91c77605a5c444eaaae2b812280c57ca244c':
Fix the order of sample categories left nav.
Geoff Mendal [Wed, 12 Nov 2014 23:41:57 +0000 (23:41 +0000)]
am
2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
2d28d697f6235c497237a11abb973b9109999e38':
Import translations. DO NOT MERGE
Renato Mangini [Wed, 12 Nov 2014 23:39:11 +0000 (23:39 +0000)]
am
40ac90e9: am
1b657d92: Fix the order of sample categories left nav.
* commit '
40ac90e99da90956f26cf7f7bb4c205e28bbbc66':
Fix the order of sample categories left nav.
Geoff Mendal [Wed, 12 Nov 2014 23:37:55 +0000 (23:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Renato Mangini [Wed, 12 Nov 2014 23:33:47 +0000 (23:33 +0000)]
am
1b657d92: Fix the order of sample categories left nav.
* commit '
1b657d924301d1caa132797f2ab397ba48429e6b':
Fix the order of sample categories left nav.
Cheuksan Wang [Tue, 21 Oct 2014 22:58:23 +0000 (15:58 -0700)]
new sms/mms carrier app API
BUG:
18005911
Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
Etan Cohen [Tue, 11 Nov 2014 23:14:35 +0000 (15:14 -0800)]
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
George Mount [Wed, 12 Nov 2014 23:10:33 +0000 (23:10 +0000)]
Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev
Geoff Mendal [Wed, 12 Nov 2014 23:01:37 +0000 (15:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3395ff410dc14afb14c0626368fd66da77996963
Auto-generated-cl: translation import
Ignacio Solla [Mon, 10 Nov 2014 10:35:54 +0000 (10:35 +0000)]
[WebView] Allow the WebView to be compiled against the system SDK.
BUG:
18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
Jeff Sharkey [Wed, 12 Nov 2014 22:24:24 +0000 (22:24 +0000)]
am
2e700004: am
d68b87cd: Recover apps with malformed certificates.
* commit '
2e7000040e3d836bb591e29515974817afc49488':
Recover apps with malformed certificates.
Jeff Sharkey [Wed, 12 Nov 2014 22:20:46 +0000 (22:20 +0000)]
am
d68b87cd: Recover apps with malformed certificates.
* commit '
d68b87cdd402d46013170d9316a31c82be4e4816':
Recover apps with malformed certificates.
Alan Viverette [Wed, 12 Nov 2014 22:19:04 +0000 (22:19 +0000)]
Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev
George Mount [Wed, 12 Nov 2014 22:11:36 +0000 (22:11 +0000)]
Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev
Renato Mangini [Wed, 12 Nov 2014 22:07:48 +0000 (14:07 -0800)]
Fix the order of sample categories left nav.
Bug:
18323953
Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
Ignacio Solla [Wed, 12 Nov 2014 21:58:41 +0000 (21:58 +0000)]
Merge "Fix docs build breakage" into lmp-mr1-dev
Dianne Hackborn [Tue, 11 Nov 2014 20:22:36 +0000 (12:22 -0800)]
Add reporting of Parcel memory/count.
Also fix issue #
18340771: Dumpsys Procstats missing a newline
Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
Ignacio Solla [Wed, 12 Nov 2014 21:55:47 +0000 (21:55 +0000)]
Fix docs build breakage
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
Rob Tsuk [Wed, 12 Nov 2014 21:41:58 +0000 (21:41 +0000)]
Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
Nick Kralevich [Wed, 12 Nov 2014 20:47:50 +0000 (12:47 -0800)]
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
Ignacio Solla [Wed, 12 Nov 2014 21:17:05 +0000 (21:17 +0000)]
Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
ztenghui [Wed, 12 Nov 2014 21:16:26 +0000 (21:16 +0000)]
Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev
Jeff Sharkey [Wed, 12 Nov 2014 20:18:11 +0000 (12:18 -0800)]
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
ztenghui [Wed, 12 Nov 2014 18:56:15 +0000 (10:56 -0800)]
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
ztenghui [Wed, 12 Nov 2014 20:47:43 +0000 (20:47 +0000)]
Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev
Alan Viverette [Wed, 12 Nov 2014 20:33:29 +0000 (20:33 +0000)]
Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev
Rob Tsuk [Tue, 11 Nov 2014 23:44:13 +0000 (15:44 -0800)]
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
Eric Laurent [Wed, 12 Nov 2014 20:19:51 +0000 (20:19 +0000)]
Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev
Sandeep Siddhartha [Wed, 12 Nov 2014 20:12:38 +0000 (20:12 +0000)]
Merge "Don't unload the sound model on stopRecognition" into lmp-mr1-dev
Eric Laurent [Wed, 12 Nov 2014 19:07:48 +0000 (11:07 -0800)]
audiosystem JNI: check env pointer before use.
Bug:
18332935.
Change-Id: I1ec820f0282833e13444ec05d50da3ce70d19d8d
Ruben Brunk [Wed, 12 Nov 2014 18:46:45 +0000 (18:46 +0000)]
Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev
Adam Powell [Tue, 11 Nov 2014 01:47:37 +0000 (17:47 -0800)]
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
Alan Viverette [Wed, 12 Nov 2014 18:24:40 +0000 (10:24 -0800)]
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
Wale Ogunwale [Wed, 12 Nov 2014 18:22:11 +0000 (18:22 +0000)]
Merge "Fix build breakage from missing close brace." into lmp-mr1-dev
Sandeep Siddhartha [Thu, 16 Oct 2014 23:17:11 +0000 (16:17 -0700)]
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
smain@google.com [Wed, 12 Nov 2014 17:56:26 +0000 (17:56 +0000)]
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()
Renato Mangini [Wed, 12 Nov 2014 17:56:20 +0000 (17:56 +0000)]
am
ca011519: am
a53b8bad: am
4b7b68d8: Add "notification" category for samples.
* commit '
ca011519b61e2ae57dfe760547d7d073f7ec42f3':
Add "notification" category for samples.
smain@google.com [Wed, 12 Nov 2014 17:52:06 +0000 (17:52 +0000)]
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()
Renato Mangini [Wed, 12 Nov 2014 17:52:02 +0000 (17:52 +0000)]
am
a53b8bad: am
4b7b68d8: Add "notification" category for samples.
* commit '
a53b8badb994c3825140f68eba94888b3274c0b5':
Add "notification" category for samples.
Wale Ogunwale [Wed, 12 Nov 2014 17:46:10 +0000 (09:46 -0800)]
Fix build breakage from missing close brace.
Change-Id: Ib0e58844b8b208d255ff8d9409d0e7c53f27378f