Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,119 Commits 3 Branches 0 Tags
744f37f12d42de3f7e1b335e1c70b438ec5ff767
Commit Graph

9925 Commits

Author SHA1 Message Date
Dan Egnor
3300b6f41e am 7da38863: am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit '7da38863d4382746090bf50413b1774ab04f6bc1'

* commit '7da38863d4382746090bf50413b1774ab04f6bc1':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 15:00:27 -07:00
Adam Powell
71cbae81b0 Merge "Fix bug 2859423 - action bar: need a way to choose item in spinner" 2010-07-21 14:35:41 -07:00
Dan Egnor
7da38863d4 am 3685db7f: am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit '3685db7f5dd8a830a4e096404d4924e12697fb78' into gingerbread-plus-aosp

* commit '3685db7f5dd8a830a4e096404d4924e12697fb78':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 13:58:08 -07:00
Adam Powell
178097727f Fix bug 2859423 - action bar: need a way to choose item in spinner 
Change-Id: Idf9c222e5d8f27b4339a6df7d14f3f10dcb4be2c
 2010-07-21 13:56:35 -07:00
Dan Egnor
3685db7f5d am e8605af5: Merge "Avoid leaking file descriptors when returning drop box events." into froyo 
Merge commit 'e8605af513e846f6cd223c9e92461189727d8c9b' into gingerbread

* commit 'e8605af513e846f6cd223c9e92461189727d8c9b':
  Avoid leaking file descriptors when returning drop box events.
 2010-07-21 13:55:13 -07:00
Dan Egnor
e8605af513 Merge "Avoid leaking file descriptors when returning drop box events." into froyo 2010-07-21 13:53:23 -07:00
Chet Haase
46ea482884 Merge "Fix issue with touch MOVE events on transformed containers" 2010-07-21 13:34:23 -07:00
Ben Komalo
d6665fc48e Merge "Relay stopLoading() on the loader from LoaderInfo.stop()" 2010-07-21 13:28:45 -07:00
Chet Haase
ddc8e713ba Fix issue with touch MOVE events on transformed containers 
Change-Id: I17e58f2c6acce606a672756d48d20eb0796b69e8
 2010-07-21 13:12:53 -07:00
Ben Komalo
f5100a7823 Relay stopLoading() on the loader from LoaderInfo.stop() 
Change-Id: Ie48b303cef4fe1b284d4ed6a1b310f3dcef20c91
 2010-07-21 13:10:30 -07:00
Dan Egnor
6e6d60d4c8 Avoid leaking file descriptors when returning drop box events. 
We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise
it leaks when returning the value to the caller (the flag gets lost).  Change
the way DropBoxManager.Entry gets serialized so that it uses a bit of its own
flags value to track whether the data is a byte[] or a ParcelFileDescriptor.

Modify the dropbox unit test to add extensive checking of Entry serialization
and deserialization under various circumstances, and to include a regression
test to ensure that FD leaking doesn't happen.

Bug: 2847738
Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193
 2010-07-21 12:52:21 -07:00
Jaikumar Ganesh
0c6cb717d5 Merge "Allow multiple HID devices to be connected." 2010-07-21 12:10:35 -07:00
Jaikumar Ganesh
05a1863ceb Allow multiple HID devices to be connected. 
Change-Id: I40d9820b756c1e3bb4e773fbb78212e2716e99bf
 2010-07-21 12:08:12 -07:00
Jaikumar Ganesh
679fc4e985 Merge "Add HID to the state machine and add native call backs." 2010-07-21 11:42:21 -07:00
Tom Taylor
b1b5a1ab93 am aa0f5550: am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127'

* commit 'aa0f5550cbfe713d5a08e25b734b6b976ca1a127':
  Fix a merge problem with html mms
 2010-07-21 11:29:39 -07:00
Tom Taylor
aa0f5550cb am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp

* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
  Fix a merge problem with html mms
 2010-07-21 11:26:17 -07:00
Tom Taylor
92010ff5cf am dbac180d: Fix a merge problem with html mms 
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread

* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
  Fix a merge problem with html mms
 2010-07-21 11:22:22 -07:00
Chet Haase
0cc6f8f3a3 Merge "Add keyframes to animation framework." 2010-07-21 11:08:29 -07:00
Tom Taylor
dbac180d83 Fix a merge problem with html mms 
Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888

Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
 2010-07-21 10:49:48 -07:00
