14895 Commits

Author SHA1 Message Date
Jason Monk
193ad53ddd am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev
* commit '6b57033b022890242d6833b494040c360af691d0':
  getProxy in ConnectivityService returns port w/PAC
2013-10-10 16:05:48 -07:00
Jason Monk
8b81a63810 Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev 2013-10-10 22:52:03 +00:00
Matthew Xie
a9a038c275 am bd558e57: am 64be26fa: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev
* commit 'bd558e575cf18149def637697c67af3c951ac8bd':
  Check callback null condition for register/unregsiter state change callback
2013-10-10 15:04:40 -07:00
Matthew Xie
64be26fad7 Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 2013-10-10 21:56:20 +00:00
Jason Monk
decd295b13 getProxy in ConnectivityService returns port w/PAC
Changes the PacManager to report message back to ConnectivityService
to send a broadcast once the download has completed.  This allows the
ConnectivityService to store the correct proxy info for getProxy().

This made the problem arise that ProxyProperties was not handling port
while it had PAC.  Added small fix for equals() and parcelization.

The combination of these fixes seems to resolve Bug: 11028616.

Bug: 11168706
Change-Id: I92d1343a8e804391ab77596b8167a2ef8d76b378
2013-10-10 17:01:45 -04:00
Matthew Xie
9b69399399 Check callback null condition for register/unregsiter state change callback
Fix BluetoothPan closing sequence for unregsiter state change callback
bug 11160007

Change-Id: I405ec91a938289fe9541de2ebd9abc1fb938f44a
2013-10-10 12:12:04 -07:00
Alan Viverette
66b5b5b2b7 am cb38a97c: am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev
* commit 'cb38a97c08ea69902120e333297597af2a62a743':
  Ensure accessibility node cache is synced with service state
2013-10-10 11:25:35 -07:00
Alan Viverette
90abd6d1df Merge "Ensure accessibility node cache is synced with service state" into klp-dev 2013-10-10 18:19:25 +00:00
Jeff Sharkey
852c7b15a5 am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev
* commit '6743c1712e1051ae99639a7d90912c54a0be8b24':
  Guard against NPE when using existing process.
2013-10-10 10:21:29 -07:00
Svetoslav Ganov
0a41b0547b am bf74156f: am 0ea16e9e: Merge "Coalescing multiple print job notifications." into klp-dev
* commit 'bf74156f59013dc5c284c224f14a382f813e8825':
  Coalescing multiple print job notifications.
2013-10-10 10:17:40 -07:00
Jeff Sharkey
635892fe35 Merge "Guard against NPE when using existing process." into klp-dev 2013-10-10 17:17:14 +00:00
Jeff Sharkey
2ffa50df6f Guard against NPE when using existing process.
Bug: 11167561
Change-Id: I51ca7daa71504119fb64bc7bc2b7da4e03b13861
2013-10-10 09:52:48 -07:00
Svetoslav Ganov
a18661d592 Coalescing multiple print job notifications.
1. We used to show a single notificaiton for every print job but
   this is against th UX guidelines. Since we have to lead by
   example, this change adds coalescing of multiple notifications.

bug:11155212

2. Print job state callback in the PrintManager now correctly
   invoked on the main thread.

bug:10983508

Change-Id: I906e9e62198fa37cb4d2f71fce07ed475d61e1bd
2013-10-09 23:43:11 -07:00
Craig Mautner
61b9032d4c am 0daa9b92: am 4ca2aec2: Merge "Add task to list before looking it up." into klp-dev
* commit '0daa9b92e0b4d7a3a2659b31988b3eb538cf2dbc':
  Add task to list before looking it up.
2013-10-09 17:25:58 -07:00
Craig Mautner
4ca2aec2be Merge "Add task to list before looking it up." into klp-dev 2013-10-10 00:20:08 +00:00
Alan Viverette
3d1c5a7236 Ensure accessibility node cache is synced with service state
BUG: 11152210
Change-Id: Ibffd2909b6b06568de9344e536a200d8a7abac9d
2013-10-09 17:10:21 -07:00
Craig Mautner
8e79734ba3 Add task to list before looking it up.
Rearranging the order of operations allows a newly added task to be
bumped to the top during window sorting. Also, redundant calls moving
the home task to the bottom when moving an app task to the top are
removed.

Maybe fix 10858941.

