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

40462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
fdbc3f7cdb am d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread 
* commit 'd0725eef671c059b8e26d900fee655747f506dbe':
  Never drag scroll views with no children. (DO NOT MERGE)
 2011-01-27 19:41:07 -08:00
Mathias Agopian
570137a2b1 am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread 
* commit 'a0bafb471385767f7c9c91efe7fd828b069b2e97':
  Use EGL_NATIVE_VISUAL_ID to select EGLConfig
 2011-01-27 18:39:21 -08:00
Andreas Huber
3a224ecaba am e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread 
* commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
  DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
 2011-01-27 18:38:21 -08:00
Nick Pelly
2478e617c4 resolved conflicts for merge of b7d6ffd7 to honeycomb-merge 
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
 2011-01-27 18:35:19 -08:00
Nick Pelly
51ee9c1367 am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread 
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
  Support for TagLostException (API).
 2011-01-27 18:29:13 -08:00
Brad Fitzpatrick
0613ee5afb am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread 
* commit '597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
  Watchdog can get deadlocked on activity manager
 2011-01-27 18:28:54 -08:00
Nick Pelly
4990b515c8 am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread 
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
  Fix javadoc which broke build.
 2011-01-27 18:28:25 -08:00
Eric Laurent
a03ebe9851 resolved conflicts for merge of 00118a48 to honeycomb-merge 
Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
 2011-01-27 18:25:32 -08:00
Nick Pelly
16fad45bb5 am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread 
* commit 'e4dd154c08b04090bad8f450450e13163d5fef9b':
  hange the default IsoDep timeout to 300ms (docs update).
 2011-01-27 17:29:59 -08:00
Mathias Agopian
14f3d86267 am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread 
* commit '12d014fdf40f69512e59e84914b230a2d3e7b8eb':
  fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
 2011-01-27 17:28:47 -08:00
Amith Yamasani
b0f6766bcc am 68153821: (-s ours) Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread 
* commit '68153821481f748ecbd2493bfd417005686960e0':
  Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
 2011-01-27 17:28:31 -08:00
Irfan Sheriff
08643095a1 am 4170b463: Merge "Do not add unsolicited events to queue" into gingerbread 
* commit '4170b46329ed91e81cf22dba82e2dadc326b3e3d':
  Do not add unsolicited events to queue
 2011-01-27 17:04:07 -08:00
Jeff Brown
e3939e59d6 am 41395459: (-s ours) Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread 
* commit '41395459e676cf9ab4059e08446656f145662c2d':
  Filter virtual keys after touches.  (DO NOT MERGE)
 2011-01-27 17:03:51 -08:00
Martijn Coenen
216a5e72a1 am 07e6f616: Check NDEF before calling makeReadOnly(). 
* commit '07e6f616d122496342a5bae51323bb218d88f7f2':
  Check NDEF before calling makeReadOnly().
 2011-01-27 17:03:19 -08:00
Nick Pelly
0cad3d23d3 resolved conflicts for merge of a701cf85 to honeycomb-merge 
Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070
 2011-01-27 16:59:02 -08:00
Mathias Agopian
50f7830c55 am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread 
* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
  Fix the ISurfaceComposer onTransact switch.
 2011-01-27 11:24:33 -08:00
Jeff Hamilton
fb69e0c0ff resolved conflicts for merge of 0716ea14 to honeycomb-merge 
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
 2011-01-27 12:29:27 -06:00
Jeff Hamilton
5e2113ff27 resolved conflicts for merge of 3a223404 to honeycomb-merge 
Change-Id: I0eb1f3a271797c78d9ec5b2528a221c89973a83c
 2011-01-27 11:27:58 -06:00
Kenny Root
42bb07dc3f am 524133cc: (-s ours) Remove API that snuck into MockPackageManager 
* commit '524133cc793b5e372cc97c62653281605f57b5b3':
  Remove API that snuck into MockPackageManager
 2011-01-27 09:18:10 -08:00
Kenny Root
b3d6405a22 am 34d2b41e: (-s ours) Revert "Add the {get,set}PackageObbPaths calls to API" 
* commit '34d2b41e48281d1df2c844e004740f008e699093':
  Revert "Add the {get,set}PackageObbPaths calls to API"
 2011-01-27 09:00:18 -08:00
Jeff Brown
98cb33ff62 am 4a2e478a: Merge "Flush Binder commands in ndk looper." into gingerbread 
* commit '4a2e478a5bf6b4650181d1dfa643eadcc387fcec':
  Flush Binder commands in ndk looper.
 2011-01-27 08:47:18 -08:00
Jeff Hamilton
992f75bcd0 resolved conflicts for merge of 6687ecb4 to honeycomb-merge 
Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec
 2011-01-27 10:44:21 -06:00
Nick Pelly
56d39d1e03 am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread 
* commit 'b73203ab7e308b747819de2b2400afe971ef3bff':
  Make sure service handles are live before passing to other objects.
 2011-01-27 08:13:03 -08:00
James Dong
512cd2ec2d am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread 
* commit '83fdc69ea0beb715dd45f0a4285cb5d780f8018a':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.
 2011-01-27 08:12:36 -08:00
