103195 Commits

Author SHA1 Message Date
Robert Greenwalt
d020294572 Merge "Listen for network disconnect." into jb-mr2-dev 2013-04-22 21:33:29 +00:00
Dirk Dougherty
3acb320fcb am ab3b13eb: am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
* commit 'ab3b13eb332121cdf31370dbad8a7e49aac652a3':
  Doc change: update payment detail for merch account.
2013-04-22 14:32:46 -07:00
Dirk Dougherty
ab3b13eb33 am e5d47b39: am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
* commit 'e5d47b39fd748ebfe8c7fe4da6849ba70faff69a':
  Doc change: update payment detail for merch account.
2013-04-22 14:30:24 -07:00
Dirk Dougherty
e5d47b39fd am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
* commit 'cdfeb09d65cb76cb23b965c1fac2bf22fcc80909':
  Doc change: update payment detail for merch account.
2013-04-22 14:28:21 -07:00
Dirk Dougherty
cdfeb09d65 am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account.
* commit '10fc5e0528a7cad3f2eab0694ed471d29184ec18':
  Doc change: update payment detail for merch account.
2013-04-22 14:27:00 -07:00
Dirk Dougherty
10fc5e0528 am cca23552: am 974af93d: Doc change: update payment detail for merch account.
* commit 'cca235525f14ba8845ef5385036e7913c23f7dd1':
  Doc change: update payment detail for merch account.
2013-04-22 14:25:21 -07:00
Dirk Dougherty
cca235525f am 974af93d: Doc change: update payment detail for merch account.
* commit '974af93de950b68616aed44985720e2978db5393':
  Doc change: update payment detail for merch account.
2013-04-22 14:22:47 -07:00
Dirk Dougherty
974af93de9 Doc change: update payment detail for merch account.
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
2013-04-22 14:17:36 -07:00
Robert Greenwalt
1b0ca9dace Listen for network disconnect.
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
2013-04-22 14:13:51 -07:00
Christopher Tate
7a4ddbaafa Merge "Don't attempt native crash reporting for persistent apps" into jb-mr2-dev 2013-04-22 20:26:30 +00:00
kmccormick
47cccbd09d am f9a152d8: am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit 'f9a152d8fbf012f990afe02a4ef3d528853ca30b':
  Doc update: Fix firewall text.
2013-04-22 13:16:44 -07:00
kmccormick
f9a152d8fb am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '0415ea6ad9a42837339ec5afc43f3defabe58e38':
  Doc update: Fix firewall text.
2013-04-22 13:15:23 -07:00
kmccormick
0415ea6ad9 am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '2aca8dbeaf0c08e59d75c78f5b237a9cd2691784':
  Doc update: Fix firewall text.
2013-04-22 13:13:38 -07:00
Scott Main
3fadd4c256 am 8841569f: am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
* commit '8841569fc835bb172e06dc3fba9597c643af8b31':
  fix backup registration url external bug: 54539
2013-04-22 13:13:20 -07:00
Scott Main
8841569fc8 am b8ac12af: am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
* commit 'b8ac12af56a3eb33be550ade27be62ff3d0689ed':
  fix backup registration url external bug: 54539
2013-04-22 13:11:58 -07:00
kmccormick
2aca8dbeaf am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit 'b116885c42be983732a495bb84938d290211014f':
  Doc update: Fix firewall text.
2013-04-22 13:11:53 -07:00
Scott Main
b8ac12af56 am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
* commit '3da6ef399c5e3b42c0f5a8149b1f1d154556c1ff':
  fix backup registration url external bug: 54539
2013-04-22 13:10:21 -07:00
kmccormick
b116885c42 am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit 'ce534905a63f97766f487798fd61cb8414da04fe':
  Doc update: Fix firewall text.
2013-04-22 13:10:04 -07:00
Scott Main
3da6ef399c am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539
* commit 'd07bdb6fd165b31aa9e047095e18be7e76e74502':
  fix backup registration url external bug: 54539
2013-04-22 13:08:33 -07:00
kmccormick
ce534905a6 Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 2013-04-22 20:08:11 +00:00
Scott Main
d07bdb6fd1 am 2779da87: fix backup registration url external bug: 54539
* commit '2779da87e2414709afe462339bb3cfde7feb2965':
  fix backup registration url external bug: 54539
2013-04-22 13:06:41 -07:00
Scott Main
2779da87e2 fix backup registration url
external bug: 54539

Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
2013-04-22 13:03:00 -07:00
Baligh Uddin
b0579834e7 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-22 19:59:48 +00:00
Dianne Hackborn
3edf207a92 Merge "Assign final resource IDs for JB MR2." into jb-mr2-dev 2013-04-22 19:49:24 +00:00
kmccormick
91290d59d5 Doc update: Fix firewall text.
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
2013-04-22 12:28:25 -07:00
Scott Main
9753ef1e7d am 35ac5b08: am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '35ac5b08e5e152eb6536bde3cd88a83cffc2ed5f':
  delete unused download page and add a couple search tags
2013-04-22 12:21:52 -07:00
Scott Main
35ac5b08e5 am abb6f472: am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit 'abb6f472e5b3028a509a0c3cc1a841a52a9063e2':
  delete unused download page and add a couple search tags