Change-Id: Ic42d2e7045175384591644675dd0e8013a7c7528
2013-10-09 16:39:42 -07:00
Christopher Tate
db3f8ed77f am 680fac0c: am d606be25: Merge "Don\'t crash when component enable/disable broadcasts race with uninstall" into klp-dev
* commit '680fac0c6621b6783315c9cc9a01f951f5a44c7c':
  Don't crash when component enable/disable broadcasts race with uninstall
2013-10-09 15:24:09 -07:00
Christopher Tate
d606be2562 Merge "Don't crash when component enable/disable broadcasts race with uninstall" into klp-dev 2013-10-09 22:18:41 +00:00
Jeff Sharkey
45d2358510 am 11591b73: am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev
* commit '11591b738d51e0d8e87e8825dc2fc7eaa517daa3':
  Surface outgoing Uri permission grants.
2013-10-09 15:12:35 -07:00
Jeff Sharkey
b3da3db34a Merge "Surface outgoing Uri permission grants." into klp-dev 2013-10-09 22:07:11 +00:00
Christopher Tate
06e5fed139 Don't crash when component enable/disable broadcasts race with uninstall
Bug 11154482

Change-Id: I55107fec51bf5efada136052c451f293976360d6
2013-10-09 15:02:17 -07:00
Jeff Sharkey
bcaac0adec Surface outgoing Uri permission grants.
This enables apps to discover and clean up persisted Uri grants when
the underlying Uri becomes invalid, such as when an account is
removed.

Bug: 11142566
Change-Id: Ieeb36cb1155acf226327ebe91cdd30b822d69d1b
2013-10-09 14:32:11 -07:00
Amith Yamasani
513be145b6 am 7dd4831f: am b0975540: Merge "Avoid deadlock between mUsers and cacheLock" into klp-dev
* commit '7dd4831fd6f8966c6fd765279303b636314b7754':
  Avoid deadlock between mUsers and cacheLock
2013-10-09 14:04:40 -07:00
Amith Yamasani
b0975540a4 Merge "Avoid deadlock between mUsers and cacheLock" into klp-dev 2013-10-09 20:57:35 +00:00
Dianne Hackborn
9eacd26755 am 1ee0c1c3: am efeb6f3c: Merge "Fix issue #11087316: Can\'t run dumpsys procstats on user builds in some cases!" into klp-dev
* commit '1ee0c1c3d0c8f07b847a392202afef115b89a78d':
  Fix issue #11087316: Can't run dumpsys procstats on user builds in some cases!
2013-10-09 12:21:44 -07:00
Dianne Hackborn
efeb6f3c1b Merge "Fix issue #11087316: Can't run dumpsys procstats on user builds in some cases!" into klp-dev 2013-10-09 19:15:35 +00:00
Dianne Hackborn
08b36a47cf Fix issue #11087316: Can't run dumpsys procstats on user builds in some cases!
Once we pass the dump perm check, we are safe.

Change-Id: I58f483573874ca9f8f914fb94137f8a2afafaf25
2013-10-09 12:14:11 -07:00
Craig Mautner
f3366c9ec8 am af47d751: am e8a057a9: Merge "Remove overly tight constraint on drawn Keyguard." into klp-dev
* commit 'af47d751b39d7badc268d7a467078b92052f417b':
  Remove overly tight constraint on drawn Keyguard.
2013-10-09 12:13:53 -07:00
Craig Mautner
e8a057a9ae Merge "Remove overly tight constraint on drawn Keyguard." into klp-dev 2013-10-09 19:10:45 +00:00
Jeff Sharkey
cb8c4501d4 am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev
* commit 'd92dd8ffcf3e7bce7d331e7ae9101ccba02baa67':
  Install providers enabled after app started.
2013-10-09 10:53:35 -07:00
Adam Lesinski
3a18a92ee5 am 92fba41f: am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev
* commit '92fba41f3c64407f6827399bfa40bbcf6eac9212':
  Allow killed task to remove itself
2013-10-09 10:48:47 -07:00
Jeff Sharkey
fcd8a39edb Merge "Install providers enabled after app started." into klp-dev 2013-10-09 17:45:11 +00:00
Adam Lesinski
9d958f6993 Merge "Allow killed task to remove itself" into klp-dev 2013-10-09 17:36:57 +00:00
Craig Mautner
4e8a19c73a Remove overly tight constraint on drawn Keyguard.
The requirement that a window that is invisible will not be drawn is
incorrect. In particular the test fails before a surface has even been
added (mHasSurface == false) or shown (mPolicyVisibility == false).
This was causing the screen to turn on before Keyguard had been drawn
and exposing surfaces that would have normally remained hidden.

