Raluca Sauciuc
f35c305f45
am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
...
* commit '6a3faf5a8b182d20dea47fb76cf33456321ddf7a':
Fix test framework to allow Mockito tests to run successfully on ART.
2014-10-06 23:52:19 +00:00
Paul Jensen
69c489ed6f
am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
...
* commit '7627d2cd5cd93ebf8e683392edbef961dbc20d31':
Use network-specific HTTP proxy settings in captive portal login app.
2014-10-06 23:52:12 +00:00
Jeff Sharkey
99586dc010
Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
2014-10-06 23:51:56 +00:00
Geoff Mendal
1d593ad474
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-06 23:39:12 +00:00
Jeff Sharkey
02bd78490d
Reduce PackageInstaller I/O pressure.
...
When performing a restore during initial device setup, we could be
installing hundreds of packages. Currently, we're writing all
metadata (including heavy icons) for every session mutation! Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.
This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.
Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
2014-10-06 16:38:15 -07:00
Geoff Mendal
fc8d65197a
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-06 23:28:23 +00:00
Raluca Sauciuc
6a3faf5a8b
Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
2014-10-06 23:19:12 +00:00
Andres Morales
052690540e
Remove dead NFC unlock code from fw/base
...
Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
2014-10-06 16:04:19 -07:00
Paul Jensen
7627d2cd5c
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
2014-10-06 23:01:27 +00:00
Chris Craik
1a6c41fbad
am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
...
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
2014-10-06 22:35:19 +00:00
Mike Lockwood
3df6b76c5f
am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
...
* commit '56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
Add support for playing audio during bootanimation
2014-10-06 22:35:13 +00:00
Mathieu Chartier
405a934ec4
am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
Fix incorrect JNI_ABORT
2014-10-06 22:35:09 +00:00
Wei Liu
a940f8656d
Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
2014-10-06 22:10:33 +00:00
Yorke Lee
c3cf982d18
Add ability to add sim-initiated MO call to UI (2/4)
...
Add supporting (hidden) APIs to TelecomManager to add the ability to
add a previous unknown call to Telecom
Bug: 17787391
Change-Id: Ibdfaee81a55e11451c146751cf970980dccad435
2014-10-06 15:09:00 -07:00
Chris Craik
6c9f0a0160
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
2014-10-06 22:06:23 +00:00
Geoff Mendal
295c3cabb2
Import translations. DO NOT MERGE
...
Change-Id: I1b7537a5a607ad61da0b24e1826dc0876bb3f50d
Auto-generated-cl: translation import
2014-10-06 15:04:49 -07:00
Geoff Mendal
c6da9afdcc
Import translations. DO NOT MERGE
...
Change-Id: Ib4bd44e7036f41df58740596f560091ef40c1f23
Auto-generated-cl: translation import
2014-10-06 14:55:42 -07:00
Chris Craik
f791703f9b
Avoid changeBounds animations on Views that are not yet laidout
...
bug:17683930
This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.
Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
2014-10-06 14:55:17 -07:00
Wei Liu
e255e4e536
Hide bug report notification in Android Framework from watches.
...
Bug: 17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
2014-10-06 14:50:10 -07:00
Mike Lockwood
56b7d562af
Merge "Add support for playing audio during bootanimation" into lmp-dev
2014-10-06 20:50:19 +00:00
Mathieu Chartier
1638a0049b
Merge "Fix incorrect JNI_ABORT" into lmp-dev
2014-10-06 20:27:08 +00:00
Mathieu Chartier
6a5e6df968
Fix incorrect JNI_ABORT
...
If there is a copy, JNI_ABORT does NOT copy back into the
corresponding java array. Changing this to 0 is what you want since
this will copy the data back if needed and free the temporary
storage.
Bug: 16858794
Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
2014-10-06 12:44:09 -07:00
Jorim Jaggi
8cc8dfed32
Update 'No notifications' text on configuration change
...
Bug: 17821946
Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
2014-10-06 12:27:55 -07:00
Amit Mahajan
15c581fa4c
am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
...
* commit '17d7c79650664c7a112ab175cb2329d2062f4d1e':
ATT: Call does not establish to '*1'
2014-10-06 19:23:20 +00:00
Geoff Mendal
ce2b1e8cfa
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-06 19:21:53 +00:00
Geoff Mendal
aa5c62f359
am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '712363889899bfff564a39ef4d88ff048a9e5ec7':
Import translations. DO NOT MERGE
2014-10-06 19:17:23 +00:00
Christopher Tate
3900666823
am bbebe423: Merge "adb backup/restore fixes" into lmp-dev
...
* commit 'bbebe42309a7012e0474b916f5209027889e8d57':
adb backup/restore fixes
2014-10-06 19:17:17 +00:00
Dianne Hackborn
90d557b7a6
am 7f7d240b: Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
...
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change
2014-10-06 19:17:10 +00:00
Amit Mahajan
17d7c79650
Merge "ATT: Call does not establish to '*1'" into lmp-dev
2014-10-06 19:17:06 +00:00
Geoff Mendal
3647aba82d
am ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
Import translations. DO NOT MERGE
2014-10-06 19:17:04 +00:00
John Spurlock
81b96aadbd
am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
...
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
2014-10-06 19:16:53 +00:00
Andrew Solovay
ed2237aec8
am 2dd86d50: Merge "Removed preview license." into lmp-dev
...
* commit '2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
2014-10-06 19:16:47 +00:00
Geoff Mendal
7123638898
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-06 19:10:25 +00:00
Christopher Tate
bbebe42309
Merge "adb backup/restore fixes" into lmp-dev
2014-10-06 19:09:13 +00:00
Geoff Mendal
2c54b25580
Import translations. DO NOT MERGE
...
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
2014-10-06 12:08:45 -07:00
Bing Gao
1c9bc00870
ATT: Call does not establish to '*1'
...
Bug: 17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
2014-10-06 19:00:44 +00:00
Benson Huang
ce4483cb83
[FM] Add FM_TUNER audio source to support L version FM radio app
...
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
2.AudioRecord.java: For FM output to the other device,
(except the headset case), record the FM tuner signal to a track
and playback the recorded signal by a track.
3.AudioAttributes.java: Thus we use AudioRecord, need to modify
setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.
Review: https://partner-android-review.git.corp.google.com/#/c/182071
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
2014-10-06 18:50:12 +00:00
Dianne Hackborn
7f7d240b13
Merge "Fix issue #17752399 : Multiple apps broken by GET_TASKS permission change" into lmp-dev
2014-10-06 18:48:34 +00:00
Geoff Mendal
74a72f723a
Import translations. DO NOT MERGE
...
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
2014-10-06 11:34:20 -07:00
Geoff Mendal
937d6a6476
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-06 18:33:46 +00:00
Geoff Mendal
ec76311837
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-06 18:32:19 +00:00
Geoff Mendal
c1a064dd94
Import translations. DO NOT MERGE
...
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
2014-10-06 10:56:58 -07:00
John Spurlock
78cc93ec80
Merge "Fix NPE in StrictMode handling." into lmp-dev
2014-10-06 17:54:41 +00:00
Geoff Mendal
86dec04749
Import translations. DO NOT MERGE
...
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
2014-10-06 10:54:01 -07:00
Andrew Solovay
2dd86d50ae
Merge "Removed preview license." into lmp-dev
2014-10-06 17:51:53 +00:00
John Spurlock
9bb3dacbf9
Fix NPE in StrictMode handling.
...
Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
2014-10-06 12:36:45 -04:00
PauloftheWest
6cdeaa0d03
Fixed a Bluetooth Quick Settings update bug.
...
+ Now when a Bluetooth device disconnects, and the user is looking at quick
settings, the Bluetooth icon and text will update with the new state of
diconnected.
Bug: 17677593
Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
2014-10-06 09:31:48 -07:00
Yuncheol Heo
4cb8455fba
am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
...
* commit '71c4578def00a5a4b9e159fd1ab88e616bc7e159':
CEC: Reset active source status on routing control
2014-10-06 16:22:17 +00:00
Yuncheol Heo
71c4578def
Merge "CEC: Reset active source status on routing control" into lmp-dev
2014-10-06 16:16:47 +00:00
Jinsuk Kim
995fcfc591
CEC: Reset active source status on routing control
...
Set active source status to false when broadcast routing control
commands indicate other device is about to be the new active source.
Bug: 17840270
Change-Id: I176e21ec8789624e29421b912ba641a21f0f5f21
2014-10-06 14:53:07 +09:00