12971 Commits

Author SHA1 Message Date
Adam Lesinski
bac61807d3 am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev
* commit '1abead425c0e862e316e17521833a33d22e7a850':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
2013-11-18 13:32:42 -08:00
Adam Lesinski
245408d290 Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev 2013-11-18 21:26:32 +00:00
John Spurlock
32962b3e2c am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
* commit 'c65dfef3f5ee07883446be0e6907f15fe457da9d':
  Use scaled display size in wallpaper constraint.
2013-11-18 12:56:25 -08:00
John Spurlock
afc76f28b9 Merge "Use scaled display size in wallpaper constraint." into klp-dev 2013-11-18 20:49:16 +00:00
Adam Lesinski
2cd3fb5aa7 Do not hold direct ref BatteryStatsImpl$Uid$Proc
BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.

bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209
2013-11-18 12:29:34 -08:00
John Spurlock
d6e836c4a0 Use scaled display size in wallpaper constraint.
Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449
2013-11-18 14:14:49 -05:00
Robert Greenwalt
51213d943b am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService
2013-11-18 10:33:46 -08:00
Robert Greenwalt
a8dae99d76 Fix NPE in ConnectivityService
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
2013-11-18 09:43:59 -08:00
Craig Mautner
427dcdffc2 am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev
* commit '0324bb1a9972ec766b65d4b47b9688588633967b':
  Restore jankless transition keyguard-to-wallpaper
2013-11-15 15:26:03 -08:00
Craig Mautner
de43ebe86a Restore jankless transition keyguard-to-wallpaper
There is still a flash of black when going to a non-wallpaper activity
from keyguard. This is not a regression from jb-mr2 and any fixes to
clean it up are too risky at this late date.

Fixes (partially) bug 11570753.

Change-Id: I17aaae4ab8be570f7e28276a7b8ac4b8685e7551
2013-11-15 14:15:43 -08:00
Jeff Brown
2ea480cac8 am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
  Disallow applications from initiating cast screen.
2013-11-15 00:39:57 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen.
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Christopher Tate
461febadc4 am 64397749: am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev
* commit '64397749effa088dcea3799fc8440845c5a1c193':
  Handle backup transport registration dynamically
2013-11-14 18:41:02 -08:00
Christopher Tate
22010817b9 Merge "Handle backup transport registration dynamically" into klp-dev 2013-11-15 02:34:38 +00:00
Christopher Tate
cefba58d14 Handle backup transport registration dynamically
Bug 11369873

Change-Id: I9bbdcc21ce25159c6645690123b5d03c553b0ddc
2013-11-14 18:13:25 -08:00
Christopher Tate
a5acd62bde am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
* commit '6e5cf573f2f2e17825af2973daeba893c6aa5855':
  Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:44:40 -08:00
Dianne Hackborn
8e9b5fc932 am 59bf3be7: am 2e3ede74: Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-dev
* commit '59bf3be7d1cd7311cf60ead6872f33433a097bd1':
  Maybe fix issue #11634365: Leaking restarting services
2013-11-14 15:44:36 -08:00
Christopher Tate
99437f252b Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev 2013-11-14 22:59:20 +00:00
Dianne Hackborn
2e3ede7497 Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-dev 2013-11-14 22:56:14 +00:00
Dianne Hackborn
ddc19e9847 Maybe fix issue #11634365: Leaking restarting services
It looks like we could add services to the restart list because
they end up left in the process's list of running services after
they have been removed from the main activity list, and we can
trip up on them there when the app is being force stopped.

Change-Id: I79805b67fcf5b593430dc5c856c97927e1a54a57
2013-11-14 14:32:17 -08:00
Christopher Tate
ba629da331 Ensure recipient can be launched before attempting broadcast delivery
User removal or eviction inherently races with broadcast delivery.  This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.

Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.

We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.

Bug 11652784
Bug 11272019
Bug 8263020

Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Matthew Williams
72402f9de7 am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
* commit '09d8e3cf4e411b016ee65d8328dd7a443c9de0ff':
  SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:27:26 -08:00
Matthew Williams
c68bb18244 Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev 2013-11-14 17:18:58 +00:00
Matthew Williams
a7456e46f4 SyncManager now returns copy on getCurrentSyncs()
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.

Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
2013-11-13 18:17:54 -08:00
Robert Greenwalt
7fdfe28c75 am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:29:12 -08:00
Craig Mautner
1fbb5da29a am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev
* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10':
  Add null pointer check.