Jaikumar Ganesh
0c5f14bd89 am a788a943: (-s ours) Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread 
* commit 'a788a9430956dabbc1387e5cccc15f9f41639c95':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.
 2011-01-27 08:12:18 -08:00
Dianne Hackborn
3bd6b7c264 am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread 
* commit '29c99aaaaed00c605fb6cd64de169fafad0e40ed':
  Added check to make orientation calculations more robust
 2011-01-27 08:11:51 -08:00
Dianne Hackborn
19769b49d2 am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread 
* commit 'c058bf0043290f098fb487ee33e0da13f00134f2':
  Make the Phone options dialog use current language
 2011-01-27 08:11:34 -08:00
Kenny Root
17ff751695 am ea6bf362: (-s ours) Deep clone settings for system package update DO NOT MERGE 
* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9':
  Deep clone settings for system package update DO NOT MERGE
 2011-01-26 21:55:56 -08:00
Eric Fischer
f274eaed9d am 5a40b8ef: (-s ours) Merge "Add date format and map center resources for new locales." into gingerbread 
* commit '5a40b8ef81034e00f886010c71dccd62b919028b':
  Add date format and map center resources for new locales.
 2011-01-26 21:44:48 -08:00
Jeff Hamilton
7ef536ad2e resolved conflicts for merge of 52d3203e to honeycomb-merge 
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
 2011-01-26 23:26:16 -06:00
Wei-Ta Chen
50234d7dcd am 61d9ffbf: (-s ours) Merge "Do not merge." into gingerbread 
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
  Do not merge.
 2011-01-26 21:14:34 -08:00
Jeff Hamilton
c2981f4fbd resolved conflicts for merge of 4330b146 to honeycomb-merge 
Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a
 2011-01-26 23:09:13 -06:00
Nick Pelly
6165985652 am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread 
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
 2011-01-26 20:40:46 -08:00
Kenny Root
558f8b8676 am e8c04db7: (-s ours) Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
  Add the {get,set}PackageObbPaths calls to API
 2011-01-26 20:40:17 -08:00
Jaikumar Ganesh
d8171e65f9 am c8f42fb6: (-s ours) Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
  DO NOT MERGE: Remove auto connection on ACL connection.
 2011-01-26 16:19:55 -08:00
Eric Laurent
7cd7ac1290 am bec4abaa: Merge "Fix issue 3302649." into gingerbread 
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.
 2011-01-26 16:19:34 -08:00
Justin Ho
81c4c37ffd am 7b667a0c: (-s ours) Merge "Updated flightmode assets" into gingerbread 
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
  Updated flightmode assets
 2011-01-26 16:19:13 -08:00
Kenny Root
ba031e2e8a am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread 
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
  Allow updated system apps to retain priority
 2011-01-26 13:04:03 -08:00
Andreas Huber
5a18073c02 am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed. 
* commit '7c6153606cc963191362494c8cb5669749e84326':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
 2011-01-26 11:02:10 -08:00
Andreas Huber
0c8ae8027b am 7e2f9cc8: (-s ours) DO NOT MERGE: Fix Matroska issues 
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
  DO NOT MERGE: Fix Matroska issues
 2011-01-26 11:01:50 -08:00
Andreas Huber
72bd5d8217 am e7fbfb6b: (-s ours) Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread 
* commit 'e7fbfb6b745f56eeb394785932451aa0f2aa07d9':
  DO NOT MERGE: Fix parsing of ntp= PLAY response.
 2011-01-26 11:01:14 -08:00
Kenny Root
f4b2c0422c am 91c459ec: Copy user info from PackageSetting as well 
* commit '91c459ec7dba6d56816ff5cbd92c627e0f718915':
  Copy user info from PackageSetting as well
 2011-01-26 11:00:20 -08:00
Chung-yih Wang
72cadd2b44 am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread 
* commit '65ba2c421c19fde04e6b294087a5a9c507964575':
  Add auth. username in SipProfile.
 2011-01-26 10:59:51 -08:00
Jeff Hamilton
71208ce454 resolved conflicts for merge of ca36d863 to honeycomb-merge 
Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835
 2011-01-26 11:27:51 -06:00
Martijn Coenen
59ad6ed879 am 25be5365: Implement canMakeReadonly(). 
* commit '25be53652167300183282d170a00a6df576523f5':
  Implement canMakeReadonly().
 2011-01-25 16:16:53 -08:00
James Dong
2188caf172 am 13d1cb56: (-s ours) Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread 
* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
 2011-01-25 16:16:32 -08:00
Nick Pelly
01a2868985 am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread 
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
 2011-01-25 16:16:05 -08:00
Nick Pelly
30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge 
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
 2011-01-25 16:13:17 -08:00
Dianne Hackborn
318041d41c am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread 
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
  Referencing of "r.record.name" is occured, when "r.record" is null.
 2011-01-25 15:52:15 -08:00
Chris Tate
b14abaa352 am bbff7ed4: (-s ours) DO NOT MERGE : Ensure that the first post-restore backup pass is correct 
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
  DO NOT MERGE : Ensure that the first post-restore backup pass is correct
 2011-01-25 15:51:54 -08:00