21322 Commits

Author SHA1 Message Date
Christopher Tate
b89e1405cf Support single-package backup rejection by the transport
We now cleanly handle the case of the transport blacklisting specific
packages from key/value backup.  Previously we would halt the entire
backup pass and reschedule if the transport returned any error from
performBackup(pkg).  Now, we recognize the TRANSPORT_PACKAGE_REJECTED
result from that invocation, and properly drop that package's work
but proceed with running the rest of the backup queue as expected.

Bug 18694053

Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
2015-01-06 15:48:33 -08:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
2015-01-06 11:52:14 +09:00
Christopher Tate
603ad6f7d0 Remove the "backup_data_changed" event log
Nowadays it's just spammy and uninformative, so away it goes.

Bug 18833115

Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
2015-01-05 17:07:57 -08:00
Sungsoo Lim
2bdf89b167 Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 2015-01-06 00:13:14 +00:00
Dianne Hackborn
c478cf5185 Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
No longer modify the base constants when computing oom adj values.

Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
2015-01-05 16:05:05 -08:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
2015-01-05 14:40:24 -08:00
Wale Ogunwale
1d893785bd Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev 2015-01-05 22:03:21 +00:00
Sungsoo Lim
d5489220e2 DO NOT MERGE Fix typo
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
(cherry picked from commit 9dcba434e27ec4de87eac1448ded4126b3f97773)
2015-01-05 05:50:21 +00:00
Sungsoo Lim
b65ad80de1 Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 2015-01-05 04:25:12 +00:00
Sungsoo Lim
48248c80e5 DO NOT MERGE Make mute/unmute work
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit d1851e6e4e49b6a45d9e013de2e1384711975328)
2015-01-05 11:50:49 +09:00
Dongwon Kang
017bb8523d DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)
2015-01-05 02:12:44 +00:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode>
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
2015-01-02 16:08:56 +09:00
Robin Lee
b4b14e391d Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev 2014-12-23 12:30:28 +00:00
Jinsuk Kim
92ae5abf4d Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 2014-12-22 22:48:45 +00:00
Jinsuk Kim
98d760e1c3 CEC: Let the caller check CEC device type
Device event listener mechanism invoke the callback on all kinds
of devices in order to deal with a caller who wants to get notified
for all types. TIF was changed to check the device type to make
sure it handles source type only.

Bug: 18832462
Change-Id: I5123fe79c09f623849b93b64d0c28e6a930dd437
2014-12-23 07:39:11 +09:00
Robert Greenwalt
4dcacef5c5 Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 2014-12-22 22:32:41 +00:00
Robin Lee
853964927c Revert "DevicePolicy: Don't warn about managed profile CAs"
This reverts commit 80559f4aadb3419eecdf6bf61945af584cd2aa8a.

Bug: 18224038
Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
2014-12-22 13:22:11 +00:00
Jinsuk Kim
2c8c47daef Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev 2014-12-19 23:58:12 +00:00
Jinsuk Kim
a95794bc4f CEC: Allow no vendor-specific data for <Vendor Command With ID>
Changed not to return <Feature Abort> if the command comes
with any vendor-specific data, which is still valid.

Bug: 18816046

Change-Id: I22204d167c7783a841f7bb560e900b525f9f036b
2014-12-20 08:47:34 +09:00
Eric Laurent
1ed9a88ec3 Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev 2014-12-19 23:17:08 +00:00
Robert Greenwalt
152ed37a3e Fix timing between bcast and net setup.
A legacy network type request would generate a bcast before the network
notification was sent - the legacy startUsingNetworkFeature API requires
the notification so it can bind your dns queries to the new network.
Fast-moving clients could try to use the network before it was ready.

bug:18792871
Change-Id: I24c46ef15c249c50bfc321f62756d1f66dc3a6a9
2014-12-19 11:54:27 -08:00
Jeff Sharkey
1c4ae809d7 Allow OEM to specify <unavailable-feature>.
Some single-system-image builds may run on devices that lack
certain hardware features.  This change allows the OEM partition to
mark a feature as "unavailable" which overrides the system image.

Bug: 18801291
Change-Id: I0d81144ec92ee9a78c13b223bbba20a4aed23fa0
2014-12-19 11:09:20 -08:00
Eric Laurent
2b5208c358 MediaSession: unmute stream when adjusting volume
Bug: 18482488.

Change-Id: I3411f78551cba31aa7f91b5223e015f0b8c1bbb2
2014-12-19 10:07:25 -08:00
Lorenzo Colitti
7b42f39943 Add a lastValidated bit and use it when reporting capabilities.
When we switched the way the status bar determines if a
connection is validated from using INET_CONDITION_ACTION
broadcasts to calling getDefaultNetworkCapabilitiesForUser(),
the statusbar stopped displaying ! when a network stopped having
working Internet connectivity. This is because the validated bit
is never set to false once a network is validated.

Fix this, hopefully temporarily, by introducing a new validated
bit that does go back to being false when a network no longer
has working connectivity, and use that bit in
getDefaultNetworkCapabilitiesForUser().

Bug: 18777225
Change-Id: I991c068be50252391d0e64c647fcf2e053dc82f9
2014-12-19 19:10:42 +09:00
Lorenzo Colitti
d3b8a3e776 Rename validated to everValidated.
This is a straight rename and thus a complete no-op from a
functionality perspective.