Jaikumar Ganesh
de07503a38 Add HID to the state machine and add native call backs. 
Change-Id: Ib9f3e476d4176bc04e23e7674dc54aa5a6417308
 2010-07-21 10:43:02 -07:00
The Android Open Source Project
63ae85f0e1 am 42ef77f3: merge from open-source master 
Merge commit '42ef77f3603ae54990d6718db79afae61e91dc61'

* commit '42ef77f3603ae54990d6718db79afae61e91dc61':
  Shoud specify the Resource class instance as an argument of the method
 2010-07-21 08:15:45 -07:00
The Android Open Source Project
42ef77f360 merge from open-source master 
Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
 2010-07-21 08:07:26 -07:00
Chet Haase
3dd207a6db Add keyframes to animation framework. 
Change-Id: I5c8c8037aeeedae1ce7a18200986caf57264772f
 2010-07-21 08:00:40 -07:00
Adam Powell
e4e34965a6 Fix docs 
Change-Id: Ib96b693f6da716f87c5ce963ddc69f6bad3da6be
 2010-07-20 23:16:09 -07:00
Adam Powell
ccc626618f Merge "Refactored contextual modes out of action bar." 2010-07-20 20:28:31 -07:00
Jaikumar Ganesh
c3ee99d9eb Set initial HID profile preference. 
Change-Id: I804089cbea4ad25b87ade60fa8a905ddb167bff4
 2010-07-20 19:51:58 -07:00
Adam Powell
ac695c608b Refactored contextual modes out of action bar. 
Change-Id: I1fc1c9383e5ee90f135b92a5afa8eadbf1c13d20
 2010-07-20 18:56:59 -07:00
Yu Shan Emily Lau
d1f4a17ea5 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-07-20 16:55:33 -07:00
Adam Powell
f20d6cf100 Merge "Fix a bug with closing action bar context modes" 2010-07-20 16:55:15 -07:00
Jason Parks
ed38cf9089 am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7'

* commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 16:55:01 -07:00
Dan Egnor
43b237bd95 am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67'

* commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 16:54:57 -07:00
Dan Egnor
02b77f81cf am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 16:54:38 -07:00
Adam Powell
269b8bb0cb Fix a bug with closing action bar context modes 
Change-Id: I4f11549664f11cdc02d135288e05459007dbf0c8
 2010-07-20 16:46:42 -07:00
Romain Guy
2a0a47892d Merge "Add preliminary support for text rendering." 2010-07-20 16:43:31 -07:00
Romain Guy
a1db574036 Add preliminary support for text rendering. 
Change-Id: I547eb631dbda24d13960d54b4144fb8908fd8a49
 2010-07-20 16:37:27 -07:00
Vasu Nori
487fab6837 Merge "make disableWriteAheadLogging method public so apps can disable WAL" 2010-07-20 15:36:31 -07:00
Adam Powell
1e06193c2e Merge "Make sure action bar context modes reserve space for overflow menus on all devices." 2010-07-20 14:28:19 -07:00
Adam Powell
b366bbae2b Make sure action bar context modes reserve space for overflow menus on all devices. 
Change-Id: I393f041efef3852b7f3ee57c6a4c26ba176b2702
 2010-07-20 14:26:46 -07:00
Jason Parks
bc4fcec70f am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 14:04:41 -07:00
Dan Egnor
c78f9a0e1b am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 14:04:33 -07:00
Jason Parks
29e25bd341 Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Dan Egnor
3c1363beec am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 13:59:43 -07:00
Dan Egnor
79102ad0f5 am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 13:58:57 -07:00
Dan Egnor
2f0dc6d9f5 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Danica Chang
eaeffac5fc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
Adam Powell
7bb66f3245 Merge "Action bar context mode support for overflow, submenus" 2010-07-20 12:15:08 -07:00
Adam Powell
2c9c9fe806 Action bar context mode support for overflow, submenus 
Change-Id: I951ae179698b08b6aba5b174b3d47f0cf847352e
 2010-07-20 12:08:07 -07:00
Dan Egnor
341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread 
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
 2010-07-20 11:30:17 -07:00
Jean-Baptiste Queru
99a518ffab resolved conflicts for merge of ca48433a to master 
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
 2010-07-20 10:40:17 -07:00
Jason Parks
94b916da2c Only print out wake locks in the if the wakelock was held. 
Change-Id: I742121b70bd0e56ca2efe05fffa9fe3e4ad7b619
 2010-07-20 12:39:07 -05:00