Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,672 Commits 3 Branches 0 Tags
bc32fa0d72589182cc41ffbb2a239275e892d37f
Commit Graph

12970 Commits

Author SHA1 Message Date
Robert Greenwalt
bc32fa0d72 am aa546ae9: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev 
* commit 'aa546ae97723ffd5400279f566f6e9c591a389d8':
  Retry captiveportal check even if only one addr
 2013-10-15 17:41:03 -07:00
Craig Mautner
33379fb317 am 67122f46: am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev 
* commit '67122f46be4ab186c1f88780a2043b458797254a':
  Remove debug logging.
 2013-10-15 17:37:24 -07:00
Craig Mautner
35cb3efc8a am f7a64d2f: am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev 
* commit 'f7a64d2f123897a255adf2e3ea3c60f09b750b2d':
  Restore window manager stack order on user switch.
 2013-10-15 17:37:21 -07:00
Robert Greenwalt
aa546ae977 am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev 
* commit 'ec4d5da6f99b70768ace085782cf5b24f8697025':
  Retry captiveportal check even if only one addr
 2013-10-15 17:37:05 -07:00
Craig Mautner
67122f46be am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev 
* commit '504b60453f30b78da3a13e022a1d8a7badf26ae1':
  Remove debug logging.
 2013-10-15 17:33:26 -07:00
Craig Mautner
f7a64d2f12 am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev 
* commit 'd68cd8cc40226dfd0b63227b6c186de4a4fd9ba0':
  Restore window manager stack order on user switch.
 2013-10-15 17:33:23 -07:00
Robert Greenwalt
1b7f99b90a Merge "Retry captiveportal check even if only one addr" into klp-dev 2013-10-16 00:31:04 +00:00
Craig Mautner
4270ebc7db Merge "Remove debug logging." into klp-dev 2013-10-16 00:27:50 +00:00
Craig Mautner
a7f2bd4da7 Remove debug logging. 
Change-Id: I5d7c11e8b8525bfc8eb87bb0fff4f71337b4a39d
 2013-10-15 16:13:50 -07:00
Craig Mautner
4f1df4faed Restore window manager stack order on user switch. 
Only the activity stacks were being restored. Also add needed debug
logs.

Fixes bug 11223831.

Change-Id: Ief42688721c49e8cea14277619c797bf7c25b859
 2013-10-15 15:44:14 -07:00
Robert Greenwalt
b9acff3707 Retry captiveportal check even if only one addr 
We're getting some false positive results on this check and
while it was coded to try 3 times given sufficient independent addrs
the default url resolves to a single address so we'd just try once.

Rework to try again even with fewer urls to try to reduce the false
positives.

Also adds a random query param to fool proxies into not caching.

bug:9972012
Change-Id: Ib719f40ec612065ca6bcd919549fc1164506d35a
 2013-10-15 12:43:30 -07:00
Jason Monk
de920f42b9 am cc4d2e0f: am b46eb904: am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev 
* commit 'cc4d2e0fa58e35db16efbbc0e6e02257427eaccd':
  Fix error when PAC set rapidly
 2013-10-15 06:26:55 -07:00
Jason Monk
cc4d2e0fa5 am b46eb904: am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev 
* commit 'b46eb9042b25d9b35ae2e05aba7063c8ee4f006c':
  Fix error when PAC set rapidly
 2013-10-15 05:06:40 -07:00
Jason Monk
c09e591102 Merge "Fix error when PAC set rapidly" into klp-dev 2013-10-15 11:15:01 +00:00
Carlos Valdivia
34f5b35feb am 8d983713: am 5505706c: am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev 
* commit '8d983713db4583d8062dc499efc3896aaf36d65e':
  Package checks for resloving recovery tokens should be user sensitive.
 2013-10-15 04:03:30 -07:00
Craig Mautner
6353ea33ad am 209dc77a: am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev 
* commit '209dc77a6a6bd07f380bb2ee70169fef09ad7fa4':
  Clear displayStartTime whenever starting activity.
 2013-10-15 04:03:26 -07:00
Dianne Hackborn
06d6a7548e am 9aded5ab: am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '9aded5abd65a2c69090abece37a7825a52ca3af0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-15 04:03:09 -07:00
Craig Mautner
06796ab707 am 0e10dfeb: am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev 
* commit '0e10dfebf19efd3ebe6f70800c5a09243f7da2ac':
  Move the wallpaper beneath the keyguard.
 2013-10-15 04:02:23 -07:00
