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

106772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Elliott Hughes
eab8e18d8f 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.
 2013-08-05 11:07:13 -07:00
Elliott Hughes
8a736129fa Merge "If graphics wants ASCII lowercasing, it needs to ask for it." 2013-08-05 18:01:33 +00:00
Dianne Hackborn
c8911ddd48 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.
 2013-08-02 19:32:13 -07:00
Dianne Hackborn
373a2f1566 am 607b414d: Add new app ops method to reset all op modes. 
* commit '607b414d0444067e166fa54d8ea37563f2715ea3':
  Add new app ops method to reset all op modes.
 2013-08-02 19:30:08 -07:00
Dianne Hackborn
607b414d04 Add new app ops method to reset all op modes. 
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
 2013-08-02 19:06:25 -07:00
Jean-Baptiste Queru
ae311f4c5f am 17548b3c: Revert "be more robust with handling unknown sensors" 
* commit '17548b3c70fe4f29d33367a61300f5323f5efe99':
  Revert "be more robust with handling unknown sensors"
 2013-08-02 17:42:02 -07:00
Jean-Baptiste Queru
d07347eddb am 83485dc9: Merge "be more robust with handling unknown sensors" 
* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
  be more robust with handling unknown sensors
 2013-08-02 17:41:59 -07:00
Elliott Hughes
710f3e2cc6 am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it." 
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
  If frameworks wants ASCII casing, it should explicity ask for it.
 2013-08-02 17:41:57 -07:00
Elliott Hughes
b56f10aa66 am 32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it." 
* commit '32c308a5f2051a62ab2fb3337d00d84e9035eb9a':
  If media wants ASCII lowercasing, it needs to ask for it.
 2013-08-02 17:41:54 -07:00
Dirk Dougherty
966dc871ca am 780795dc: am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit '780795dc198c05d5a1a181c58317dc6befec861d':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:41:05 -07:00
Scott Main
24a32c98a5 am e0a85960: am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit 'e0a8596020a10c1cf6347d89fea862d41629db04':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:41:02 -07:00
Dirk Dougherty
780795dc19 am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit 'b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:38:31 -07:00
Scott Main
e0a8596020 am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit '9a0087f22754de40cd5be2a738600f9642a611cc':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:38:28 -07:00
Jean-Baptiste Queru
17548b3c70 Revert "be more robust with handling unknown sensors" 
This reverts commit 80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
 2013-08-02 17:31:54 -07:00
Jean-Baptiste Queru
83485dc920 Merge "be more robust with handling unknown sensors" 2013-08-03 00:13:24 +00:00
Dirk Dougherty
b6cb0437ef Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 2013-08-02 22:49:11 +00:00
Scott Main
9a0087f227 Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 2013-08-02 22:27:14 +00:00
Elliott Hughes
60ae2617b4 Merge "If frameworks wants ASCII casing, it should explicity ask for it." 2013-08-02 22:13:07 +00:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
 2013-08-02 15:12:32 -07:00
Scott Main
efd288a261 am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:29:09 -07:00
Scott Main
2a6666207d am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '1f19690322523d5a28051c55353735513638ca39':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:27:40 -07:00