24227 Commits

Author SHA1 Message Date
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
Olawale Ogunwale
07bb03c423 Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 2014-12-18 16:55:43 +00:00
Michael Runge
3fa2307254 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev automerge: 8deabad
automerge: 647beed

* commit '647beed62236c996b946e85d06fdf4335b6a2a80':
  Increase timeout when uncrypting OTA
2014-12-18 02:08:44 +00:00
Michael Runge
647beed622 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA
2014-12-18 01:59:10 +00:00
Michael Runge
8deabad541 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
* commit '37fed329adec7b339755fde0b38c687f70524e4e':
  Increase timeout when uncrypting OTA
2014-12-18 01:53:26 +00:00
Michael Runge
37fed329ad Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 2014-12-18 01:49:08 +00:00
Wonsik Kim
874d0c61e3 Merge "TIF: change TvInputHal events to run on its own thread" 2014-12-18 01:40:32 +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
e8826ba3dd am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
automerge: 23ac13c

* commit '23ac13c6b95c15d029426ff8424f7f6f23bf0220':
  CEC: Pass port ID for set_audio_return_channel
2014-12-17 21:28:11 +00:00
Jinsuk Kim
23ac13c6b9 am 08ca1694: am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
* commit '08ca1694eb3013bd1f6c050e021588b8614e8764':
  CEC: Pass port ID for set_audio_return_channel
2014-12-17 21:24:50 +00:00
Jinsuk Kim
08ca1694eb am fadfe708: Merge "CEC: Pass port ID for set_audio_return_channel" into lmp-mr1-dev
* commit 'fadfe708e6f0c74890fe2b3292a91570f3049215':
  CEC: Pass port ID for set_audio_return_channel
2014-12-17 21:20:08 +00: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
f46a0b6f20 am 2045d5f3: am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev
* commit '2045d5f3a23f8e462d05acf6d6cf6ea08e236a1e':
  remove actions and calls for the old sms/mms api BUG: 18005911
2014-12-17 20:56:23 +00:00
Cheuksan Wang
2045d5f3a2 am f1b64b4b: am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev
* commit 'f1b64b4bb8300d2079696ff0d70cce16eda2be4e':
  remove actions and calls for the old sms/mms api BUG: 18005911
2014-12-17 20:51:09 +00:00
Cheuksan Wang
f1b64b4bb8 am e8ea1645: Merge "remove actions and calls for the old sms/mms api BUG: 18005911" into lmp-mr1-dev
* commit 'e8ea164596b3ab2309d7b99fa52aecd056e50e24':
  remove actions and calls for the old sms/mms api BUG: 18005911
2014-12-17 20:45:03 +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
01a8d29e27 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
automerge: 09ab7d0

* commit '09ab7d0663210f7b87c830b4560474a05564c37a':
  Audio policy: Fix deprecated shouldVibrate api.
2014-12-17 20:27:39 +00:00
John Spurlock
09ab7d0663 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
* commit 'caba360367ea9900a48066f97f4b6e59877a9df6':
  Audio policy: Fix deprecated shouldVibrate api.
2014-12-17 20:23:55 +00:00
John Spurlock
caba360367 am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev
* commit 'e7f301a05344376f9065ef09e3b3ef360469bcb3':
  Audio policy: Fix deprecated shouldVibrate api.
2014-12-17 20:18:03 +00:00
Narayan Kamath
7dfbafd8b3 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." automerge: 681e6df1
automerge: 25c29c1

* commit '25c29c19474e5cb359473d3d36fdb1eddb90f50b':
  Move frameworks users over to libcore hex encoding API.
2014-12-17 18:17:01 +00:00
Narayan Kamath
25c29c1947 am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API."
automerge: 681e6df1

* commit '681e6df1221ca7671f574d368d428f62184448b0':
  Move frameworks users over to libcore hex encoding API.
2014-12-17 18:14:00 +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
Narayan Kamath
1653b1dd69 Throw IllegalArgumentException on invalid hex-strings.
Beats returning null since there's let's chance it will be interpreted
as the lack of a password.

