Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

38903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
870678a954 am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp

* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.
 2010-08-05 10:13:30 -07:00
Andreas Huber
2405988fa0 am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread 
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
 2010-08-05 10:13:26 -07:00
Andreas Huber
2c37f3d3a0 Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 2010-08-05 10:11:28 -07:00
Andreas Huber
407ec58c66 Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread 2010-08-05 10:11:18 -07:00
Kenny Root
983d4583e7 am dec43a10: Merge "Fix up PackageManager tests" into gingerbread 
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp

* commit 'dec43a102226de55307de20d5779e20a435be8b1':
  Fix up PackageManager tests
 2010-08-05 10:04:59 -07:00
Kenny Root
dec43a1022 Merge "Fix up PackageManager tests" into gingerbread 2010-08-05 10:02:30 -07:00
Jason Sams
442a647424 Support constant and varying colors in ProgramFragment. 
Change-Id: I16ce84ff427016f3a1923594efc718eca32dd7f2
 2010-08-05 10:00:21 -07:00
Andreas Huber
1f7fba1ffb A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet. 
Change-Id: I001fa36d3f5bf385b9f9d086c802673071c65db9
related-to-bug: 2896814
 2010-08-05 10:00:10 -07:00
Andreas Huber
3eaa3006a8 Better support for fake timestamps in RTP, H.263 video now also requests FIR. 
Change-Id: I2385461887197fe4062d329086e0204f6d6620fc
 2010-08-05 09:28:17 -07:00
Andreas Huber
c6d1519e54 am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp

* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
  Specification of codec specific data as part of the session description is now optional.
 2010-08-05 09:25:25 -07:00
Andreas Huber
fb86152331 Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 2010-08-05 09:18:38 -07:00
Kenny Root
d7b421b4de Fix up PackageManager tests 
PackageManagerTests was trying to mount and unmount the media without
waiting for the correct state to arrive. It was proceeding with any
state transition.

Some tests had their own volume mounting and unmounting code that was
flawed, so switch it to the more robust mountMedia() and unmountMedia()
implementations.

Change-Id: If464927bb09dd15cb040c6cce195a6ad8452de95
 2010-08-05 08:40:09 -07:00
Robert Greenwalt
208c425e84 Merge "Fix runtime reset (missing case break)." 2010-08-05 08:17:09 -07:00
Daniel Sandler
0f0b11c871 Basic support for notification payloads in the panel. 
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)

No preference given to "sticky" notifications, because
there's no such thing yet.

Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.

Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
 2010-08-05 09:34:50 -04:00
Eric Laurent
4e68d506b0 resolved conflicts for merge of acc4e683 to master 
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
 2010-08-05 02:53:22 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread 
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b528
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
 2010-08-04 23:47:38 -07:00
Chung-yih Wang
ccd0b6953f Revert "Revert "Move SIP telephony related codes to framework."" 
This reverts commit cde66df442.

Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
 2010-08-05 14:21:19 +08:00
Chung-yih Wang
bc088ddecb am cde66df4: Revert "Move SIP telephony related codes to framework." 
Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp

* commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f':
  Revert "Move SIP telephony related codes to framework."
 2010-08-04 22:33:08 -07:00
Chung-yih Wang
cde66df442 Revert "Move SIP telephony related codes to framework." 
This reverts commit b631dcf3eb.
 2010-08-05 13:25:38 +08:00
Chung-yih Wang
d088cef7da am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread 
Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp

* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
  Move SIP telephony related codes to framework.
 2010-08-04 21:18:57 -07:00
Chung-yih Wang
468e35efc5 Merge "Move SIP telephony related codes to framework." into gingerbread 2010-08-04 21:16:48 -07:00
Daniel Sandler
1a655771ef Fix runtime reset (missing case break). 
Bug: 2895437
Change-Id: If061c02811144031833f75ad47ae313e2208701c
 2010-08-04 23:57:00 -04:00
Daniel Sandler
811d66f149 am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp

* commit '9b87770f53c55a313a7fdc6f553265aabbde3446':
  Fix crash when startForeground posts a broken Notification.
 2010-08-04 20:36:09 -07:00
Daniel Sandler
9b87770f53 Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Chung-yih Wang
b631dcf3eb Move SIP telephony related codes to framework. 
+ hardcode the sip service for build dependency.

Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
 2010-08-05 11:11:58 +08:00
