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

106643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
9b7b445018 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.
 2013-08-08 15:46:55 -07:00
Wink Saville
7c00be48fc 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.
 2013-08-08 15:46:52 -07:00
Wink Saville
81132d5197 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.
 2013-08-08 15:46:49 -07:00
Wink Saville
81b1fa6fc6 am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev 
* commit '9b6363e5e6d37e3e8d103751d81613eeca32bbbf':
  Check that hipri has started.
 2013-08-08 15:46:46 -07:00
Wink Saville
02eab434ad 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.
 2013-08-08 15:43:24 -07:00
Wink Saville
55adb390bb am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 
* commit '35152f13b3302dbcb43345458dd5b8b092e37320':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
 2013-08-08 15:43:13 -07:00
Wink Saville
b9b4321b75 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.
 2013-08-08 15:43:07 -07:00
Wink Saville
9b6363e5e6 am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev 
* commit 'cbad1243ad901b8ffcb7497a8f440414b8d41898':
  Check that hipri has started.
 2013-08-08 15:43:00 -07:00
Wink Saville
4d87d91dfe Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 2013-08-08 22:07:27 +00:00
Wink Saville
35152f13b3 Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 2013-08-08 22:06:21 +00:00
Wink Saville
5191b85990 Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev 2013-08-08 22:05:20 +00:00
Wink Saville
cbad1243ad Merge "Check that hipri has started." into jb-mr2-dev 2013-08-08 22:03:45 +00:00
Joe Malin
bc8bb009ae 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
 2013-08-08 10:20:40 -07:00
Joe Malin
93bb7bf22d 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
 2013-08-08 10:17:31 -07:00
Joe Malin
5986f49751 Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs 2013-08-08 17:12:02 +00:00
Joe Malin
81ea1eed82 Doc Change: Fix 10224981 error in code snippet 
Change-Id: Ia8193989b0ab08f5b0888a4d3f6823018b48ab18
 2013-08-07 16:43:52 -07:00
Wink Saville
d747cbc898 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
 2013-08-07 16:22:47 -07:00
Dianne Hackborn
42380b6de6 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...
 2013-08-07 16:14:11 -07:00
Dianne Hackborn
9f11f105cd 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...
 2013-08-07 16:09:14 -07:00
Dianne Hackborn
7f09ec39b6 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
 2013-08-07 15:49:02 -07:00
Wink Saville
7f6ee2ec90 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
 2013-08-07 11:02:57 -07:00
Joe Malin
68091b9e10 am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178 
* commit '72289702e5e134eb189a208aa6e2fb3edb041f7a':
  DOC CHANGE: Fixed bug 10210178
 2013-08-07 10:47:59 -07:00
Joe Malin
72289702e5 am 6180f104: DOC CHANGE: Fixed bug 10210178 
* commit '6180f104cf8c97316e77a4bbfd95992c2b7649cb':
  DOC CHANGE: Fixed bug 10210178
 2013-08-07 10:44:45 -07:00
Joe Malin
6180f104cf DOC CHANGE: Fixed bug 10210178 
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
 2013-08-07 09:53:09 -07:00
The Android Open Source Project
9d42e438cb Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d
 2013-08-07 09:43:07 -07:00
Marco Nelissen
53d86f6e49 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.
 2013-08-07 08:44:43 -07:00
Marco Nelissen
f5cfe708a6 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.
 2013-08-07 08:42:54 -07:00
Marco Nelissen
e8acd367ac 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." 2013-08-07 15:39:39 +00:00
Marco Nelissen
ca4553d33f 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.
 2013-08-07 08:38:12 -07:00
Marco Nelissen
7ffbcb2892 am ca5d99ac: Merge "Guarantee that all db related files are deleted together." 
* commit 'ca5d99ac41f00c282b9101d9b84da0338f15798e':
  Guarantee that all db related files are deleted together.
 2013-08-07 08:34:17 -07:00
Marco Nelissen
ca5d99ac41 Merge "Guarantee that all db related files are deleted together." 2013-08-07 15:30:51 +00:00
Dianne Hackborn
1d3ff5b454 Add new app ops method to reset all op modes. 
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
 2013-08-06 20:34:49 -07:00
jangwon.lee
740c1dd97e 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>
 2013-08-07 09:50:43 +09:00
Scott Main
ef54f611c1 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
 2013-08-06 15:35:20 -07:00
Scott Main
bdf85de3b8 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
 2013-08-06 15:30:41 -07:00
Scott Main
7b60431ba0 update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. 
bug: 10207619

Change-Id: Ia94b102f3c1476eb118c212de3246e735ffe57b6
 2013-08-06 13:17:41 -07:00
Dirk Dougherty
ec99780637 am 1153eb46: am 4e847bd1: Doc change: fix federated urls. 
* commit '1153eb46b3aa0226f6d1eac7a196052bd5d818f0':
  Doc change: fix federated urls.
 2013-08-06 10:48:48 -07:00
Dirk Dougherty
1153eb46b3 am 4e847bd1: Doc change: fix federated urls. 
* commit '4e847bd1f0c4e09f169603fde129e4433a3fe5bc':
  Doc change: fix federated urls.
 2013-08-06 10:46:37 -07:00
Dirk Dougherty
4e847bd1f0 Doc change: fix federated urls. 
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
 2013-08-06 10:01:24 -07:00
Dirk Dougherty
c5663c9f7c 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.
 2013-08-06 09:32:56 -07:00
Dirk Dougherty
8154d2932a 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.
 2013-08-06 09:30:12 -07:00
Dirk Dougherty
58c68d7759 Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 2013-08-06 07:35:28 +00:00
Wink Saville
9fe49fc56e 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
 2013-08-05 17:20:13 -07:00
Wink Saville
523db46f69 Merge "Set subscription_mode in the database to a default value" 2013-08-06 00:10:03 +00:00
Xia Wang
3a5e2013a1 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.
 2013-08-05 15:58:48 -07:00
Xia Wang
ebbcc18eaa 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.
 2013-08-05 15:54:41 -07:00
Xia Wang
4032217ee9 Merge "Add option for video playback test to accept media source path." into jb-mr2-dev 2013-08-05 22:51:03 +00:00
Wink Saville
bf34122a96 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
 2013-08-05 14:17:02 -07:00
Wink Saville
42d4f08db2 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
 2013-08-05 14:15:54 -07:00
Dianne Hackborn
6037ec56af Add new app ops method to reset all op modes. 
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
 2013-08-05 11:13:14 -07:00