Change-Id: I4986a8e806d9066129f696ab9f2e80655424e723
2014-12-17 13:40:36 +00:00
Narayan Kamath
6d41504d2c Merge "Move frameworks users over to libcore hex encoding API." 2014-12-17 13:34:00 +00:00
Paul Jensen
20bdd86511 am 05517814: am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit '05517814a5dcffecefb84448967bac40f055025a':
  Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 13:11:21 +00:00
Paul Jensen
05517814a5 am 24594794: am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit '24594794cbb9bf6bb9c8b57e4427c88efee82304':
  Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 13:05:39 +00:00
Paul Jensen
24594794cb am b0575a24: Merge "Fix race between CONNECTIVITY_ACTION and setting default network." into lmp-mr1-dev
* commit 'b0575a24df6bc840d720dafa6e737cdd61fb2c6f':
  Fix race between CONNECTIVITY_ACTION and setting default network.
2014-12-17 12:59:29 +00: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
Wonsik Kim
57b37f610d TIF: change TvInputHal events to run on its own thread
Bug: 18688119
Change-Id: Id60f82295cdbc45065be416c9828eae144b6799f
2014-12-17 14:26:39 +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
4328db5769 am 892e65cb: am 0dab4dc0: Fix bad alarm delivery
automerge: 7c1f995

* commit '7c1f995b7bf171a1b556dcaa4dc16cf46db853be':
  Fix bad alarm delivery
2014-12-16 21:15:25 +00:00
Christopher Tate
7c1f995b7b am 892e65cb: am 0dab4dc0: Fix bad alarm delivery
* commit '892e65cb2ac4b4917b41060300bbaa3414233394':
  Fix bad alarm delivery
2014-12-16 21:13:25 +00:00
Christopher Tate
892e65cb2a am 0dab4dc0: Fix bad alarm delivery
* commit '0dab4dc03d1daae72bba9d364e15f6055cb339fd':
  Fix bad alarm delivery
2014-12-16 21:07:54 +00: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
Narayan Kamath
78108a3e52 Move frameworks users over to libcore hex encoding API.
Removes dependency on apache-http.

bug: 18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df
2014-12-16 17:25:07 +00:00
Todd Kennedy
f275b18521 Merge "propagate reason to finishActivityLocked()" 2014-12-16 15:42:05 +00:00
Brian Carlstrom
f3ded2b1a4 am 9900dbb9: am a00be9b4: Remember failed dexopt to avoid retry automerge: 2350c7c
* commit '9900dbb9e8296d81100a42c687abf702af6ef1be':
  Remember failed dexopt to avoid retry
2014-12-16 01:53:25 +00:00
Brian Carlstrom
9900dbb9e8 am a00be9b4: Remember failed dexopt to avoid retry
automerge: 2350c7c

* commit '2350c7cb1238ad24b5afaa7f6627b3443d33621b':
  Remember failed dexopt to avoid retry
2014-12-16 01:46:40 +00:00
Brian Carlstrom
2350c7cb12 am a00be9b4: Remember failed dexopt to avoid retry
* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
  Remember failed dexopt to avoid retry
2014-12-16 00:55:20 +00: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
Marvin Paul
111d166017 Merge "Implemented backup and restore for account sync settings." 2014-12-15 18:22:46 +00:00
Todd Kennedy
539db51a7d propagate reason to finishActivityLocked()
Bug: 18704347
Change-Id: I830ad08f344db5be99760e0112d96729077b29c6
2014-12-15 10:11:35 -08:00
Christopher Tate
eef1cec0ed am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
automerge: fe9e319

* commit 'fe9e3195faaa795af5fd05fab694d9f51d06e454':
  Check which file changed before requesting backup
2014-12-13 01:15:07 +00:00
Christopher Tate
fe9e3195fa am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
* commit '36ba3e478fbbb664a97b24723836444184c6943f':
  Check which file changed before requesting backup
2014-12-13 01:09:03 +00:00
Christopher Tate
36ba3e478f am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
  Check which file changed before requesting backup
2014-12-13 00:59:10 +00:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00