2013-11-13 16:23:38 -08:00
Robert Greenwalt
594eeb082e Merge "Fix for the invalid Global Proxy Setting" into klp-dev 2013-11-14 00:22:46 +00:00
Craig Mautner
1f0f9fa949 Merge "Add null pointer check." into klp-dev 2013-11-14 00:15:55 +00:00
Raj Mamadgi
92d02491ad Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
2013-11-14 00:08:21 +00:00
Craig Mautner
f4703da89b am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev
* commit 'ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5':
  Keyguard isn't visible if it hasn't been drawn.
2013-11-13 15:18:47 -08:00
Craig Mautner
0e823a450a Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev 2013-11-13 23:11:12 +00:00
Craig Mautner
ada62fca51 Add null pointer check.
Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
2013-11-13 15:09:55 -08:00
Craig Mautner
5c7bd01705 Keyguard isn't visible if it hasn't been drawn.
Reduces jank in multiuser lock from QuickSettings. The launcher and
wallpaper were being hidden as soon as the surface for the keyguard
was created. Now they are not hidden until the keyguard has been
drawn. This still leaves a short time where there is a black screen
but it is considerably shorter than it was. Comparable to jb now.

Fixes bug 11046339.

Change-Id: I349d95dba72da27e5c05a7a64c95a2774d17a34e
2013-11-13 13:09:35 -08:00
Christopher Tate
87b84ca6fc am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev
* commit 'e995ad1559ac12a0ac5e2e56ce378b0b29f10f24':
  Support preferred activities with zero or one scheme in the filter
2013-11-13 12:14:29 -08:00
John Huang
c4f535bdda am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo
2013-11-13 12:14:16 -08:00
Christopher Tate
0b2c2b1005 Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev 2013-11-13 19:33:46 +00:00
John Huang
54ca906604 Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev 2013-11-13 19:14:00 +00:00
Robert Greenwalt
955b575dd9 am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService
2013-11-13 10:27:46 -08:00
Robert Greenwalt
6eddb39c85 am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService
2013-11-13 10:25:30 -08:00
Jeff Brown
e5ae0bfdf7 am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
  Finalize assets for screen casting.
2013-11-13 08:58:53 -08:00
Jeff Brown
41b92b008e Merge "Finalize assets for screen casting." into klp-dev 2013-11-13 16:51:53 +00:00
John Spurlock
e86ab5e1d3 am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev
* commit '79033da8e42ba6ccf096bf10dea1e51873f7d402':
  Ensure wallpaper hint is at least as large as the display.
2013-11-13 08:50:07 -08:00
John Spurlock
7d667ee2de Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev 2013-11-13 16:41:44 +00:00
Jeff Brown
e7ae644522 Finalize assets for screen casting.
Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
2013-11-13 02:17:53 -08:00
Ken Mixter
151d3032eb Fix NPE in ConnectivityService
Could occur when requestRouteToHostAddress is called on a network
with no associated tracker.  Code later in the method handles
this case gracefully but code introduced in JB throws an exception.

Change-Id: I6c8a0e313ecbcca120aeb5dd0802a72114749aa1
2013-11-12 22:17:46 -08:00
Craig Mautner
bf581034f9 am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev
* commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c':
  Relayout windows that handle their own config change.
2013-11-12 16:00:54 -08:00
Craig Mautner
6cd206b2aa Merge "Relayout windows that handle their own config change." into klp-dev 2013-11-12 23:56:21 +00:00
Vinit Deshapnde
4038724a53 Get rid of a race in NsdService in stopResolveService and getAddrInfo
Both requests are made using same id; and there is a chance that
stopResolve() is not fully completed when getAddrInfo() is issued. That
results getAddrInfo() failure, because both are using same requestId.

This change fixes this problem by creating a new unique id to call
getAddrInfo() with.

Bug: 11597153
Change-Id: I56bd78740e8a40bd31c52705dc797486aff53a50
2013-11-12 15:36:37 -08:00
Amith Yamasani
8a71cdaeb1 am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev
* commit 'f174b5162664da2cb7f1e91c2b03324711540ba2':
  Fix inconsistency in reporting device admin active state.
2013-11-12 14:53:19 -08:00