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

12998 Commits

Author SHA1 Message Date
Svetoslav
2d0391d1ea am bfb51444: am 87841352: am 7f11d0db: Merge "Clear the caller identity when dumping print system state." into klp-dev 
* commit 'bfb5144457638f6ba5e40143c9e2559a0b4f1496':
  Clear the caller identity when dumping print system state.
 2013-10-18 13:34:04 -07:00
Svetoslav
bfb5144457 am 87841352: am 7f11d0db: Merge "Clear the caller identity when dumping print system state." into klp-dev 
* commit '8784135245567a4f234b2704549215ad65ef092b':
  Clear the caller identity when dumping print system state.
 2013-10-18 13:30:25 -07:00
Svetoslav
7f11d0db2d Merge "Clear the caller identity when dumping print system state." into klp-dev 2013-10-18 20:26:38 +00:00
Marco Nelissen
c8c2594381 Merge "Add a method to set a list of uids for a wake lock" 2013-10-18 14:28:45 +00:00
Jeff Sharkey
eeb58c79c0 am 703840da: am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '703840da8a33c703f2d787526438c650b0318845':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:55:22 -07:00
Jeff Sharkey
db289e0ac7 am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
  Plumb through physical device UUID and label.
 2013-10-17 18:55:13 -07:00
Jeff Sharkey
703840da8a am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '1a5804d7aa253432f37fbd5d8eb89ac363501fe9':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:53:26 -07:00
Jeff Sharkey
47938450b4 am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
  Plumb through physical device UUID and label.
 2013-10-17 18:53:15 -07:00
Jeff Sharkey
0c0f1e2eac Merge "Include external storage devices in DocumentsUI." into klp-dev 2013-10-18 01:46:52 +00:00
Jeff Sharkey
8f4c15d8e4 Merge "Plumb through physical device UUID and label." into klp-dev 2013-10-18 01:45:58 +00:00
Robert Greenwalt
e6c5544c07 am fe10a506: am 20c811dd: am b1f0bba1: Merge "Change how we use provisioning url so post works" into klp-dev 
* commit 'fe10a506fd569a153275d9106f97a859203439c7':
  Change how we use provisioning url so post works
 2013-10-17 16:13:24 -07:00
Robert Greenwalt
fe10a506fd am 20c811dd: am b1f0bba1: Merge "Change how we use provisioning url so post works" into klp-dev 
* commit '20c811dd3b2191aa213337cf06ab5b34f85ee7fe':
  Change how we use provisioning url so post works
 2013-10-17 16:09:32 -07:00
Robert Greenwalt
b1f0bba1bd Merge "Change how we use provisioning url so post works" into klp-dev 2013-10-17 23:00:42 +00:00
Robert Greenwalt
536b3c2b6c Change how we use provisioning url so post works 
Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser.  The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549
 2013-10-17 12:46:52 -07:00
Jeff Sharkey
1f706c6cd1 Include external storage devices in DocumentsUI. 
Include volume UUID in generated document IDs to uniquely identify
volumes over time.  Show volume label to users.  Watch for mount
changes to update available roots.

Bug: 11175082
Change-Id: Ia151bde768587468efde0c1d97a740b5353d1582
 2013-10-17 10:55:32 -07:00
Dianne Hackborn
5d1bf06087 am 86f7f4a6: am 52ae2cd1: am fc69e2b5: Merge "Increase size of broadcast history lists on non-svelte devices." into klp-dev 
* commit '86f7f4a68bd2f3da6035c7dabce4161bbe2c4c53':
  Increase size of broadcast history lists on non-svelte devices.
 2013-10-17 09:43:21 -07:00
Dianne Hackborn
86f7f4a68b am 52ae2cd1: am fc69e2b5: Merge "Increase size of broadcast history lists on non-svelte devices." into klp-dev 
* commit '52ae2cd1b1bc72c0624463e94d94087bd42a1fb8':
  Increase size of broadcast history lists on non-svelte devices.
 2013-10-17 09:21:52 -07:00
