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

30746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasu Nori
bcd3387eed Merge "Return count of rows in a resultset only once (when startPos = 0)" 2010-09-10 13:45:45 -07:00
Vasu Nori
b18f27dbf4 Return count of rows in a resultset only once (when startPos = 0) 
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
 2010-09-10 13:43:19 -07:00
Joe Onorato
aa03045e63 Make @deprecated without comment an error. 
Change-Id: Iaa5289fe7b48f0349fa9708c4f05144f6340b11c
 2010-09-10 15:55:44 -04:00
Joe Onorato
201480c50e Fix the last remaining @deprecated tag without comment warning. 
Change-Id: I526707233652e8092b33357d08f8ed81cd3a9e14
 2010-09-10 15:55:43 -04:00
Adam Powell
bc234a19f4 Clean up action bar styles 
Change-Id: Ib19698e08d643994c4416aac29a43e9197bbe1f3
 2010-09-10 11:51:10 -07:00
Wink Saville
ad8f2191d8 Merge "Fix bug 2972138 Lost cell data connection and didn't get it back." 2010-09-10 11:36:53 -07:00
James Dong
c18c02d78c am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread 
Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a'

* commit '2432248b03c675812dbb2154e2535bf3ada54b0a':
  Fixed a copy and paste error
 2010-09-10 11:34:15 -07:00
Eric Laurent
dd88d7e3ff am ea4680f0: am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread 
Merge commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981'

* commit 'ea4680f007c9fbc1ff73a6b161e6e83ebaeff981':
  LVM release 1.09 delivery
 2010-09-10 11:30:16 -07:00
Erik
5729ce27a9 am a388a324: Merge branch \'gingerbread-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp 
Merge commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946'

* commit 'a388a3245dfeea057bc7ec6b62e474994b3ff946':
 2010-09-10 11:30:00 -07:00
Robert Greenwalt
8a300c6107 am d4e722b7: am 34763928: Merge "add ART for inet connection condition" into gingerbread 
Merge commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004'

* commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004':
  add ART for inet connection condition
 2010-09-10 11:29:54 -07:00
Jean-Baptiste Queru
3d6b009db1 am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp 
Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373'

* commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373':
  Initial contribution from Sony Corporation.
 2010-09-10 11:29:10 -07:00
James Dong
2432248b03 am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread 
Merge commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa' into gingerbread-plus-aosp

* commit '4709c7faaa7d14b136dd3b1d8126f972ee11a1aa':
  Fixed a copy and paste error
 2010-09-10 11:25:24 -07:00
James Dong
4709c7faaa Merge "Fixed a copy and paste error" into gingerbread 2010-09-10 11:21:42 -07:00
Wink Saville
c13d4b68f8 Fix bug 2972138 Lost cell data connection and didn't get it back. 
The problem was ConnectvityService was not notified if a permanent error
occurs on the default apn.

bug: 2972138
Change-Id: Ic135f5344ae82bf743dd2097c8d2ede90c25cccb
 2010-09-10 10:52:07 -07:00
Eric Laurent
ea4680f007 am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread 
Merge commit '2814ad25578d1a52826464477da16217247c04e0' into gingerbread-plus-aosp

* commit '2814ad25578d1a52826464477da16217247c04e0':
  LVM release 1.09 delivery
 2010-09-10 10:26:51 -07:00
Eric Laurent
2814ad2557 Merge "LVM release 1.09 delivery" into gingerbread 2010-09-10 10:24:02 -07:00
Leon Scroggins
200c13d37f Do not put the selection on screen for non password fields. 
Instead, allow webkit to do it.

Requires a change to external/webkit.

Bug 2679411
Bug 2659028

Change-Id: Ibe5dfc90b13d13f7575649e4c90d5166de10dbb2
 2010-09-10 13:09:01 -04:00
Erik
a388a3245d Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp 2010-09-10 10:07:25 -07:00
Robert Greenwalt
d4e722b74f am 34763928: Merge "add ART for inet connection condition" into gingerbread 
Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp

* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
  add ART for inet connection condition
 2010-09-10 10:06:54 -07:00
Robert Greenwalt
34763928c9 Merge "add ART for inet connection condition" into gingerbread 2010-09-10 09:58:05 -07:00
Jean-Baptiste Queru
09f1e2b215 resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp 
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
 2010-09-10 09:53:43 -07:00
Robert Greenwalt
26faee3945 add ART for inet connection condition 
bug:2978624
Change-Id: I608c3d1657a4b75c42f95147ffd5e95927fc108d
 2010-09-10 09:49:04 -07:00
