Commit Graph

158947 Commits

Author SHA1 Message Date
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
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
2014-12-15 06:50:18 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
2014-12-15 06:25:08 -08:00
Prem Kumar
9ef07ad2b6 Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 2014-12-14 19:53:48 +00:00
Prem Kumar
6c2fa049aa Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 2014-12-14 19:52:40 +00:00
Guang Zhu
07bba9abee Merge "shell based UI Automator source move" into lmp-mr1-dev 2014-12-14 03:30:57 +00:00
Jinsuk Kim
a2bc055eeb Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 2014-12-13 23:41:48 +00:00
Guang Zhu
18b892c723 shell based UI Automator source move
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
  (samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
2014-12-12 17:31:38 -08: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
Tim Murray
a6bfe6c957 Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 2014-12-13 00:03:53 +00:00
Bart Sears
1f28a6a571 resolved conflicts for merge of 08c72334 to lmp-mr1-dev
Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.
2014-12-12 14:19:57 -08:00
Alan Viverette
7c3212b2f4 Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 2014-12-12 22:00:26 +00:00
Alan Viverette
9a1b4c2967 Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 2014-12-12 21:59:22 +00:00
Alan Viverette
9bc11ac168 Move ripple to end state on jump when hardware exit is pending
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
2014-12-12 13:38:10 -08:00
Tim Murray
eae2472985 Enable native tracking for RS contexts to improve GC behavior.
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
2014-12-12 13:30:15 -08:00
Chong Zhang
bb177db1fe Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 2014-12-12 20:49:36 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Svet Ganov
7486bc1f5a Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 2014-12-12 20:48:09 +00:00
Alan Viverette
419aa7ad14 Propagate DrawableContainer state on mutate, fix ColorDrawable theming
BUG: 18542282
BUG: 18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
2014-12-12 12:34:15 -08:00
Chong Zhang
216e11dcbb parse bitrate range for video/audio caps
Bug: 18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
2014-12-12 11:34:42 -08:00
Kenny Guy
4357d4eabc Merge "Don't show last used and profile button at same time." into lmp-mr1-dev 2014-12-12 18:46:23 +00:00
Tim Kilbourn
2636ccc185 Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev 2014-12-12 18:44:19 +00:00
Adam Powell
9a0799cf6b Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 2014-12-12 18:37:33 +00:00
Jason Monk
a47f968d7e Merge "Handle config changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:40 +00:00
Jason Monk
a686970051 Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 2014-12-12 18:36:26 +00:00
Tim Kilbourn
1991590ddd Revert "Attempt to fix keyguard missing bug"
This reverts commit a5faf2415d.
It prevents the launcher from showing up on Android TV.

Bug: 18724479
2014-12-12 18:33:16 +00:00
Jinsuk Kim
48cbf292ba audioservice: Clear calling identity upon calling HdmiControlService
This makes sure that accessing the HdmiControlService via audio service
should be possible without the system permission.

Bug: 18730526
Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
2014-12-13 02:22:19 +09:00
Kenny Guy
b8a2df10c9 Don't show last used and profile button at same time.
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.

Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
2014-12-12 17:04:08 +00:00
Esteban Talavera
c28fa2cdd4 Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev 2014-12-12 16:59:31 +00:00
Jason Monk
3aaabd7124 Handle config changes in NetworkController
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.

Bug: 18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
2014-12-12 11:56:11 -05:00
Jorim Jaggi
8934e67051 Merge "Limit item count in QS detail" into lmp-mr1-dev 2014-12-12 15:32:57 +00:00
Jorim Jaggi
d3cccec083 Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev 2014-12-12 15:32:30 +00:00
Jorim Jaggi
ab60f2855b Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev 2014-12-12 15:32:18 +00:00
Jason Monk
d8e4bf4e43 Fix tests after inet changes in NetworkController
Bug: 17460017
Change-Id: Iee9c4399f5ca4413f1449cfcf05d72a67b0adadc
2014-12-12 10:26:43 -05:00
Esteban Talavera
6de72663fa Take into account other profiles when deciding whether to show ResolverActivity
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.

BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
2014-12-12 14:34:29 +00:00
Christopher Tate
eb9d4fdf46 am a91ef1ec: Properly recognize repeating wakeup alarms automerge: 8965a8d
* commit 'a91ef1ec04affdf98eb89f11b67fdbae72acb8dd':
  Properly recognize repeating wakeup alarms
2014-12-12 13:24:06 +00:00
Bart Sears
08c7233451 Merge "Tune delivery and batching of alarms" into lmp-dev
automerge: 3ec6a91

* commit '3ec6a91204ffac6e81eaad7ca29e817e9502f856':
  Tune delivery and batching of alarms
2014-12-12 13:15:38 +00:00
Christopher Tate
a91ef1ec04 Properly recognize repeating wakeup alarms
automerge: 8965a8d

* commit '8965a8da5513cf31a313ecdac3506718c2813932':
  Properly recognize repeating wakeup alarms
2014-12-12 13:14:30 +00:00
Svet Ganov
09687064f4 Fix a NPE in AccessiiblityManagerService.
It is possible that the accessibility windows list is null which
is treated as if there is no window information. The getWindows
method was accessing properties of the windows filed witgout a
null check.

bug:18522998

Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa
2014-12-11 22:59:12 -08:00
Svet Ganov
9fc96c5371 Fix an edge case in computing click location in accessibility mode.
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.

bug:18672945

Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
2014-12-11 22:33:48 -08:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
Bart Sears
3ec6a91204 Merge "Tune delivery and batching of alarms" into lmp-dev 2014-12-12 01:52:31 +00:00
Iliyan Malchev
45838de942 fix Uss accounting in getPssPid()
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-12-12 00:20:24 +00:00
Jim Miller
4841a787b3 Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev 2014-12-11 23:33:10 +00:00
Christopher Tate
b62aa5530e Tune delivery and batching of alarms
cherry-pick from lmp-mr1-dev

* Inexact alarms no longer coalesce with exact alarms.  The motivation here
is that exact alarms are far more likely to be wall-clock aligned, and in
general pulling all alarms toward wall-clock alignment is a bad idea.

* Wakeup times are now fuzzed within the target batch's allowed window
rather than being hard pinned at the start of the window.

Bug 18631821

Change-Id: Iefaf34eee3f2a6546abefc27e177ee2fdcff935f
(cherry picked from commit 81f9882b5a)
2014-12-11 23:23:17 +00:00
Christopher Tate
8965a8da55 Properly recognize repeating wakeup alarms
cherry-pick from lmp-mr1-dev

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit 864d42eb96)
2014-12-11 23:22:41 +00:00
John Reck
b9a4d15d09 Merge "Force-flush state sync on texid change" into lmp-mr1-dev 2014-12-11 22:44:19 +00:00
Chris Craik
63c7b24645 Merge "Correct layer size formatting in trace" into lmp-mr1-dev 2014-12-11 22:43:18 +00:00