Oscar Montemayor
e728ca93fd Updated API after unhinding a hidden element. 
Change-Id: Ie76702bf0bf161f6ebb5a48db7d4ac89364ebafb
 2010-08-04 19:56:48 -07:00
Chung-yih Wang
bbd1a04c62 am 8c503569: Merge "Move the sip related codes to framework." into gingerbread 
Merge commit '8c5035696b0aaf30ae49594b845f663fe633ac88' into gingerbread-plus-aosp

* commit '8c5035696b0aaf30ae49594b845f663fe633ac88':
  Move the sip related codes to framework.
 2010-08-04 19:30:37 -07:00
Chung-yih Wang
8c5035696b Merge "Move the sip related codes to framework." into gingerbread 2010-08-04 19:28:23 -07:00
Chung-yih Wang
363c2ab82c Move the sip related codes to framework. 
Change-Id: Ib81dadc39b73325c8438f078c7251857a83834fe
 2010-08-05 10:25:53 +08:00
John Wang
efd938f77a am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread 
Merge commit '62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp

* commit '62f066a14afb2774569a54c150a9d0a2601dd77a':
  Add register methods in CallManager "do not merge"
 2010-08-04 18:56:37 -07:00
John Wang
62f066a14a Merge "Add register methods in CallManager "do not merge"" into gingerbread 2010-08-04 18:54:55 -07:00
Oscar Montemayor
8063589c6c Removed extra parameter tag in JavaDocs 
Change-Id: I0bc6f201d12a95a7c96b3fac90688d113a554d22
 2010-08-04 18:34:12 -07:00
Oscar Montemayor
f7c851749d Merge "Fix for SDK breakage with hidden field." 2010-08-04 18:28:43 -07:00
Oscar Montemayor
ac54fb9da1 Fix for SDK breakage with hidden field. 
Change-Id: If66c31b8823a886e9a0853b63ef9bbdf25dc9a71
 2010-08-04 18:24:14 -07:00
Scott Main
c9de8c34a3 am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;
 2010-08-04 18:05:26 -07:00
Scott Main
ef9fd39d73 am 769f9b89: am 5b86de94: fix doc bugs 
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp

* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
  fix doc bugs
 2010-08-04 18:05:22 -07:00
Vasu Nori
b6d1437f32 fix build breakage 
eclipse doesn't complain but our build does..

Change-Id: If0289b68e91e7eb2ae7a9b7bd90d5cb6b728e944
 2010-08-04 18:05:00 -07:00
Scott Main
97c2d840a1 am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread

* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
  fix some doc errors in the resources;
 2010-08-04 18:02:25 -07:00
Scott Main
769f9b8980 am 5b86de94: fix doc bugs 
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs
 2010-08-04 18:02:18 -07:00
Adam Powell
8e552630e7 Let action modes overlay window content 
Change-Id: Ic0512c3e6338e1de15facec0a6650f9da9808a24
 2010-08-04 17:42:44 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources; 
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
 2010-08-04 17:33:33 -07:00
Oscar Montemayor
2cd1dbe50d Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Scott Main
5b86de94a1 fix doc bugs 
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
 2010-08-04 17:07:36 -07:00
Kenny Root
aec3e36fd4 am 2d817f75: Free scanBuf in ZipFileRO 
Merge commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7' into gingerbread-plus-aosp

* commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7':
  Free scanBuf in ZipFileRO
 2010-08-04 17:04:29 -07:00
Kenny Root
2d817f7596 Free scanBuf in ZipFileRO 
In the success case, the 65kB scanBuf was not freed!

Also, get rid of annoying complaints about ssize_t from printf in error
cases.

Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
 2010-08-04 16:53:56 -07:00
Manuel Roman
96183e16e4 Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown" 2010-08-04 16:42:55 -07:00
Oscar Montemayor
c4c9df3d71 Merge "Device Policy Manager changes to enable Global Proxy." 2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a Merge "Avoid hostname lookup in NetworkProperties" 2010-08-04 16:07:13 -07:00
Oscar Montemayor
b8f66019ad Fix for bug 2890320 Browser crashes, after adding bookmark. 
Fixed Proxy class locking and dealing with empty exclusion lists.

Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
 2010-08-04 16:07:02 -07:00
Oscar Montemayor
69238c6a37 Device Policy Manager changes to enable Global Proxy. 
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
 2010-08-04 16:01:56 -07:00