2013-04-22 12:19:36 -07:00
Scott Main
abb6f472e5 am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '24a3899cb09e6af21f7886f2e567f725a5904e43':
  delete unused download page and add a couple search tags
2013-04-22 12:17:49 -07:00
Scott Main
24a3899cb0 am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit '1aba107ddf8f8df33cbc84046ccc0c7f40a59352':
  delete unused download page and add a couple search tags
2013-04-22 12:15:57 -07:00
Scott Main
1aba107ddf am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs
* commit 'c3ae5cd6852185e5a64173d3c5b3439ad507b156':
  delete unused download page and add a couple search tags
2013-04-22 12:14:19 -07:00
Scott Main
c3ae5cd685 Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 2013-04-22 19:12:10 +00:00
Scott Main
e0c4bb4c22 delete unused download page and add a couple search tags
Change-Id: I8aad4703d575e2c336129e92a2b9ef448d21a4f9
2013-04-22 12:11:18 -07:00
Dianne Hackborn
6c8c2f094c Assign final resource IDs for JB MR2.
Change-Id: I72916fb590166ea17ed1e4a2ea648c3f61d62def
2013-04-22 10:51:42 -07:00
Zhentao Sun
c5fc9988f1 Made it easier to disable overlay mechanism of location components.
Fixed b/8276827

Vendor might want to provide their own implementation of "network
location", "fused location" and "geocoder" service. Location manager now
allows those service to be replaced by packages that have the same
signature as one of the packages in config_locationProviderPackageNames.
Such behavior might not be desirable on some devices. This change
make this behavior configurable by 3 boolean flags.

Details:
- Added three boolean flags in core/res/res/values/config.xml to enable
or disable NLP/FLP/Geocoder overlay
- Added 3 package name for the stock NLP/FLP/Geocoder. They are needed
  only when overlay is disabled because LocationManagerService need to
  know which package is preferred when searching for
  NLP/FLP/Geocoder service.
- Made ServiceWatcher able to handle non-overlayable services.
- Fixed an NPE isue in ServiceWatcher. mPm.queryIntentServicesAsUser
  might return null.
- Fixed an bug: justCheckThisPackage in bindBestPackageLocked is always
  ignored.

Change-Id: Id221961ac7c3aa8ad44b894f9523f04f770ae237
2013-04-22 10:02:08 -07:00
Baligh Uddin
038f2725f1 Import translations. DO NOT MERGE
Change-Id: Ia215efa0e99abe3bf7eb8444d60c806d154768a1
Auto-generated-cl: translation import
2013-04-22 08:47:45 -07:00
Chet Haase
339ac85483 Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev 2013-04-20 21:02:21 +00:00
Dirk Dougherty
16f654c963 am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit 'f4f5757b68e3b0db10c77ac9fa81d6b4d7dd8435':
  Doc change: updates for tablet checklist.
2013-04-20 12:11:49 -07:00
Dirk Dougherty
f4f5757b68 am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '014513ae2974edd2e6102f618ca57423c543cb4f':
  Doc change: updates for tablet checklist.
2013-04-20 12:09:42 -07:00
Dirk Dougherty
014513ae29 am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '00d20bd293e75beb546ea446901cdead39180116':
  Doc change: updates for tablet checklist.
2013-04-20 12:08:04 -07:00
Dirk Dougherty
00d20bd293 am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit 'e0d5add782405fabe4d04b8eff00b565ea28a35f':
  Doc change: updates for tablet checklist.
2013-04-20 12:05:45 -07:00
Dirk Dougherty
e0d5add782 am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '3fd1a8926ebfaaeccbaad86b7584fa534f725996':
  Doc change: updates for tablet checklist.
2013-04-20 12:03:37 -07:00
Dirk Dougherty
3fd1a8926e am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
* commit '94ca86e8a019225ff376e5683e87ee3a29713f05':
  Doc change: updates for tablet checklist.
2013-04-20 12:01:29 -07:00
Dirk Dougherty
94ca86e8a0 Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6 Doc change: updates for tablet checklist.
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
2013-04-20 11:34:51 -07:00
Selim Gurun
b2d82bc0ab am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit '8695b1aff8b4ece642796ba7b2a5faa2b8a87d60':
  DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:38:34 -07:00
Selim Gurun
940718d859 am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
* commit 'a68545796da33bd7fde616958e6abc7548d0a975':
  Revert "Add a delimiter between scheme and host"
2013-04-20 00:38:31 -07:00
Selim Gurun
8695b1aff8 am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit '5eebdb4aa81f9e00e5f175bbebfec76cbde5b38d':
  DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:35:32 -07:00
Selim Gurun
a68545796d am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
* commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
  Revert "Add a delimiter between scheme and host"
2013-04-20 00:35:29 -07:00
Selim Gurun
5eebdb4aa8 am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit 'a46537270ea4d519651157ab5503c02d4b43759d':
  DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:32:27 -07:00
Selim Gurun
fa1f7d21e9 am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
* commit '07c9c2912d1c7e19336d575f40f42eb12626b322':
  Revert "Add a delimiter between scheme and host"
2013-04-20 00:32:24 -07:00