John Spurlock
2c52c443dc
am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
...
* commit '0d334365c6123388a0df81438b82122be29d19ab':
Doze: Avoid pulsing in pockets.
2014-10-07 17:33:10 +00:00
Jean-Michel Trivi
986468a8ab
am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
...
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
Full volume on remote submix for apps that need it
2014-10-07 17:33:05 +00:00
PauloftheWest
f7b7b7585a
am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
...
* commit '53c84002911362c913bc72cd28d186718a33149d':
Fixed a Bluetooth Quick Settings update bug.
2014-10-07 17:31:39 +00:00
Yorke Lee
84e9479a09
am 7f22eb98: Merge "Fix build break" into lmp-dev
...
* commit '7f22eb981812309a1e751a891428dffe6b1da175':
Fix build break
2014-10-07 17:31:19 +00:00
John Spurlock
0d334365c6
Merge "Doze: Avoid pulsing in pockets." into lmp-dev
2014-10-07 16:17:46 +00:00
Jean-Michel Trivi
dce7a42759
Merge "Full volume on remote submix for apps that need it" into lmp-dev
2014-10-07 16:12:08 +00:00
Jean-Michel Trivi
ba5270b887
Full volume on remote submix for apps that need it
...
If an AudioRecord is created with the "fixedVolume" tag
when recording from REMOTE_SUBMIX, treat the
device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
device during the recording. Also register a death
handler during the recording.
Otherwise this is a no-op.
Bug 17635294
Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
2014-10-07 09:09:41 -07:00
John Spurlock
92b8d41096
Doze: Avoid pulsing in pockets.
...
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.
Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
2014-10-07 12:01:56 -04:00
PauloftheWest
53c8400291
Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
2014-10-07 13:01:28 +00:00
Amit Mahajan
d9a3f89a07
Merge commit '69555fc2' into fix-merge-conflict3
...
Conflicts:
core/res/res/values/symbols.xml
Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
2014-10-06 21:57:42 -07:00
Yorke Lee
770ed6ec92
Fix build break
...
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
2014-10-07 03:13:12 +00:00
Yorke Lee
7f22eb9818
Merge "Fix build break" into lmp-dev
2014-10-07 02:12:02 +00:00
Yorke Lee
9858af0ec6
Fix build break
...
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
2014-10-06 18:58:52 -07:00
Amit Mahajan
69555fc2c8
Merge "Sms7BitEncodingTranslator" into lmp-dev
2014-10-07 01:20:27 +00:00
Xia Ying
43eb8a97e7
Sms7BitEncodingTranslator
...
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
2014-10-07 01:02:04 +00:00
Yorke Lee
7e552595bd
am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
...
* commit '4c334f3def076d2940b53641c932050b1e4ce286':
Add ability to add sim-initiated MO call to UI (2/4)
2014-10-07 00:58:47 +00:00
Yorke Lee
4c334f3def
Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
2014-10-07 00:54:52 +00:00
Jeff Sharkey
1d5ef81e29
am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
...
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
2014-10-06 23:59:43 +00:00
Geoff Mendal
6a6369b61a
am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'fc8d65197a6404a93f1230ac5ebc635438a5c094':
Import translations. DO NOT MERGE
2014-10-06 23:52:31 +00:00
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
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
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