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

15075 Commits

Author SHA1 Message Date
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
Adam Lesinski
9d958f6993 Merge "Allow killed task to remove itself" into klp-dev 2013-10-09 17:36:57 +00:00
Lorenzo Colitti
9ad1199f61 am f62c9ab2: am 18225508: am 2845e519: Merge "Fix captive portal detection on IPv6 networks." into klp-dev 
* commit 'f62c9ab2ec9d5610a284ddd550a140da9478a03e':
  Fix captive portal detection on IPv6 networks.
 2013-10-09 09:14:17 -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
Jeff Sharkey
f22abb961b am ac50f60d: am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev 
* commit 'ac50f60da6ae9943321d4fe945e81d14dff0d4c2':
  Add secondary external storage support.
 2013-10-08 16:02:40 -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
516f953a82 resolved conflicts for merge of e4ccb864 to master 
Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22
 2013-10-07 18:05:09 -07: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
4964584d39 am 4a38b0ab: am 972a9855: am b729e995: Merge "Yet more debugging for 10858941." into klp-dev 
* commit '4a38b0ab92b565547777df6959516325058f73d0':
  Yet more debugging for 10858941.
 2013-10-07 17:23:35 -07: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
ab0330f226 am 713cc5bf: am fcdbc82b: am cade4089: Merge "Fix issue #11113111: dumpsys activity service is broken" into klp-dev 
* commit '713cc5bf74204e4c43429724ecc929c205c18995':
  Fix issue #11113111: `dumpsys activity service` is broken
 2013-10-07 15:40:07 -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
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Alan Viverette
5a0f4eccfb Ignore certain WindowManager flags when touch exploration is enabled 
Specifically, ignore any flags that alter the visibility of the navigation
bar and transparency.

BUG: 11082573
Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8
 2013-10-07 15:12:57 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:12:16 -07:00
Jeff Sharkey
bcc77b502b Merge "Add <intent-filter> support to <provider>." into klp-dev 2013-10-07 21:41:45 +00:00
Dianne Hackborn
13c590de1e Fix issue #11113111: dumpsys activity service is broken 
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d
 2013-10-07 14:36:47 -07:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>. 
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
 2013-10-07 14:19:13 -07:00
Craig Mautner
994f407cc1 am d99f9854: am 6b027cc7: am e7dd3469: Merge "Relax conditions for including windows behind dialogs" into klp-dev 
* commit 'd99f9854e21b15af2ea9226d35c3662e3c542ce8':
  Relax conditions for including windows behind dialogs
 2013-10-06 18:24:20 -07:00
Craig Mautner
1f29fc18fb am 1a205e9a: am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev 
* commit '1a205e9a0c2587ec603d88e954bd89ca0c957e7a':
  Revert to jb-mr2 handling of app died.
 2013-10-06 18:24:17 -07:00
Christopher Tate
20e85d252c am 12c0b66f: am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 
* commit '12c0b66fcecee7671a2cf3e28fddfb9cfa0c679d':
  Make sure to maintain privilege when downgrading bundled apps
 2013-10-06 18:24:13 -07:00
Dianne Hackborn
91b5ab00d1 am c9d48121: am 7ac5a9ac: am 4bc5909a: Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 
* commit 'c9d481218b23ff72922ddc6bbc006be971ff252f':
  Fix issue #11050678: Large memory leak in ActivityStack
 2013-10-06 18:24:06 -07:00
Dianne Hackborn
a74bbf0694 am 0fa2673e: am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 
* commit '0fa2673e9b9ccabdaa1837b5e6ec0b91c75d1a89':
  Fix issue #11086275: Thumbnail only created once for top activity
 2013-10-06 18:24:02 -07:00
Craig Mautner
46d0aab6a1 am 6ebd6cb6: am c50738d6: am dd88879c: Merge "Evaluate task on top of home when task is brought to front." into klp-dev 
* commit '6ebd6cb673f5c3e432c1e92d6aec7ce47ecdd2cf':
  Evaluate task on top of home when task is brought to front.
 2013-10-06 18:23:53 -07:00
Craig Mautner
02a4e7330f am 2478281d: am 3cb25e91: am 1703fd87: Merge "Resume user where they left off." into klp-dev 
* commit '2478281de362c86825cd93d6395af4197d1adb73':
  Resume user where they left off.
 2013-10-06 18:23:49 -07:00
Christopher Tate
b2bb7ddebe am 2aa93138: am e67ebcbc: am 4b4ad011: Merge "Notify that ASEC containers are being unmounted during upgrades" into klp-dev 
* commit '2aa931380b759ec45602dd560aa4d4170ea93330':
  Notify that ASEC containers are being unmounted during upgrades
 2013-10-06 18:23:45 -07:00
Craig Mautner
d99f9854e2 am 6b027cc7: am e7dd3469: Merge "Relax conditions for including windows behind dialogs" into klp-dev 
* commit '6b027cc713659bbe2127c83fe8bc14e66a163727':
  Relax conditions for including windows behind dialogs
 2013-10-06 18:19:06 -07:00
Craig Mautner
1a205e9a0c am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev 
* commit '846a482a0d891a799bfd6e9b00ed5b401a791b30':
  Revert to jb-mr2 handling of app died.
 2013-10-06 18:19:03 -07:00
Christopher Tate
12c0b66fce am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev 
* commit 'a5c436743c2d0343550d13f16ae557d4ea6101e1':
  Make sure to maintain privilege when downgrading bundled apps
 2013-10-06 18:19:01 -07:00
Dianne Hackborn
c9d481218b am 7ac5a9ac: am 4bc5909a: Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev 
* commit '7ac5a9acb8c110620eac04db1eabecbbf64c0744':
  Fix issue #11050678: Large memory leak in ActivityStack
 2013-10-06 18:18:58 -07:00
Dianne Hackborn
0fa2673e9b am ae828e86: am f46bb1d9: Merge "Fix issue #11086275: Thumbnail only created once for top activity" into klp-dev 
* commit 'ae828e869f1cc7506bc0d9329007c6fb990de39f':
  Fix issue #11086275: Thumbnail only created once for top activity
 2013-10-06 18:18:55 -07:00
Craig Mautner
6ebd6cb673 am c50738d6: am dd88879c: Merge "Evaluate task on top of home when task is brought to front." into klp-dev 
* commit 'c50738d67d92ce97f986b5f9371faf5a1a5e9f79':
  Evaluate task on top of home when task is brought to front.
 2013-10-06 18:18:49 -07:00
Craig Mautner
2478281de3 am 3cb25e91: am 1703fd87: Merge "Resume user where they left off." into klp-dev 
* commit '3cb25e91b419d4f18fec8ea2ceec33eb0915096a':
  Resume user where they left off.
 2013-10-06 18:18:46 -07:00
Christopher Tate
2aa931380b am e67ebcbc: am 4b4ad011: Merge "Notify that ASEC containers are being unmounted during upgrades" into klp-dev 
* commit 'e67ebcbc0c5f03434aa756449f0cea6ecb1fde5b':
  Notify that ASEC containers are being unmounted during upgrades
 2013-10-06 18:18:44 -07:00
Craig Mautner
e7dd3469ff Merge "Relax conditions for including windows behind dialogs" into klp-dev 2013-10-06 21:29:34 +00:00
Craig Mautner
ade5f387fa Merge "Revert to jb-mr2 handling of app died." into klp-dev 2013-10-06 21:29:05 +00:00