Also, don't pass null into KeyguardServiceDelegate.onShown() or we
will immediately turn the screen on before Keyguard is drawn.

Fixes bug 11062635.

Change-Id: I964c7ef186d0a94678020b9c27ca6b79e5433350
2013-10-08 21:32:37 -07:00
Lorenzo Colitti
f62c9ab2ec am 18225508: am 2845e519: Merge "Fix captive portal detection on IPv6 networks." into klp-dev
* commit '18225508dd8c9d833c1699ad17a6bba4e4a46c4f':
  Fix captive portal detection on IPv6 networks.
2013-10-08 19:18:51 -07:00
Lorenzo Colitti
2845e5196a Merge "Fix captive portal detection on IPv6 networks." into klp-dev 2013-10-09 02:14:43 +00:00
Jeff Sharkey
dd97f4233f Install providers enabled after app started.
When an app has already been started, and a ContentProvider component
is enabled with DONT_KILL_APP, use the existing ProcessRecord to
install the provider.

Bug: 11118692
Change-Id: I990f18b337eb19768ee1db895f1e2eb982046cce
2013-10-08 17:02:26 -07:00
Adam Lesinski
aa52437745 Allow killed task to remove itself
When killing a task from the recents UI, the activities in
the task would be scheduled for destruction, and the task would
be forcefully removed from the ActivityStack, destroying the
ActivityStack in the process if this was the last task. Since the
ActivityStack was removed, any activities calling back to report
their onDestroy was called (or any timeouts that trigger if
activities fail to do this) would be dropped and certain cleanup
routines would not be called.

Tasks and their ActivityStacks are removed automatically when the
activities within them are removed, so this manual removal was
preventing the cleanup routines from running.

bug:10920157
Change-Id: Ied9d4f8fea761a373a9a80a0dfe810590ab411d8
2013-10-08 15:41:18 -07:00
Jeff Sharkey
ac50f60da6 am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
  Add secondary external storage support.
2013-10-08 14:12:37 -07:00
Jeff Sharkey
a6af40cda2 Merge "Add secondary external storage support." into klp-dev 2013-10-08 21:05:36 +00:00
Jeff Sharkey
44cbdec292 Add secondary external storage support.
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs.  Give secondary volumes valid state
until vold reports back.

Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
2013-10-08 12:57:11 -07:00
Lorenzo Colitti
143a2cf413 Fix captive portal detection on IPv6 networks.
Currently the captive portal check URL is generated by
concatenating scheme, "://", IP address, and port. This breaks
for IPv6 because IPv6 addresses in URLs must be enclosed in
square brackets (e.g., http://2001:db8::1/generate_204 is
invalid; should he http://[2001:db8::1]/generate_204 instead).
The resulting MalformedURLException causes isMobileOk to report
that there is no captive portal, even if there is one.

Fortunately the three-arg URL constructor already knows how to
construct URLs with IPv6 addresses. Use that instead of
generating the URL ourselves.

Bug: 10801896
Change-Id: I02605ef62f493a34f25bb405ef02b111543a76fd
2013-10-08 14:15:14 +09:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
2013-10-07 17:54:42 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00
Craig Mautner
4a38b0ab92 am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev
* commit '972a985590266e457d4a13400dfb5797d7b85908':
  Yet more debugging for 10858941.
2013-10-07 17:21:41 -07:00
Craig Mautner
b729e99578 Merge "Yet more debugging for 10858941." into klp-dev 2013-10-08 00:16:41 +00:00
Craig Mautner
e2dd83a5b4 Yet more debugging for 10858941.
Change-Id: I258957044cb1a8331124f6abbe53428429c33355
2013-10-07 17:01:41 -07:00
Dianne Hackborn
713cc5bf74 am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev
* commit 'fcdbc82ba32b7ef1c8fbd12944b4aaed70019fb1':
  Fix issue #11113111: `dumpsys activity service` is broken
2013-10-07 15:36:46 -07:00
Dianne Hackborn
cade4089e7 Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 2013-10-07 22:30:34 +00:00