Carlos Valdivia
8d983713db am 5505706c: am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev 
* commit '5505706cfabd62edbbc5e326f129bc5a16ca9b55':
  Package checks for resloving recovery tokens should be user sensitive.
 2013-10-14 19:02:15 -07:00
Craig Mautner
209dc77a6a am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev 
* commit '910deb7155352c8d95e6351fc3efd4eac6b463a5':
  Clear displayStartTime whenever starting activity.
 2013-10-14 19:02:12 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-14 19:01:55 -07:00
Craig Mautner
0e10dfebf1 am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev 
* commit '2c345435458b8b6ad105bf14d3655e0f6836278b':
  Move the wallpaper beneath the keyguard.
 2013-10-14 19:00:35 -07:00
Carlos Valdivia
cdb9ea79a5 Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev 2013-10-15 01:45:45 +00:00
Craig Mautner
cf8a6ca9aa Merge "Clear displayStartTime whenever starting activity." into klp-dev 2013-10-15 01:28:48 +00:00
Craig Mautner
1e8b872edc Clear displayStartTime whenever starting activity. 
setLaunchTime() was only being called from resumeTopActivityLaunched()
but also needed to be called from minimalResumeActivityLocked().

Fixes bug 11104901.

Change-Id: I35c994562dffaf75de014021c775e398224eb3a3
 2013-10-14 18:24:52 -07:00
Carlos Valdivia
416747aea1 Package checks for resloving recovery tokens should be user sensitive. 
Bug: 11219355
Change-Id: Iec031739dc0d751ee9841ca2c495a346d689ad2a
 2013-10-14 18:01:58 -07:00
Dianne Hackborn
e49a107a24 Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 2013-10-15 01:00:07 +00:00
Dianne Hackborn
878deb3c7b Fix issue #11223335: APR: Lots of failures in procstats due to... 
...bad cleanup of crashing processes

We now have a special path for crashing processes, to silently
clean up their state.

Also some tweaks to Log/Slog.wtf to get better stack crawl
summaries in APR.

Change-Id: Ieced26989907a6e7615b6fa033813fced78d7474
 2013-10-14 17:15:40 -07:00
Craig Mautner
79a0ed5848 Merge "Move the wallpaper beneath the keyguard." into klp-dev 2013-10-14 22:24:44 +00:00
Jason Monk
90760c8fa3 Fix error when PAC set rapidly 
Stop the broadcast from being accidentally sent when PAC is in the process
of downloading / binding local proxy.  Only send broadcast when valid port
is contained (i.e. sent by PacManager).

Bug: 11168706
Change-Id: I998711fcf0a6bd82bdef413726ec41317752a57b
 2013-10-14 18:24:13 -04:00
Craig Mautner
5800443e2d Move the wallpaper beneath the keyguard. 
If the keyguard is the wallpaper target the wallpaper cannot sit at
the bottom of the stack and must be directly beneath the keyguard.
Otherwise keep it at the bottom of the window stack.

App animations when the keyguard is showing should not be disabled if
the keyguard is also animating.

Fixes bug 10858941.
Fixes bug 10932680.

Change-Id: I8399837f6510ea16003f68b165e67439f3571ef4
 2013-10-14 13:52:28 -07:00
Jeff Sharkey
3a58678ac2 am 7a531be1: am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev 
* commit '7a531be13bc9ba6218747c185cd199c9e864c60f':
  Throw when taking non-existant Uri permission.
 2013-10-14 11:54:21 -07:00
John Spurlock
cf2d725b55 resolved conflicts for merge of f1dd32c8 to master 
Change-Id: Ied96bfce952fa95eeceb1b8cf64e53830d4d03ac
 2013-10-14 14:49:58 -04:00
Craig Mautner
2e5ab4bf24 am aaae59c3: am 23d4edde: am ea7c1e24: Merge "Add null check when determining mOnTopOfHome" into klp-dev 
* commit 'aaae59c39ce0142bdef3067b9acd039b3c743c6c':
  Add null check when determining mOnTopOfHome
 2013-10-14 11:28:42 -07:00
Craig Mautner
edda7e4cdb am 10caa3b8: am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front. 
* commit '10caa3b8b1181d3dc77870487ae031a7d59f70f7':
  Test for task in front must include stack in front.
 2013-10-14 10:53:11 -07:00
Craig Mautner
4a39a8319a am 59cd8d70: am 5ab73bec: am 4ebe5780: Merge "Revert "Restore wallpaper positioning between apps."" into klp-dev 
* commit '59cd8d70dcc53591e448a25eafea6d1eb4cc5067':
  Revert "Restore wallpaper positioning between apps."
 2013-10-14 10:53:01 -07:00