Bug: 18777225
Change-Id: I140d7640f1460c869a311294873772819a7a7059
2014-12-19 19:10:42 +09:00
xinhe
ffe80ab7f6 Merge "take out SIM card, the RSSI Triangle is still full" into lmp-mr1-dev 2014-12-19 00:07:29 +00:00
Mike Lockwood
8a0399c442 Merge "BluetoothManagerService: Enforce DUMP permission" into lmp-mr1-dev 2014-12-18 22:34:00 +00:00
Mike Lockwood
75b52bb880 BluetoothManagerService: Enforce DUMP permission
Bug: 18667272
Change-Id: If9a510aa7b5f22b9df1d8b33f0a18183040a8cf6
2014-12-18 14:16:36 -08:00
Craig Mautner
2281e7d6a1 Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 2014-12-18 19:55:51 +00:00
xinhe
ac11ae91c7 take out SIM card, the RSSI Triangle is still full
Bug:18479509
Change-Id: I96b0e91ae42ad222889c123ebe0c0c1225d9b6a7
2014-12-18 10:02:14 -08:00
Michael Runge
37fed329ad Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 2014-12-18 01:49:08 +00:00
Craig Mautner
6b904ef474 Make window mgr stack movement track activity mgr
There were situations where the activity manager ActivityStack was
moved to the front but the corresponding window manager TaskStack
was not. This caused the wrong activity to receive focus which led
to Application Not Responding errors.

One path in particular occurred in startActivityUncheckedLocked()
where curTop.task != intentActivity.task and
sourceStack.topActivity().task != sourceRecord.task. In this case
targetStack.moveTaskToFrontLocked() was never called.

This fix forces all calls to ActivityStack.moveToFront() to make
a call to WindowManagerService.moveTaskToTop() and eliminates
redundant calls to moveTaskToTop().

Fixes bug 17721767.

Change-Id: Ibf01389810dd36724eaec5a4a07560144b2f4cef
2014-12-17 15:45:03 -08:00
Michael Runge
01c06dfb07 Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
2014-12-17 14:14:12 -08:00
Jinsuk Kim
fadfe708e6 Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev 2014-12-17 21:15:20 +00:00
Cheuksan Wang
e8ea164596 Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev 2014-12-17 20:38:09 +00:00
John Spurlock
57627794b6 Audio policy: Fix deprecated shouldVibrate api.
And apply zen mode immediately to avoid race conditions
in tests.

Bug: 18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
2014-12-17 12:34:00 -05:00
Wale Ogunwale
7de0535701 Don't restore persistent task to a stack until needed.
On boot-up we restore all persistent tasks to an activity stack.
This can cause issues with the activity stack supervisor when it
tries to make restored tasks with activities visiable when they
shouldn't be. Which ends up messing up the order of the recents
list. Now we don't restore persistent tasks to an activity stack
on boot-up. Instead we add the task to the stack when it is needed.

Also, fixes issue with not been able to launch task records with
activity records that were restored from an other device.

Bug: 18692762
Change-Id: Iad0e6635f8c5d1dab4d341feb3e7b06291a94739
2014-12-17 09:17:17 -08:00
Paul Jensen
b0575a24df Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev 2014-12-17 12:54:16 +00:00
Jinsuk Kim
1481a42828 CEC: Pass port ID for set_audio_return_channel
This CL passes a port ID when enabling/disabling ARC in case
there are multiple HDMI ports that support the feature.

Bug: 18781204

Change-Id: I632518132bf07c8ae6f0ff5135429ca719b596b2
2014-12-17 17:29:08 +09:00
Cheuksan Wang
5cec9203a1 remove actions and calls for the old sms/mms api
BUG: 18005911

Change-Id: Ifb900eb7f8bc03e205ac46d3dfb27e4baaaaf6b8
2014-12-16 13:40:36 -08:00
Christopher Tate
0dab4dc03d Fix bad alarm delivery
The man bent over his hourglass,
A programmer of sorts. The day was green.

They said, "You have a blue hourglass,
You do not fire alarms when they're asked."

The man replied, "Alarms as they're asked
are changed within the blue hourglass."

And they said then, "But fire, you must
Alarms beyond us, yet themselves,

Alarms within the blue hourglass
That trigger exactly when they're asked."

 ---

Fix the delivery-fuzzing semantics that had been introduced in
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0.  That patch turned out
to be incomplete; in particular, alarms scheduled later might require
the validity of an already-scheduled kernel alarm even if they did
not affect the head alarm batch directly, and this was not being
addressed.  For now, roll back the fuzzed delivery logic entirely.
(This is not a full revert because that patch also caused exact alarms
to be considered standalone for batching purposes, and we need to
preserve that new policy.)

Bug 18726690
Bug 18765436

This is a 'git revert' of 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0
*except* that this CL preserves the "exact alarms are treated as
standalone" portion of the original patch.

(Cherrypick of 5c3e277fb42bd799287936c5aee0d30fbcc7e65c from its
original branch.)

Change-Id: Ib9c3200f7e6bc6fa0c9928ee9db4cfd87f039353
2014-12-16 12:54:49 -08:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
2014-12-15 15:57:56 -08:00
Paul Jensen
f4ffaa4f57 Fix race between CONNECTIVITY_ACTION and setting default network.
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.

bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820
2014-12-15 15:20:30 -05:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00
Amith Yamasani
52d750c5c2 Check which file changed before requesting backup
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.

Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
2014-12-13 00:15:45 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00