Shimeng (Simon) Wang
610d92f4c9 Merge "Use the default scale for text input." 2010-09-10 09:39:34 -07:00
James Dong
8d3b9100a6 Fixed a copy and paste error 
Change java/lang/IOException to java/lang/RuntimeException
since there is no java/lang/IOException while keeping
the signature of the MediaRecorder class
constructor unchanged.

Change-Id: Id9b9aa55db42bef528069ef1e2102038391bc15f
 2010-09-10 08:49:14 -07:00
Joseph Wen
94b19d3706 am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:39:10 -07:00
Joseph Wen
94db0238a3 am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:35:50 -07:00
Joseph Wen
219eb7ec84 Merge "Fix bug in JNI BitmapFactory" into gingerbread 2010-09-10 02:32:05 -07:00
Hung-ying Tyan
a97ccc02e1 am 5f93c39c: am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74'

* commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:31:05 -07:00
Joseph Wen
2dcfbefbbe Fix bug in JNI BitmapFactory 
In nativeCreateLargeBitmapFromFileDescriptor() if the file descriptor
can not be rewinded isShareable should be set to false.

Change-Id: I7dd545c9d52d21c226e11b8921e35a1d9bba9515
 2010-09-10 17:24:15 +08:00
Hung-ying Tyan
5f93c39cdb am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp

* commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:23:04 -07:00
Hung-ying Tyan
ca3c24db3a Merge "SIP: add SipErrorCode for error feedback." into gingerbread 2010-09-10 02:19:22 -07:00
Hung-ying Tyan
903e103160 SIP: add SipErrorCode for error feedback. 
Change-Id: I8b071d4933479b780a403d0bfa30511f4c23ca8f
 2010-09-10 17:15:06 +08:00
Dianne Hackborn
cfbdf8d0b5 am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb'

* commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:17:14 -07:00
Dianne Hackborn
8615fdc151 am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:14:46 -07:00
Dianne Hackborn
506d724cc3 Merge "DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!" into gingerbread 2010-09-09 23:12:24 -07:00
Dianne Hackborn
84d10ad429 am 510951e9: am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit '510951e98bdb861130f38c087956cd05e0b41dcd'

* commit '510951e98bdb861130f38c087956cd05e0b41dcd':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:11:22 -07:00
Dianne Hackborn
618b8c1e98 DO NOT MERGE. I like'd ctate's change so much I'm doin it myself! 
Change-Id: If571d3ff5e73252a0653c30ec40178ec1591ddd9
 2010-09-09 23:10:38 -07:00
Dianne Hackborn
203e9529c5 resolved conflicts for merge of 62d005ec to master 
Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd
 2010-09-09 23:06:27 -07:00
Dianne Hackborn
510951e98b am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25' into gingerbread-plus-aosp

* commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:05:42 -07:00
Dianne Hackborn
a8512a71d3 Always set the scheduling group when starting a new thread. 
Change-Id: Ia33acf13fc3752707f3819928c36315e223fa1bd
 2010-09-09 22:12:25 -07:00
Dianne Hackborn
f22c30cd81 am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'

* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
  Fix doc of fullScreenIntent.
 2010-09-09 21:39:22 -07:00
Dianne Hackborn
c6ded1ba46 am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c'

* commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c':
  Small fixes to battery stats.
 2010-09-09 21:39:13 -07:00
Dianne Hackborn
62d005ec94 am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread 
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp

* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
  Add toast when an app intercepts the launch of another app.
 2010-09-09 21:34:44 -07:00
Dianne Hackborn
033b381b4c am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp

* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
  Fix doc of fullScreenIntent.
 2010-09-09 21:34:38 -07:00
Dianne Hackborn
195dc210cb am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
 2010-09-09 21:34:33 -07:00
Dianne Hackborn
a7d868d4f9 Merge "Add toast when an app intercepts the launch of another app." into gingerbread 2010-09-09 21:31:34 -07:00
Dianne Hackborn
7f07f842c9 Merge "Fix doc of fullScreenIntent." into gingerbread 2010-09-09 21:31:08 -07:00
Dianne Hackborn
a4ce31f5e0 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00
Dianne Hackborn
0dad364adb Add toast when an app intercepts the launch of another app. 
The activity manager looks for cases where one app launches immediately
after another.  If this happens, a brief toast is shown telling the user
when app is actually running and what was originally starting.

Change-Id: If94cf5bd393dd0bc0f09789dae044fde1386c481
 2010-09-09 21:25:35 -07:00
Dirk Dougherty
6245480ce9 am 621c6adc: am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit '621c6adcb765ab348eb0daf770d4c0eca65fd632'

* commit '621c6adcb765ab348eb0daf770d4c0eca65fd632':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 19:05:39 -07:00