Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,653 Commits 3 Branches 0 Tags
6fc97b35008b9df10085ee24ca71ec58fc2f74ae
Commit Graph

26653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
6fc97b3500 am 93548db6: fix build 
Merge commit '93548db645dd4fd2b9c1dd270421ac0b38de720e' into gingerbread-plus-aosp

* commit '93548db645dd4fd2b9c1dd270421ac0b38de720e':
  fix build
 2010-09-10 13:03:24 -07:00
Joe Onorato
ebdac324a8 am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 
Merge commit '81fe092d11607912944a49c47df6c14e28a977b8' into gingerbread-plus-aosp

* commit '81fe092d11607912944a49c47df6c14e28a977b8':
  Make @deprecated without a comment an error DO NOT MERGE
 2010-09-10 12:49:15 -07:00
Joe Onorato
fb71733b35 am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp

* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
  Fix the last remaining @deprecated tag without comment warning.
 2010-09-10 12:46:52 -07:00
Joe Onorato
81fe092d11 Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread 2010-09-10 12:45:18 -07:00
Joe Onorato
7c8258d064 Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread 2010-09-10 12:44:36 -07:00
Scott Main
4cf0f45d65 am 3b202844: am 51c18989: docs: update platform dashboard 
Merge commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64' into gingerbread-plus-aosp

* commit '3b202844fef5eb1a213bd7108dd1b6d42b1d9c64':
  docs: update platform dashboard
 2010-09-10 12:39:57 -07:00
Scott Main
3b202844fe am 51c18989: docs: update platform dashboard 
Merge commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068' into gingerbread

* commit '51c18989cf44d14a7ff82c45d9886b7ea55bd068':
  docs: update platform dashboard
 2010-09-10 12:34:06 -07:00
Joe Onorato
e94f6db177 Make @deprecated without a comment an error DO NOT MERGE 
(do not merge because in master, this error has a different code 114 instead of 14)

Change-Id: Iffc58423a8e972f3f59edfe6668beac4b65182e0
 2010-09-10 15:02:06 -04:00
Joe Onorato
4d8cc7bdf4 Fix the last remaining @deprecated tag without comment warning. 
Change-Id: Id4c50dee743fa781ca3f470f97ed76d1501f7222
 2010-09-10 15:01:35 -04:00
Scott Main
51c18989cf docs: update platform dashboard 
Change-Id: Id4acf3ca425b278e534f83511fb10dfdbdceb03b
 2010-09-10 11:46:17 -07:00
Wink Saville
8d8fce8821 am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread 
Merge commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2' into gingerbread-plus-aosp

* commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2':
  Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
 2010-09-10 11:32:36 -07:00
Wink Saville
9a3ce10c6c Merge "Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE." into gingerbread 2010-09-10 11:30:15 -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
887f2e401e Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE. 
The problem was ConnectvityService was not notified if a permanent error
occurs on the default apn.

bug: 2972138
Change-Id: I7be17061695ae2ba3571d70f24dcc4fe96d9ede9
 2010-09-10 10:50:31 -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
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
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
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
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
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
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
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
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
621c6adcb7 am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit 'a71d69947d4a74730b17021b4c809d054d66c741' into gingerbread-plus-aosp

* commit 'a71d69947d4a74730b17021b4c809d054d66c741':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 18:59:57 -07:00
Dirk Dougherty
a71d69947d am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48' into gingerbread

* commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 18:53:36 -07:00
Dirk Dougherty
74a74d3c35 Doc change: Fixes for toggle image and adt release date. 
Change-Id: I2e76a42650c3ab54e597340cd96e4f7b23fe5116
 2010-09-09 18:40:13 -07:00
Rich Cannings
736984573a am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread 
Merge commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0' into gingerbread-plus-aosp

* commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0':
  Remove the use of FileInputStream.available()
 2010-09-09 16:45:34 -07:00
Dianne Hackborn
b8071d790a Small fixes to battery stats. 
Change-Id: Ibbf7c548a8e787a046de3659094cea64908e3deb
 2010-09-09 16:45:15 -07:00
Dianne Hackborn
392fea53ec Fix doc of fullScreenIntent. 
Change-Id: Ieb21bb92b4ebf95f831231f2871839fec8a97a86
 2010-09-09 16:44:01 -07:00
Andreas Huber
0d661b5eb4 am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp

* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
 2010-09-09 16:42:17 -07:00
Rich Cannings
6bff8c7994 Merge "Remove the use of FileInputStream.available()" into gingerbread 2010-09-09 16:41:29 -07:00
Andreas Huber
ff4c57ade4 Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 2010-09-09 16:39:09 -07:00