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

30979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brett Chabot
4940ff85d5 Update to new ddmlib-prebuilt api. 
Change-Id: Ib99f5eab2b4ecfde8461f93676f0dbd1f1b38241
 2010-09-09 20:38:54 -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
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
Adam Cohen
1a28bbb99d Merge "Fixing a bug where StackView wasn't always laid out correctly upon loading" 2010-09-09 18:48:09 -07:00
Adam Cohen
f04e22571f Fixing a bug where StackView wasn't always laid out 
correctly upon loading

Change-Id: Iab80262be05dae949998a6193856fb7bbe297117
 2010-09-09 18:42:13 -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
Xavier Ducrohet
89fef4183a Merge "Avoid pre-processing images when they won't be used" 2010-09-09 18:30:59 -07:00
Winson Chung
2f803bea32 Merge "Adding some error handling to RemoteViewsAdapter, removing artificial loading delay." 2010-09-09 17:53:36 -07:00
Rich Cannings
d14f0dfd58 am 73698457: am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread 
Merge commit '736984573a1975d69d1c6efd87e4af9ca16e505f'

* commit '736984573a1975d69d1c6efd87e4af9ca16e505f':
  Remove the use of FileInputStream.available()
 2010-09-09 16:51:53 -07:00
Andreas Huber
2004ebfde3 am 0d661b5e: am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 
Merge commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055'

* commit '0d661b5eb42aba49de8d4d6ddc5140a8b2348055':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
 2010-09-09 16:48:58 -07:00
Winson Chung
fbc3590f40 Adding some error handling to RemoteViewsAdapter, removing artificial loading delay. 
Change-Id: I9cff6045086f0959ace65c2210fa3b9341f5aa5e
 2010-09-09 16:45:38 -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
Wu-cheng Li
477e49a3dd Merge "Only enable CAMERA_MSG_PREVIEW_FRAME when necessary." 2010-09-09 16:31:13 -07:00
Rich Cannings
8d578836dc Remove the use of FileInputStream.available() 
Bug: 2976294
Change-Id: I34b13cedbf1d2338163ef74454817c318a3a24f5
 2010-09-09 16:28:48 -07:00
Wu-cheng Li
d02c812a21 Only enable CAMERA_MSG_PREVIEW_FRAME when necessary. 
Now camera driver uses ANativeWindow for display.
CameraService should not request preview callback from
camera hardware if applications have not requested it.

bug:2951018
Change-Id: I85f74ea4a61104feca018867bc9d6dfe3a9479f5
 2010-09-09 16:23:35 -07:00
Jean-Baptiste Queru
beeb71dfd4 fix build 
Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
 2010-09-09 16:16:14 -07:00
Andreas Huber
4b3d32bb1b TimedEventQueue now explicitly sets its scheduling policy to foreground as it should. 
Change-Id: I630c9fb51686d87a4075f01a6d7f6f9139ddcb4b
related-to-bug: 2944452
 2010-09-09 16:14:02 -07:00
Jean-Baptiste Queru
862438eb69 fix build 
Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
 2010-09-09 16:10:32 -07:00
Jaikumar Ganesh
55ecdc6993 am 41506304: (-s ours) am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 
Merge commit '41506304b86a9c9a605e8b96318e61f0f8f6a235'

* commit '41506304b86a9c9a605e8b96318e61f0f8f6a235':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
 2010-09-09 16:10:12 -07:00
Mike Lockwood
dc936251c4 am 91cf049f: am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 
Merge commit '91cf049f34b4f3d53d39e868104f11156a332b65'

* commit '91cf049f34b4f3d53d39e868104f11156a332b65':
  Only pulse notification light if a new notification has been received since the screen was last turned off
 2010-09-09 16:10:00 -07:00
Henrik Backlund
ecad4545d5 am f49b052d: am a79c8291: Fix to get A2DP to connect after unpairing 
Merge commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e'

* commit 'f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e':
  Fix to get A2DP to connect after unpairing
 2010-09-09 16:09:54 -07:00
Jaikumar Ganesh
41506304b8 am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
 2010-09-09 16:05:43 -07:00
Mike Lockwood
91cf049f34 am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp

* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
  Only pulse notification light if a new notification has been received since the screen was last turned off
 2010-09-09 16:05:38 -07:00
Jean-Baptiste Queru
7547b8eac6 fix build 
Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
 2010-09-09 16:02:22 -07:00
Gilles Debunne
a01cf7aa26 Merge "Revert "update-api step missing from 65349"" 2010-09-09 15:58:51 -07:00
Christopher Tate
c32e3275fe Merge "Don't crash in batterystats" 2010-09-09 15:53:09 -07:00