drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,895 Commits 1 Branch 0 Tags
Commit Graph

15122 Commits

Author SHA1 Message Date
Dianne Hackborn
222c5f80e5 am 16b43a77: am 17c21a30: am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '16b43a779166d419875410d598182b852a5f90a3':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:23:54 -07:00
Dianne Hackborn
16b43a7791 am 17c21a30: am 2c09e8cd: Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 
* commit '17c21a3007a2321ae8805a397c3566411a60cba0':
  Fix issue #11157301: Bad process stats when apps are binding to long-running services
 2013-10-10 16:21:39 -07:00
Dianne Hackborn
2c09e8cdf6 Merge "Fix issue #11157301: Bad process stats when apps are binding to long-running services" into klp-dev 2013-10-10 23:11:59 +00:00
Dianne Hackborn
32366b29c4 Fix issue #11157301: Bad process stats when apps are binding to long-running services 
We now treat PROCESS_STATE_TOP more specially.  When a process has another
client bound to it that is TOP, it will only allow itself to go in the TOP
state if it is not already running for another significant reason.

Change-Id: Ia3856406bd481bf6e98d55100a5513ccf4060e0d
 2013-10-10 16:10:32 -07:00
Jason Monk
1b2d586e2d am 193ad53d: am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev 
* commit '193ad53ddd22a8fe8035246ec55e81fc7a7b2fe1':
  getProxy in ConnectivityService returns port w/PAC
 2013-10-10 16:08:29 -07:00
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
ea80d47466 am a9a038c2: am bd558e57: am 64be26fa: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev 
* commit 'a9a038c275dcc606a92cfe93a9b60a16aae38c4a':
  Check callback null condition for register/unregsiter state change callback
 2013-10-10 15:07:22 -07: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
46b2cc1323 am 66b5b5b2: am cb38a97c: am 90abd6d1: Merge "Ensure accessibility node cache is synced with service state" into klp-dev 
* commit '66b5b5b2b74baa9b7c26d5d72eaa2b6f9f5675dc':
  Ensure accessibility node cache is synced with service state
 2013-10-10 11:28:43 -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
5d1c7661fe am 852c7b15: am 6743c171: am 635892fe: Merge "Guard against NPE when using existing process." into klp-dev 
* commit '852c7b15a5a96b0c553e971fe9af72f4ce50bedd':
  Guard against NPE when using existing process.
 2013-10-10 10:24:37 -07: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
4071e05b29 am 0a41b054: am bf74156f: am 0ea16e9e: Merge "Coalescing multiple print job notifications." into klp-dev 
* commit '0a41b0547b5851121fdc833e08dccf665112fc00':
  Coalescing multiple print job notifications.
 2013-10-10 10:20:58 -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
1fcbf278ab am 61b9032d: am 0daa9b92: am 4ca2aec2: Merge "Add task to list before looking it up." into klp-dev 
* commit '61b9032d4c588a2ee4f5d8ab1e2d95cd94125764':
  Add task to list before looking it up.
 2013-10-09 17:28:42 -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
0cf92c0d82 am db3f8ed7: am 680fac0c: am d606be25: Merge "Don\'t crash when component enable/disable broadcasts race with uninstall" into klp-dev 
* commit 'db3f8ed77fb18acbebeaf7bf96419d6155ef8585':
  Don't crash when component enable/disable broadcasts race with uninstall
 2013-10-09 15:28:01 -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
6699ae2b76 am 45d23585: am 11591b73: am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev 
* commit '45d2358510f9670ddf25cc49ee2639e3d41708f7':
  Surface outgoing Uri permission grants.
 2013-10-09 15:17:34 -07: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
12c7513dc3 am 513be145: am 7dd4831f: am b0975540: Merge "Avoid deadlock between mUsers and cacheLock" into klp-dev 
* commit '513be145b6e7fc3e9d07102e02c20c6f744daceb':
  Avoid deadlock between mUsers and cacheLock
 2013-10-09 14:07:20 -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
c1021d8219 am 9eacd267: am 1ee0c1c3: am efeb6f3c: Merge "Fix issue #11087316: Can\'t run dumpsys procstats on user builds in some cases!" into klp-dev 
* commit '9eacd26755e07a9dc5ca6ff16bb3300b8f52b59b':
  Fix issue #11087316: Can't run dumpsys procstats on user builds in some cases!
 2013-10-09 12:23:55 -07: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
Craig Mautner
caca4ab1a9 am f3366c9e: am af47d751: am e8a057a9: Merge "Remove overly tight constraint on drawn Keyguard." into klp-dev 
* commit 'f3366c9ec87d0cba4a55bcf8369a61028db0e973':
  Remove overly tight constraint on drawn Keyguard.
 2013-10-09 12:16:06 -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
69bfc60ae0 am cb8c4501: am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev 
* commit 'cb8c4501d47ac492d48fbdd3b8e599fe620f2949':
  Install providers enabled after app started.
 2013-10-09 10:57:15 -07: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
51860d2832 am 3a18a92e: am 92fba41f: am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev 
* commit '3a18a92ee513881e232bd899b45cdf7132bb199e':
  Allow killed task to remove itself
 2013-10-09 10:52:25 -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