Dianne Hackborn
fc69e2b5ad Merge "Increase size of broadcast history lists on non-svelte devices." into klp-dev 2013-10-17 16:13:24 +00:00
Dianne Hackborn
4c51de4933 Increase size of broadcast history lists on non-svelte devices. 
Change-Id: Ibd25379778dac8eb1aed30d4788e032f290d9b69
 2013-10-16 23:34:35 -07:00
Satoshi Kataoka
03e1c70802 Merge "Introduce an API to get the recommended height of the InputMethodWindow" 2013-10-17 05:24:01 +00:00
Jeff Sharkey
5aca2b8dc4 Plumb through physical device UUID and label. 
vold now parse out UUID and label for inserted physical devices,
and reports them to framework.  Add these to hidden StorageVolume
class for use by DocumentsUI and MediaProvider.

Remove last JNI method in FileUtils!

Bug: 11175082
Change-Id: I1cfcd1ade61767b103f693319ea2600008ee2e3c
 2013-10-16 16:34:21 -07:00
Dianne Hackborn
eceecfd224 am 25e7240e: am 519d8895: am 9c446d82: Merge "Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings." into klp-dev 
* commit '25e7240e997d9af058f2700f7626b8c9d155ee3a':
  Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings.
 2013-10-16 14:08:59 -07:00
Dianne Hackborn
25e7240e99 am 519d8895: am 9c446d82: Merge "Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings." into klp-dev 
* commit '519d8895a29dd78f5250ee2ececac4e03a6f5b70':
  Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings.
 2013-10-16 14:05:52 -07:00
Dianne Hackborn
2a272d42a3 Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings. 
Two problems addressed here:

- If a call to startActivity() comes in on an activity that is finishing, we can
  end up putting the new activity in a stack that isn't actually in use any more
  (if the finishing activity is the last one on that stack).  This is a bad case,
  anyway, so if this happen the treat it as not being called on an existing
  activity and switch to NEW_TASK to find a task for it.

- There was a bug in handling PACKAGE_CHANGE broadcasts that would result in the
  app's processes being killed, even though the cleanup through the activities
  was done.  This could leave the activity stack in a bad state.  Fix this to
  correctly provide an app id for the changing package so that its processes are
  killed.

Change-Id: Iece04e0cf95025c3d30353d68bf3d14fd39d44c3
 2013-10-16 13:34:33 -07:00
Marco Nelissen
1125235da1 Add a method to set a list of uids for a wake lock 
Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
 2013-10-16 12:56:34 -07:00
Svetoslav
5fe07aa7a8 Clear the caller identity when dumping print system state. 
bug:11251806

Change-Id: I295db22f327bc81f911cf638295415689d54fe56
 2013-10-16 11:15:45 -07:00
Narayan Kamath
98e1797367 Remove captive portal code that has no effect. 
Note that this CL does not change any behaviour.

At the center of this change is
CaptivePortalTracker#detectCaptivePortal(), which does nothing
except call back into ConnectivityService. Removing it allows us to
simplify code in ConnectivityService. It also allows us to remove
ConnectivityService#captivePortalCheckComplete which was only ever
called in response to this method.

While this does not change any behaviour, it preserves existing
bad behaviour, i.e, that the CAPTIVE_PORTAL_CHECK NetworkInfo
state does not correspond to actual captive portal detection.
We transition into that state and immediately (and unconditionally)
out of it and into CONNECTED.

Change-Id: Ib3797f956d2db5e3cacaaa53e899d81aa8e958af
 2013-10-16 08:10:55 +00:00
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
Satoshi Kataoka
658c7b896a Introduce an API to get the recommended height of the InputMethodWindow 
Bug: 11035379
Bug: 5137498

Change-Id: I0e920ee79c526c3aea6872b063cf294e2ab081c8
 2013-10-15 14:35:18 +09: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