OSDN Git Service
Dirk Dougherty [Mon, 19 Aug 2013 19:12:05 +0000 (12:12 -0700)]
am
364fe3a8: am
b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
* commit '
364fe3a856e7bd0c0a35724c2f42d381d8616370':
doc change: Samples browsing first changes: Samples dir and file starters.
Dirk Dougherty [Mon, 19 Aug 2013 19:09:45 +0000 (12:09 -0700)]
am
b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
* commit '
b6bc020d728960dc876a510c9e40cc441a9a9b6b':
doc change: Samples browsing first changes: Samples dir and file starters.
Dirk Dougherty [Tue, 9 Jul 2013 20:18:15 +0000 (13:18 -0700)]
doc change: Samples browsing first changes: Samples dir and file starters.
Change-Id: I6cc8c03bf4c2bcc771d4531619db5b3acd62601f
Scott Main [Fri, 16 Aug 2013 17:58:52 +0000 (10:58 -0700)]
am
8f5a76d2: am
b4f96287: add latest Roboto fonts to DAC and update download links
* commit '
8f5a76d2bf011a7ae72d4c6845ee41fb63b21698':
add latest Roboto fonts to DAC and update download links
Scott Main [Fri, 16 Aug 2013 17:55:07 +0000 (10:55 -0700)]
am
b4f96287: add latest Roboto fonts to DAC and update download links
* commit '
b4f96287285cd0886954d1576157b7a38995af88':
add latest Roboto fonts to DAC and update download links
Scott Main [Fri, 16 Aug 2013 17:41:31 +0000 (10:41 -0700)]
add latest Roboto fonts to DAC and update download links
Change-Id: I6232cf02486d5b82d503ebe8c6035a7da2a1093d
The Android Open Source Project [Wed, 14 Aug 2013 19:09:27 +0000 (12:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f
Roman Nurik [Wed, 14 Aug 2013 18:24:11 +0000 (11:24 -0700)]
am
8ab80f1a: am
1a5bb9d5: Update Typography design guide Bug:
6947941
* commit '
8ab80f1a02874a3bc4d9ec1272536e17a888bf3c':
Update Typography design guide Bug:
6947941
Roman Nurik [Wed, 14 Aug 2013 18:21:45 +0000 (11:21 -0700)]
am
1a5bb9d5: Update Typography design guide Bug:
6947941
* commit '
1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
Update Typography design guide Bug:
6947941
Roman Nurik [Wed, 14 Aug 2013 16:52:41 +0000 (09:52 -0700)]
Update Typography design guide
Bug:
6947941
Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
Kenny Root [Wed, 14 Aug 2013 00:59:31 +0000 (17:59 -0700)]
am
965eb258: am
1c2cb653: am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
965eb258438619774d37cce0ccf9edc976c7a343':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:57:10 +0000 (17:57 -0700)]
am
1c2cb653: am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
1c2cb6533bfebf8b930850215e24327420e34a4b':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:54:18 +0000 (17:54 -0700)]
am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
999ddae70360fc99e804d0b176af487582cd37c8':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:51:15 +0000 (17:51 -0700)]
am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
ae24c0d539414805a6c979f9318d0765506221ae':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:48:20 +0000 (17:48 -0700)]
am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
bf15c7cecefba8fdb3070c389a4966f11a8d8656':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:44:27 +0000 (17:44 -0700)]
am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:42:45 +0000 (17:42 -0700)]
am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:36:42 +0000 (17:36 -0700)]
am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:31:32 +0000 (17:31 -0700)]
am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
a6226a2d202619ddb7e3e9765a3dc9f20241f853':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:27:49 +0000 (17:27 -0700)]
am
32c99004: Use hostname verifier directly instead of instance
* commit '
32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
Kenny Root [Tue, 13 Aug 2013 18:44:05 +0000 (11:44 -0700)]
am
61768c97: am
3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '
61768c97d6e066d633afe61a790a24473f59572c':
Use hostname verifier directly instead of instance DO NOT MERGE
Kenny Root [Tue, 13 Aug 2013 18:41:11 +0000 (11:41 -0700)]
am
3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '
3870c570bbd438cefd09a061b9481314a15dd659':
Use hostname verifier directly instead of instance DO NOT MERGE
Scott Main [Tue, 13 Aug 2013 18:00:49 +0000 (11:00 -0700)]
am
261e00cb: am
b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '
261e00cb046db01b2bae9342f34ff99e99ada368':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
Scott Main [Tue, 13 Aug 2013 17:57:31 +0000 (10:57 -0700)]
am
b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '
b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
Katie McCormick [Mon, 12 Aug 2013 19:21:47 +0000 (12:21 -0700)]
am
e5007896: am
e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '
e50078961ab0134ff5bcf57a9e8cc4b04027f942':
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Katie McCormick [Mon, 12 Aug 2013 19:18:45 +0000 (12:18 -0700)]
am
e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '
e78b4f53392d25eda4a121670aca518df9615f71':
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Katie McCormick [Wed, 24 Jul 2013 01:12:38 +0000 (18:12 -0700)]
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Scott Main [Mon, 12 Aug 2013 17:44:44 +0000 (10:44 -0700)]
am
6dd38cc5: Revert "Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."
* commit '
6dd38cc5343106251c8d66ab11bb93550082e594':
Revert "Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
Scott Main [Mon, 12 Aug 2013 17:38:03 +0000 (17:38 +0000)]
Revert "Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
Submitted the original revert too soon.
This reverts commit
ebcee19783c4fe5ba776353e95974383850a4685.
Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
Scott Main [Mon, 12 Aug 2013 17:14:03 +0000 (10:14 -0700)]
am
ebcee197: Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later.
* commit '
ebcee19783c4fe5ba776353e95974383850a4685':
Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
Scott Main [Mon, 12 Aug 2013 17:08:28 +0000 (17:08 +0000)]
Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev"
revert to fix conflicts, i'll fix it all later.
This reverts commit
385bb2eb5184686c2d953fe4757522e61acb3392.
Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
Scott Main [Mon, 12 Aug 2013 16:57:24 +0000 (09:57 -0700)]
Revert "Doc change: collapse key fix."
To resolve conflict. I'll fix it all later.
This reverts commit
53d9628d080aa7339b724a994607022c5386a566.
Katie McCormick [Sat, 10 Aug 2013 02:31:19 +0000 (19:31 -0700)]
am
385bb2eb: resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev
* commit '
385bb2eb5184686c2d953fe4757522e61acb3392':
Doc change: collapse key fix.
Katie McCormick [Sat, 10 Aug 2013 00:55:05 +0000 (17:55 -0700)]
resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
Katie McCormick [Fri, 9 Aug 2013 22:41:34 +0000 (22:41 +0000)]
Merge "Doc change: collapse key fix." into jb-mr2-dev
Katie McCormick [Wed, 24 Jul 2013 01:12:38 +0000 (18:12 -0700)]
Doc change: collapse key fix.
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Wink Saville [Wed, 7 Aug 2013 23:22:47 +0000 (16:22 -0700)]
If in a mobile captive portal is detected enable fail fast.
When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.
Bug:
9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
Wink Saville [Sun, 21 Jul 2013 03:31:59 +0000 (20:31 -0700)]
Have CaptivePortalTracker use gservices updateable provisioning urls.
After detecting there is a captive portal the url used in the
notification for mobile networks should be updateable via gservices.
These urls will be the same as used by CheckMp and is needed for
carriers that have specific provisioning urls such as AT&T and Verizon.
Bug:
9622647
Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
Wink Saville [Fri, 2 Aug 2013 18:25:23 +0000 (11:25 -0700)]
In CaptiviePortalTracker a socket timeout is probably a captive portal.
On a AT&T warm SIM a socket is not possible so a timeout occurs.
In CheckMp a timing out on a socket is declared as a "warm" sim,
make CaptivePortalTracker the same.
Bug:
10038362
Change-Id: Icb9fb0a1b67704dc9adf6a6348a3781fb9582a89
Wink Saville [Wed, 7 Aug 2013 18:02:57 +0000 (11:02 -0700)]
Check that hipri has started.
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.
Bug:
9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
Wink Saville [Thu, 8 Aug 2013 22:46:55 +0000 (15:46 -0700)]
am
02eab434: am
4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '
02eab434ad9faa25291e63023b7e66698ca457a8':
If in a mobile captive portal is detected enable fail fast.
Wink Saville [Thu, 8 Aug 2013 22:46:52 +0000 (15:46 -0700)]
am
55adb390: am
35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '
55adb390bb96175db9abee3ead349a98b4dc4262':
Have CaptivePortalTracker use gservices updateable provisioning urls.
Wink Saville [Thu, 8 Aug 2013 22:46:49 +0000 (15:46 -0700)]
am
b9b4321b: am
5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
* commit '
b9b4321b756ac6e44650031ebfe0134508f60eaa':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Wink Saville [Thu, 8 Aug 2013 22:46:46 +0000 (15:46 -0700)]
am
9b6363e5: am
cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '
9b6363e5e6d37e3e8d103751d81613eeca32bbbf':
Check that hipri has started.
Wink Saville [Thu, 8 Aug 2013 22:43:24 +0000 (15:43 -0700)]
am
4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '
4d87d91dfe886713df96abd3c0d1c9e20cf385e5':
If in a mobile captive portal is detected enable fail fast.
Wink Saville [Thu, 8 Aug 2013 22:43:13 +0000 (15:43 -0700)]
am
35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '
35152f13b3302dbcb43345458dd5b8b092e37320':
Have CaptivePortalTracker use gservices updateable provisioning urls.
Wink Saville [Thu, 8 Aug 2013 22:43:07 +0000 (15:43 -0700)]
am
5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
* commit '
5191b8599011c255936e3a3cacc052c03e57b772':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Wink Saville [Thu, 8 Aug 2013 22:43:00 +0000 (15:43 -0700)]
am
cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '
cbad1243ad901b8ffcb7497a8f440414b8d41898':
Check that hipri has started.
Wink Saville [Thu, 8 Aug 2013 22:07:27 +0000 (22:07 +0000)]
Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
Wink Saville [Thu, 8 Aug 2013 22:06:21 +0000 (22:06 +0000)]
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
Wink Saville [Thu, 8 Aug 2013 22:05:20 +0000 (22:05 +0000)]
Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
Wink Saville [Thu, 8 Aug 2013 22:03:44 +0000 (22:03 +0000)]
Merge "Check that hipri has started." into jb-mr2-dev
Joe Malin [Thu, 8 Aug 2013 17:20:40 +0000 (10:20 -0700)]
am
93bb7bf2: am
5986f497: Merge "Doc Change: Fix
10224981 error in code snippet" into jb-mr2-docs
* commit '
93bb7bf22df96368392199997aa401eef2c12a9c':
Doc Change: Fix
10224981 error in code snippet
Joe Malin [Thu, 8 Aug 2013 17:17:31 +0000 (10:17 -0700)]
am
5986f497: Merge "Doc Change: Fix
10224981 error in code snippet" into jb-mr2-docs
* commit '
5986f49751e563adf443baca589419e1eb9fbf84':
Doc Change: Fix
10224981 error in code snippet
Joe Malin [Thu, 8 Aug 2013 17:12:01 +0000 (17:12 +0000)]
Merge "Doc Change: Fix
10224981 error in code snippet" into jb-mr2-docs
Joe Malin [Wed, 7 Aug 2013 23:43:52 +0000 (16:43 -0700)]
Doc Change: Fix
10224981 error in code snippet
Change-Id: Ia8193989b0ab08f5b0888a4d3f6823018b48ab18
Wink Saville [Wed, 7 Aug 2013 23:22:47 +0000 (16:22 -0700)]
If in a mobile captive portal is detected enable fail fast.
When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.
Bug:
9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
Dianne Hackborn [Wed, 7 Aug 2013 23:14:11 +0000 (16:14 -0700)]
am
9f11f105: am
7f09ec39: Fix issue #
10226007: Reset apps restores most of the changed settings...
* commit '
9f11f105cd2983021a73b9aa921674fbff3457f3':
Fix issue #
10226007: Reset apps restores most of the changed settings...
Dianne Hackborn [Wed, 7 Aug 2013 22:36:08 +0000 (15:36 -0700)]
Fix issue #
10226007: Reset apps restores most of the changed settings...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
Dianne Hackborn [Wed, 7 Aug 2013 23:09:14 +0000 (16:09 -0700)]
am
7f09ec39: Fix issue #
10226007: Reset apps restores most of the changed settings...
* commit '
7f09ec39b6fd7f24751f814649f12ea686cb28d4':
Fix issue #
10226007: Reset apps restores most of the changed settings...
Dianne Hackborn [Wed, 7 Aug 2013 22:36:08 +0000 (15:36 -0700)]
Fix issue #
10226007: Reset apps restores most of the changed settings...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
Dianne Hackborn [Wed, 7 Aug 2013 22:36:08 +0000 (15:36 -0700)]
Fix issue #
10226007: Reset apps restores most of the changed settings...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
Wink Saville [Wed, 7 Aug 2013 18:02:57 +0000 (11:02 -0700)]
Check that hipri has started.
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.
Bug:
9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
Joe Malin [Wed, 7 Aug 2013 17:47:59 +0000 (10:47 -0700)]
Joe Malin [Wed, 7 Aug 2013 17:44:45 +0000 (10:44 -0700)]
Joe Malin [Wed, 7 Aug 2013 16:53:09 +0000 (09:53 -0700)]
DOC CHANGE: Fixed bug
10210178
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
The Android Open Source Project [Wed, 7 Aug 2013 16:43:07 +0000 (09:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d
Marco Nelissen [Wed, 7 Aug 2013 15:44:43 +0000 (08:44 -0700)]
am
f5cfe708: am
e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit '
f5cfe708a61ecbd89c9db6e09c185ccb3ab87a4a':
When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:42:54 +0000 (08:42 -0700)]
am
e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit '
e8acd367acb82bd80deed31467adcdd9ab83248b':
When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:39:39 +0000 (15:39 +0000)]
Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
Marco Nelissen [Wed, 7 Aug 2013 15:38:12 +0000 (08:38 -0700)]
am
7ffbcb28: am
ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '
7ffbcb2892e66059ec0cce26b4d6054c7778c711':
Guarantee that all db related files are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:34:17 +0000 (08:34 -0700)]
am
ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '
ca5d99ac41f00c282b9101d9b84da0338f15798e':
Guarantee that all db related files are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:30:51 +0000 (15:30 +0000)]
Merge "Guarantee that all db related files are deleted together."
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
jangwon.lee [Wed, 7 Aug 2013 00:50:43 +0000 (09:50 +0900)]
Guarantee that all db related files are deleted together.
When deleting a db file, all db related files has to be deleted together
like journal, wal, shm etc.
Change-Id: I49d4581673d03fe669e9e0eaa2b50f7b9d3c34a4
Signed-off-by: jangwon.lee <jangwon.lee@lge.com>
Scott Main [Tue, 6 Aug 2013 22:35:20 +0000 (15:35 -0700)]
am
bdf85de3: am
7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
* commit '
bdf85de3b81586aadce564cf9cad6f4c725a302e':
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
Scott Main [Tue, 6 Aug 2013 22:30:41 +0000 (15:30 -0700)]
am
7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
* commit '
7b60431ba0f69e51b25e5bf92379222d8ef8691b':
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
Scott Main [Tue, 6 Aug 2013 20:07:34 +0000 (13:07 -0700)]
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link.
bug:
10207619
Change-Id: Ia94b102f3c1476eb118c212de3246e735ffe57b6
Dirk Dougherty [Tue, 6 Aug 2013 17:48:48 +0000 (10:48 -0700)]
am
1153eb46: am
4e847bd1: Doc change: fix federated urls.
* commit '
1153eb46b3aa0226f6d1eac7a196052bd5d818f0':
Doc change: fix federated urls.
Dirk Dougherty [Tue, 6 Aug 2013 17:46:37 +0000 (10:46 -0700)]
am
4e847bd1: Doc change: fix federated urls.
* commit '
4e847bd1f0c4e09f169603fde129e4433a3fe5bc':
Doc change: fix federated urls.
Dirk Dougherty [Tue, 6 Aug 2013 16:59:51 +0000 (09:59 -0700)]
Doc change: fix federated urls.
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
Dirk Dougherty [Tue, 6 Aug 2013 16:32:56 +0000 (09:32 -0700)]
am
8154d293: am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
8154d2932a3e4f9800eeff18da640fda7a169ec8':
Doc change: Updated reference docs for Google Play Services 3.2.
Dirk Dougherty [Tue, 6 Aug 2013 16:30:12 +0000 (09:30 -0700)]
am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
58c68d77596dc81ac6715c8bc7785d1cc430929f':
Doc change: Updated reference docs for Google Play Services 3.2.
Dirk Dougherty [Tue, 6 Aug 2013 07:35:27 +0000 (07:35 +0000)]
Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
Wink Saville [Tue, 6 Aug 2013 00:20:13 +0000 (17:20 -0700)]
am
523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '
523db46f6981a40e12007dbbe629bbdc47f861ba':
Set subscription_mode in the database to a default value
Wink Saville [Tue, 6 Aug 2013 00:10:02 +0000 (00:10 +0000)]
Merge "Set subscription_mode in the database to a default value"
Xia Wang [Mon, 5 Aug 2013 22:58:48 +0000 (15:58 -0700)]
am
ebbcc18e: am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
ebbcc18eaa8a69579fadae484630aa1ba447c031':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:54:41 +0000 (15:54 -0700)]
am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
4032217ee939d3b23548e83d9183306d66af6f8f':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:51:03 +0000 (22:51 +0000)]
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
Wink Saville [Fri, 2 Aug 2013 18:25:23 +0000 (11:25 -0700)]
In CaptiviePortalTracker a socket timeout is probably a captive portal.
On a AT&T warm SIM a socket is not possible so a timeout occurs.
In CheckMp a timing out on a socket is declared as a "warm" sim,
make CaptivePortalTracker the same.
Bug:
10038362
Change-Id: Icb9fb0a1b67704dc9adf6a6348a3781fb9582a89
Wink Saville [Sun, 21 Jul 2013 03:31:59 +0000 (20:31 -0700)]
Have CaptivePortalTracker use gservices updateable provisioning urls.
After detecting there is a captive portal the url used in the
notification for mobile networks should be updateable via gservices.
These urls will be the same as used by CheckMp and is needed for
carriers that have specific provisioning urls such as AT&T and Verizon.
Bug:
9622647
Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
Elliott Hughes [Mon, 5 Aug 2013 18:07:13 +0000 (11:07 -0700)]
am
8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '
8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
If graphics wants ASCII lowercasing, it needs to ask for it.
Elliott Hughes [Mon, 5 Aug 2013 18:01:33 +0000 (18:01 +0000)]
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
Dianne Hackborn [Sat, 3 Aug 2013 02:32:13 +0000 (19:32 -0700)]
am
373a2f15: am
607b414d: Add new app ops method to reset all op modes.
* commit '
373a2f15667956ff8a00ba59b42972b9c930af92':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:08 +0000 (19:30 -0700)]
am
607b414d: Add new app ops method to reset all op modes.
* commit '
607b414d0444067e166fa54d8ea37563f2715ea3':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0