OSDN Git Service
Christopher Tate [Tue, 7 Oct 2014 21:53:54 +0000 (21:53 +0000)]
am
ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev
* commit '
ae456fd894c5a41f859196016a7c49113b235eda':
Accept any restored wallpaper
Christopher Tate [Tue, 7 Oct 2014 21:50:07 +0000 (21:50 +0000)]
Merge "Accept any restored wallpaper" into lmp-dev
Tyler Gunn [Tue, 7 Oct 2014 20:51:51 +0000 (20:51 +0000)]
am
3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '
3bde32e68d201f2dda4a4847d2818c74b120cdbb':
Fixing where call goes from disconnecting to active to disconnecting state.
Tyler Gunn [Tue, 7 Oct 2014 20:46:38 +0000 (20:46 +0000)]
Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
Adam Lesinski [Tue, 7 Oct 2014 19:58:59 +0000 (19:58 +0000)]
am
1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev
* commit '
1a98dd5cc7ea89793208b51983198bfbeade5ccc':
Load shared library dependencies for AppWidgets
Jason Monk [Tue, 7 Oct 2014 19:58:48 +0000 (19:58 +0000)]
am
733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev
* commit '
733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
Hide hotspot tile if 'provisioning' is needed
Andres Morales [Tue, 7 Oct 2014 19:58:41 +0000 (19:58 +0000)]
am
258d2221: Fix build, previous commit failed to remove an import
* commit '
258d222152a410341ddad045ce92e57dd7ab454e':
Fix build, previous commit failed to remove an import
Andres Morales [Tue, 7 Oct 2014 19:58:36 +0000 (19:58 +0000)]
am
d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
* commit '
d6a2ab930972d5578957ca919abd38fca074deec':
Remove dead NFC unlock code from fw/base
Jorim Jaggi [Tue, 7 Oct 2014 19:58:28 +0000 (19:58 +0000)]
am
988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev
* commit '
988a8a9820bb3ae331be4932eb9e672a4614efd5':
Update 'No notifications' text on configuration change
Adam Lesinski [Tue, 7 Oct 2014 19:51:16 +0000 (19:51 +0000)]
Merge "Load shared library dependencies for AppWidgets" into lmp-dev
Adam Lesinski [Tue, 7 Oct 2014 19:14:45 +0000 (12:14 -0700)]
Load shared library dependencies for AppWidgets
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.
Bug:
17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
Jason Monk [Tue, 7 Oct 2014 18:53:20 +0000 (18:53 +0000)]
Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev
Jason Monk [Tue, 7 Oct 2014 18:22:59 +0000 (14:22 -0400)]
Hide hotspot tile if 'provisioning' is needed
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.
Bug:
17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
Andres Morales [Tue, 7 Oct 2014 18:14:21 +0000 (11:14 -0700)]
Fix build, previous commit failed to remove an import
Bug:
17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
Andres Morales [Tue, 7 Oct 2014 18:11:20 +0000 (18:11 +0000)]
Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
Jorim Jaggi [Tue, 7 Oct 2014 17:48:00 +0000 (17:48 +0000)]
Merge "Update 'No notifications' text on configuration change" into lmp-dev
Amith Yamasani [Tue, 7 Oct 2014 17:33:25 +0000 (17:33 +0000)]
am
41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
* commit '
41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
Set the default user restrictions to disallow calling and sms
John Spurlock [Tue, 7 Oct 2014 17:33:10 +0000 (17:33 +0000)]
am
0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev
* commit '
0d334365c6123388a0df81438b82122be29d19ab':
Doze: Avoid pulsing in pockets.
Jean-Michel Trivi [Tue, 7 Oct 2014 17:33:05 +0000 (17:33 +0000)]
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
PauloftheWest [Tue, 7 Oct 2014 17:31:39 +0000 (17:31 +0000)]
am
53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
* commit '
53c84002911362c913bc72cd28d186718a33149d':
Fixed a Bluetooth Quick Settings update bug.
Yorke Lee [Tue, 7 Oct 2014 17:31:19 +0000 (17:31 +0000)]
am
7f22eb98: Merge "Fix build break" into lmp-dev
* commit '
7f22eb981812309a1e751a891428dffe6b1da175':
Fix build break
Tyler Gunn [Tue, 7 Oct 2014 17:14:55 +0000 (10:14 -0700)]
Fixing where call goes from disconnecting to active to disconnecting state.
- Adding disconnecting state to telecom used to communicate that a call is
being disconnected to InCall UI (rather than it existing only as a state
in the InCall UI).
Bug:
17821930
Change-Id: I6c2d9521915ba154c0468eea62c12c30060edd2e
Amith Yamasani [Tue, 7 Oct 2014 17:11:33 +0000 (17:11 +0000)]
Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
John Spurlock [Tue, 7 Oct 2014 16:17:45 +0000 (16:17 +0000)]
Merge "Doze: Avoid pulsing in pockets." into lmp-dev
Jean-Michel Trivi [Tue, 7 Oct 2014 16:12:07 +0000 (16:12 +0000)]
Merge "Full volume on remote submix for apps that need it" into lmp-dev
Jean-Michel Trivi [Thu, 2 Oct 2014 00:49:29 +0000 (17:49 -0700)]
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
John Spurlock [Fri, 3 Oct 2014 21:12:40 +0000 (17:12 -0400)]
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
PauloftheWest [Tue, 7 Oct 2014 13:01:26 +0000 (13:01 +0000)]
Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev
Amit Mahajan [Tue, 7 Oct 2014 04:57:42 +0000 (21:57 -0700)]
Merge commit '
69555fc2' into fix-merge-conflict3
Conflicts:
core/res/res/values/symbols.xml
Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
Yorke Lee [Tue, 7 Oct 2014 01:58:52 +0000 (18:58 -0700)]
Fix build break
Bug:
16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit
9858af0ec68ad28db60047587c8eb6232b4a6591)
Yorke Lee [Tue, 7 Oct 2014 02:12:01 +0000 (02:12 +0000)]
Merge "Fix build break" into lmp-dev
Yorke Lee [Tue, 7 Oct 2014 01:58:52 +0000 (18:58 -0700)]
Fix build break
Bug:
16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
Amith Yamasani [Mon, 6 Oct 2014 21:20:28 +0000 (14:20 -0700)]
Set the default user restrictions to disallow calling and sms
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.
Bug:
17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
Amit Mahajan [Tue, 7 Oct 2014 01:20:26 +0000 (01:20 +0000)]
Merge "Sms7BitEncodingTranslator" into lmp-dev
Xia Ying [Tue, 5 Aug 2014 21:37:18 +0000 (16:37 -0500)]
Sms7BitEncodingTranslator
Bug:
16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
Christopher Tate [Tue, 7 Oct 2014 01:00:51 +0000 (18:00 -0700)]
Accept any restored wallpaper
...and let the wallpaper service & hosts figure out what to do
with it.
Bug
17677006
Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
Yorke Lee [Tue, 7 Oct 2014 00:58:47 +0000 (00:58 +0000)]
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)
Yorke Lee [Tue, 7 Oct 2014 00:54:51 +0000 (00:54 +0000)]
Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
Jeff Sharkey [Mon, 6 Oct 2014 23:59:43 +0000 (23:59 +0000)]
am
99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
* commit '
99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
Geoff Mendal [Mon, 6 Oct 2014 23:52:31 +0000 (23:52 +0000)]
am
fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
fc8d65197a6404a93f1230ac5ebc635438a5c094':
Import translations. DO NOT MERGE
Raluca Sauciuc [Mon, 6 Oct 2014 23:52:19 +0000 (23:52 +0000)]
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.
Paul Jensen [Mon, 6 Oct 2014 23:52:12 +0000 (23:52 +0000)]
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.
Jeff Sharkey [Mon, 6 Oct 2014 23:51:52 +0000 (23:51 +0000)]
Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 23:39:11 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Jeff Sharkey [Mon, 6 Oct 2014 22:14:27 +0000 (15:14 -0700)]
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
Geoff Mendal [Mon, 6 Oct 2014 23:28:18 +0000 (23:28 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Raluca Sauciuc [Mon, 6 Oct 2014 23:19:11 +0000 (23:19 +0000)]
Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
Andres Morales [Mon, 6 Oct 2014 23:04:19 +0000 (16:04 -0700)]
Remove dead NFC unlock code from fw/base
Bug:
17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
Paul Jensen [Mon, 6 Oct 2014 23:01:26 +0000 (23:01 +0000)]
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
Chris Craik [Mon, 6 Oct 2014 22:35:19 +0000 (22:35 +0000)]
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
Mike Lockwood [Mon, 6 Oct 2014 22:35:13 +0000 (22:35 +0000)]
am
56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '
56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
Add support for playing audio during bootanimation
Mathieu Chartier [Mon, 6 Oct 2014 22:35:09 +0000 (22:35 +0000)]
am
1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
* commit '
1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
Fix incorrect JNI_ABORT
Wei Liu [Mon, 6 Oct 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev
Yorke Lee [Thu, 2 Oct 2014 16:38:39 +0000 (09:38 -0700)]
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
Chris Craik [Mon, 6 Oct 2014 22:06:22 +0000 (22:06 +0000)]
Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 22:04:49 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b7537a5a607ad61da0b24e1826dc0876bb3f50d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 21:55:42 +0000 (14:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4bd44e7036f41df58740596f560091ef40c1f23
Auto-generated-cl: translation import
Chris Craik [Mon, 6 Oct 2014 21:50:59 +0000 (14:50 -0700)]
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
Wei Liu [Mon, 6 Oct 2014 21:50:10 +0000 (14:50 -0700)]
Hide bug report notification in Android Framework from watches.
Bug:
17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
Mike Lockwood [Mon, 6 Oct 2014 20:50:18 +0000 (20:50 +0000)]
Merge "Add support for playing audio during bootanimation" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 20:27:07 +0000 (20:27 +0000)]
Merge "Fix incorrect JNI_ABORT" into lmp-dev
Mathieu Chartier [Mon, 6 Oct 2014 19:42:00 +0000 (12:42 -0700)]
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
Jorim Jaggi [Mon, 6 Oct 2014 19:27:55 +0000 (12:27 -0700)]
Update 'No notifications' text on configuration change
Bug:
17821946
Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
Amit Mahajan [Mon, 6 Oct 2014 19:23:20 +0000 (19:23 +0000)]
am
17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev
* commit '
17d7c79650664c7a112ab175cb2329d2062f4d1e':
ATT: Call does not establish to '*1'
Geoff Mendal [Mon, 6 Oct 2014 19:21:52 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 19:17:23 +0000 (19:17 +0000)]
am
71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
712363889899bfff564a39ef4d88ff048a9e5ec7':
Import translations. DO NOT MERGE
Christopher Tate [Mon, 6 Oct 2014 19:17:17 +0000 (19:17 +0000)]
am
bbebe423: Merge "adb backup/restore fixes" into lmp-dev
* commit '
bbebe42309a7012e0474b916f5209027889e8d57':
adb backup/restore fixes
Dianne Hackborn [Mon, 6 Oct 2014 19:17:10 +0000 (19:17 +0000)]
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
Amit Mahajan [Mon, 6 Oct 2014 19:17:05 +0000 (19:17 +0000)]
Merge "ATT: Call does not establish to '*1'" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:17:04 +0000 (19:17 +0000)]
am
ec763118: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec763118370e1fa79acb96b82a7ad37b6f2cc02e':
Import translations. DO NOT MERGE
John Spurlock [Mon, 6 Oct 2014 19:16:53 +0000 (19:16 +0000)]
am
78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev
* commit '
78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
Andrew Solovay [Mon, 6 Oct 2014 19:16:47 +0000 (19:16 +0000)]
am
2dd86d50: Merge "Removed preview license." into lmp-dev
* commit '
2dd86d50ae19efa071d83e02545b2767c351fdd6':
Removed preview license.
Geoff Mendal [Mon, 6 Oct 2014 19:10:24 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Christopher Tate [Mon, 6 Oct 2014 19:09:11 +0000 (19:09 +0000)]
Merge "adb backup/restore fixes" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 19:08:45 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
Bing Gao [Fri, 3 Oct 2014 19:56:04 +0000 (12:56 -0700)]
ATT: Call does not establish to '*1'
Bug:
17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
Benson Huang [Wed, 17 Sep 2014 09:21:02 +0000 (17:21 +0800)]
[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
Dianne Hackborn [Mon, 6 Oct 2014 18:48:33 +0000 (18:48 +0000)]
Merge "Fix issue #
17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 18:34:20 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccf9bb82d63d8e5033f916ad5c89cff245ef2087
Auto-generated-cl: translation import
Geoff Mendal [Mon, 6 Oct 2014 18:33:45 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 6 Oct 2014 18:32:18 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:56:58 +0000 (10:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
John Spurlock [Mon, 6 Oct 2014 17:54:40 +0000 (17:54 +0000)]
Merge "Fix NPE in StrictMode handling." into lmp-dev
Geoff Mendal [Mon, 6 Oct 2014 17:54:01 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
Andrew Solovay [Mon, 6 Oct 2014 17:51:52 +0000 (17:51 +0000)]
Merge "Removed preview license." into lmp-dev
John Spurlock [Mon, 6 Oct 2014 16:36:45 +0000 (12:36 -0400)]
Fix NPE in StrictMode handling.
Bug:
17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
PauloftheWest [Mon, 6 Oct 2014 16:27:08 +0000 (09:27 -0700)]
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
Yuncheol Heo [Mon, 6 Oct 2014 16:22:17 +0000 (16:22 +0000)]
am
71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '
71c4578def00a5a4b9e159fd1ab88e616bc7e159':
CEC: Reset active source status on routing control
Yuncheol Heo [Mon, 6 Oct 2014 16:16:45 +0000 (16:16 +0000)]
Merge "CEC: Reset active source status on routing control" into lmp-dev
Jinsuk Kim [Mon, 6 Oct 2014 05:28:06 +0000 (14:28 +0900)]
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
Jeff Sharkey [Mon, 6 Oct 2014 04:08:57 +0000 (04:08 +0000)]
am
4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev
* commit '
4c88087776305f54bec0aae59b8e63bc803c1401':
Recover from missing upgrade to system package.
Jeff Sharkey [Mon, 6 Oct 2014 04:01:33 +0000 (04:01 +0000)]
Merge "Recover from missing upgrade to system package." into lmp-dev
Jeff Sharkey [Sun, 5 Oct 2014 21:12:42 +0000 (14:12 -0700)]
Recover from missing upgrade to system package.
When a system app has been upgraded, we mark the built-in version as
disabled, and skip it when parsing built-in apps, since we expect
the userdata version to be scanned a few moments later.
However, in very rare cases we can end up missing the expected
userdata version, and we'd end up dropping the package entirely, even
though we have a built-in version to fall back to. This change
handles that case by rescanning and enabling the built-in version when
the userdata version never materializes.
Also include critical log messages in check-in dumpsys to help track
down how we ended up in this state.
Bug:
17805839
Change-Id: I9971f882f9bb8ab7934c20b04e0b72366c4d04d0
Baligh Uddin [Sun, 5 Oct 2014 17:59:57 +0000 (17:59 +0000)]
am
ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
ec3ce59c16369aa8ce63da7070be3cd5a6d8cc75':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:51:51 +0000 (17:51 +0000)]
am
9e32249d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9e32249d74e0203649287f268ab6018e85e9bc50':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 17:49:44 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 5 Oct 2014 17:49:36 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:57 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 5 Oct 2014 17:44:51 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Jeff Sharkey [Sun, 5 Oct 2014 02:31:05 +0000 (02:31 +0000)]
am
3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev
* commit '
3438bc1bfd363e1ee656b33ebc8d0e6744470aec':
Correctly rollback failed system app installs.