Dianne Hackborn
9d343c2606 am f2896e28: am 9e4403d4: am ef53fcc3: Merge "Fix issue #11199654: Action bar enter animation skips frames when cleared by the system" into klp-dev 
* commit 'f2896e2897cace31d82d917f73b787a9d87b21cb':
  Fix issue #11199654: Action bar enter animation skips frames when cleared by the system
 2013-10-14 10:52:33 -07:00
Victoria Lease
04e44f3b30 am 7831fd2f: am 7d3fb2d6: am 881e1a6b: Merge "do not request location from unavailable providers" into klp-dev 
* commit '7831fd2fdb46572025195b4b8ec6f1f5b3d9b8c6':
  do not request location from unavailable providers
 2013-10-14 10:52:04 -07:00
Svetoslav Ganov
1b698fcb68 am 531155dd: am 1b6d5412: am d914995a: Merge "Printing from secondary user not working." into klp-dev 
* commit '531155ddd2e1f59c83e5306dbcc23049fba4fd18':
  Printing from secondary user not working.
 2013-10-14 10:51:44 -07:00
Svetoslav Ganov
64e4896dbb am b6fd5789: am 64655e81: am 65d7b8d0: Merge "The list of active print jobs in print service retunring wrong result." into klp-dev 
* commit 'b6fd5789ee73ae8abeaa69818d74d9461bd38165':
  The list of active print jobs in print service retunring wrong result.
 2013-10-14 10:51:37 -07:00
Craig Mautner
2d9b69b7a3 am 55eef710: am cd32edfb: am 5b64aa68: Merge "Restore wallpaper positioning between apps." into klp-dev 
* commit '55eef7108c1ed76521f6af57d0334bf22f7899b4':
  Restore wallpaper positioning between apps.
 2013-10-14 10:50:59 -07:00
Craig Mautner
5d140e0e56 am 3e9230d4: am 22e4a1b8: am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev 
* commit '3e9230d42fb29a160af0eb1bc6ebb4a2f116e808':
  Only return to home if the foreground task is removed.
 2013-10-14 10:50:53 -07:00
Svetoslav Ganov
132a9e2a6e am 603ece2e: am bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 
* commit '603ece2e8e3f5a73007fd42d3be52123a351eef0':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
 2013-10-14 10:50:42 -07:00
Craig Mautner
8a3146e960 am 272b0929: am 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev 
* commit '272b0929a9022f4f1cfc6b72fdbb9cb2416e5bd2':
  When removing a task that was on home, put home on top.
 2013-10-14 10:49:55 -07:00
Matthew Williams
d08d6686c5 resolved conflicts for merge of 94b51810 to master 
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
 2013-10-14 10:39:41 -07:00
Jeff Sharkey
7a531be13b am 94758633: am b5da7b23: Merge "Throw when taking non-existant Uri permission." into klp-dev 
* commit '94758633943e77c820fd77f96329848cc7f31230':
  Throw when taking non-existant Uri permission.
 2013-10-14 10:29:15 -07:00
John Spurlock
f1dd32c84f am fc2ecd5e: am 774e8ad8: Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev 
* commit 'fc2ecd5e3f5b336f7955f4c02521ba6faad1e93c':
  Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY.
 2013-10-14 10:29:12 -07:00
Jeff Sharkey
b5da7b23df Merge "Throw when taking non-existant Uri permission." into klp-dev 2013-10-14 17:24:14 +00:00
John Spurlock
774e8ad883 Merge "Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY." into klp-dev 2013-10-14 17:21:33 +00:00
John Spurlock
f1a36648ca Implement new SYSTEM_UI_FLAG_IMMERSIVE_STICKY. 
Migrate transient bar mode to IMMERSIVE_STICKY, and
introduce new behavior for IMMERSIVE: namely the
opaque bars are revealed by clearing the flags on swipe.

Remove low-profile optimization that confuses api demos
and other apps using low-profile as a signal.

TransientNavigationConfirmation renamed to
ImmersiveModeConfirmation, and its associated resources,
since the confirmation is now shown when the nav bar is
shown in either of the two immersive modes.

Remove unused Toast.makeBar and associated hidden framework
bits now that the confirmation uses a cling instead.

Bug:11062108
Change-Id: Iae49d31973940b9bee9f5b1827756db5eaa76aa3
 2013-10-14 13:11:21 -04:00