OSDN Git Service

android-x86/frameworks-native.git
13 years agoKill the global references in the OpenGL wrappers.
Elliott Hughes [Sat, 9 Apr 2011 03:01:01 +0000 (20:01 -0700)]
Kill the global references in the OpenGL wrappers.

Just use jniThrowException instead. Note that it would be trivial to throw
seemingly more appropriate exceptions (NullPointerException and
OutOfMemoryException in particular), but I'm only attempting to preserve
existing behavior here.

I also found shadowing bugs in some of the special-case functions, which
would previously always have leaked memory.

This also moves an accidental change to a generated file (ActivityThread ->
AppGlobals) into the generator, so it won't be overwritten in future.

Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590

13 years agoMerge "Tidy up exception throwing in the media native code."
Elliott Hughes [Sat, 9 Apr 2011 01:37:01 +0000 (18:37 -0700)]
Merge "Tidy up exception throwing in the media native code."

13 years agoMerge "Rework thumbnails in activity manager."
Dianne Hackborn [Sat, 9 Apr 2011 01:28:14 +0000 (18:28 -0700)]
Merge "Rework thumbnails in activity manager."

13 years agoam 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
Jamie Gennis [Sat, 9 Apr 2011 00:43:33 +0000 (17:43 -0700)]
am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
  Stagefright: authenticate ANativeWindow.

13 years agoam 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
Jamie Gennis [Sat, 9 Apr 2011 00:41:38 +0000 (17:41 -0700)]
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
  Stagefright: authenticate ANativeWindow.

13 years agoam 66380f76: Stagefright: authenticate ANativeWindow.
Jamie Gennis [Sat, 9 Apr 2011 00:40:00 +0000 (17:40 -0700)]
am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
  Stagefright: authenticate ANativeWindow.

13 years agoam da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
Robert Greenwalt [Sat, 9 Apr 2011 00:23:50 +0000 (17:23 -0700)]
am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE

* commit 'da2790fa0adc187440c35261256c9989ca1b6ed8':
  Make ApnSettings threadsafe.

13 years agoam 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
Robert Greenwalt [Sat, 9 Apr 2011 00:21:43 +0000 (17:21 -0700)]
am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE

* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
  Make ApnSettings threadsafe.

13 years agoMerge "Make ApnSettings threadsafe." into honeycomb-LTE
Robert Greenwalt [Sat, 9 Apr 2011 00:19:53 +0000 (17:19 -0700)]
Merge "Make ApnSettings threadsafe." into honeycomb-LTE

13 years agoMerge "Use the new API file format, and some minor tweaks to the old XML files that...
Joe Onorato [Sat, 9 Apr 2011 00:10:57 +0000 (17:10 -0700)]
Merge "Use the new API file format, and some minor tweaks to the old XML files that make the parser easier."

13 years agoam ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:44:42 +0000 (16:44 -0700)]
am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
  Fix getActiveApnTypes for GsmDCT.

13 years agoam de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into...
Robert Greenwalt [Fri, 8 Apr 2011 23:44:32 +0000 (16:44 -0700)]
am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE

* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
  Fix notification of disconnected networks.

13 years agoam 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:38:39 +0000 (16:38 -0700)]
am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
  Fix getActiveApnTypes for GsmDCT.

13 years agoam ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:38:34 +0000 (16:38 -0700)]
am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE

* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
  Fix notification of disconnected networks.

13 years agoMerge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:31:03 +0000 (16:31 -0700)]
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

13 years agoMerge "Fix notification of disconnected networks." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:22:06 +0000 (16:22 -0700)]
Merge "Fix notification of disconnected networks." into honeycomb-LTE

13 years agoMerge "More JNI exception-throwing cleanup."
Elliott Hughes [Fri, 8 Apr 2011 23:15:26 +0000 (16:15 -0700)]
Merge "More JNI exception-throwing cleanup."

13 years agoMerge "Add keychain user with special keystore access permissions"
Brian Carlstrom [Fri, 8 Apr 2011 22:40:06 +0000 (15:40 -0700)]
Merge "Add keychain user with special keystore access permissions"

13 years agoam 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmDataConnecti...
Wink Saville [Fri, 8 Apr 2011 22:31:24 +0000 (15:31 -0700)]
am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

* commit '4a28096dec16666d9425cb8e23641985f963a4f3':
  Check different CellLocation type in GsmDataConnectionTracker

13 years agoam 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
Robert Greenwalt [Fri, 8 Apr 2011 22:31:21 +0000 (15:31 -0700)]
am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.

* commit '01f8f290cd2c01c7ed9a1966f39fa74032352dc8':
  Rename PhoneBase's DataConnectionTracker member.

13 years agoMerge "resolved conflicts for merge of 4b1a37d7 to master"
Wink Saville [Fri, 8 Apr 2011 22:25:14 +0000 (15:25 -0700)]
Merge "resolved conflicts for merge of 4b1a37d7 to master"

13 years agoresolved conflicts for merge of 4b1a37d7 to master
Wink Saville [Fri, 8 Apr 2011 21:57:51 +0000 (14:57 -0700)]
resolved conflicts for merge of 4b1a37d7 to master

Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188

13 years agoMerge "TextLayoutCache - add glyphs caching"
Fabrice Di Meglio [Fri, 8 Apr 2011 21:51:08 +0000 (14:51 -0700)]
Merge "TextLayoutCache - add glyphs caching"

13 years agoAdd keychain user with special keystore access permissions
Brian Carlstrom [Fri, 8 Apr 2011 20:44:08 +0000 (13:44 -0700)]
Add keychain user with special keystore access permissions

Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69

13 years agoam 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker...
Wink Saville [Fri, 8 Apr 2011 20:23:24 +0000 (13:23 -0700)]
am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
  Check different CellLocation type in GsmDataConnectionTracker

13 years agoMerge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
Wink Saville [Fri, 8 Apr 2011 20:20:20 +0000 (13:20 -0700)]
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

13 years agoam 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
Robert Greenwalt [Fri, 8 Apr 2011 19:23:49 +0000 (12:23 -0700)]
am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.

* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
  Rename PhoneBase's DataConnectionTracker member.

13 years agoam 5203a5bc: Cleanup debugging.
Wink Saville [Fri, 8 Apr 2011 18:35:11 +0000 (11:35 -0700)]
am 5203a5bc: Cleanup debugging.

* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
  Cleanup debugging.

13 years agoam b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into...
Wink Saville [Fri, 8 Apr 2011 17:44:43 +0000 (10:44 -0700)]
am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
  DataConnection: set CID to the correct value.

13 years agoam 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
Wink Saville [Fri, 8 Apr 2011 17:41:09 +0000 (10:41 -0700)]
am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

* commit '1905e166ed40ee11e80476848ef40e817512f740':
  DataConnection: set CID to the correct value.

13 years agoMerge "DataConnection: set CID to the correct value." into honeycomb-LTE
Wink Saville [Fri, 8 Apr 2011 17:38:25 +0000 (10:38 -0700)]
Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

13 years agoMerge "Tolerate missing AccountManager resource, not just missing resource name"
Brian Carlstrom [Fri, 8 Apr 2011 17:28:34 +0000 (10:28 -0700)]
Merge "Tolerate missing AccountManager resource, not just missing resource name"

13 years agoam 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 17:11:43 +0000 (10:11 -0700)]
am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

* commit '2ce73e77c99effb9521db15c882529ccbafd57a6':
  Fix isApnTypeActive in GDCT.

13 years agoam 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 17:09:03 +0000 (10:09 -0700)]
am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
  Fix isApnTypeActive in GDCT.

13 years agoMerge "Use jniThrowException for exception throwing from native code."
Elliott Hughes [Fri, 8 Apr 2011 17:08:19 +0000 (10:08 -0700)]
Merge "Use jniThrowException for exception throwing from native code."

13 years agoMerge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 17:07:31 +0000 (10:07 -0700)]
Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

13 years agoam e3e535a9: am 4410660e: Fix ISO country code of Slovenia.
Robert Greenwalt [Fri, 8 Apr 2011 17:07:26 +0000 (10:07 -0700)]
am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.

* commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727':
  Fix ISO country code of Slovenia.

13 years agoam 4410660e: Fix ISO country code of Slovenia.
Robert Greenwalt [Fri, 8 Apr 2011 17:05:01 +0000 (10:05 -0700)]
am 4410660e: Fix ISO country code of Slovenia.

* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
  Fix ISO country code of Slovenia.

13 years agoMerge "Don't send pause again when coming back from full screen"
Teng-Hui Zhu [Fri, 8 Apr 2011 16:19:01 +0000 (09:19 -0700)]
Merge "Don't send pause again when coming back from full screen"

13 years agoMerge "Add camera focus area API."
Wu-cheng Li [Fri, 8 Apr 2011 09:47:39 +0000 (02:47 -0700)]
Merge "Add camera focus area API."

13 years agoMerge "Improve activity manager debug dumps."
Dianne Hackborn [Fri, 8 Apr 2011 01:46:54 +0000 (18:46 -0700)]
Merge "Improve activity manager debug dumps."

13 years agoam 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counte...
Nicolas Roard [Fri, 8 Apr 2011 00:27:53 +0000 (17:27 -0700)]
am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit '16d8de7a293e5d626823a59f2d8b74e0d4a75cbd':
  Remove uncalled function -- java counterpart of the fix for bug:4183801

13 years agoam 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of...
Nicolas Roard [Fri, 8 Apr 2011 00:25:56 +0000 (17:25 -0700)]
am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
  Remove uncalled function -- java counterpart of the fix for bug:4183801

13 years agoam fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug...
Nicolas Roard [Fri, 8 Apr 2011 00:24:05 +0000 (17:24 -0700)]
am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
  Remove uncalled function -- java counterpart of the fix for bug:4183801

13 years agoMerge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into...
Nicolas Roard [Fri, 8 Apr 2011 00:21:53 +0000 (17:21 -0700)]
Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

13 years agoMerge "Fix crash in bug 4259574"
Adam Cohen [Fri, 8 Apr 2011 00:12:19 +0000 (17:12 -0700)]
Merge "Fix crash in bug 4259574"

13 years agoMerge "Add params for primary account to ContactsContract"
Daisuke Miyakawa [Fri, 8 Apr 2011 00:03:18 +0000 (17:03 -0700)]
Merge "Add params for primary account to ContactsContract"

13 years agoam 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technolog...
Wink Saville [Thu, 7 Apr 2011 23:53:34 +0000 (16:53 -0700)]
am 5f66c953: am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

* commit '5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.

13 years agoam 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to...
Wink Saville [Thu, 7 Apr 2011 23:51:50 +0000 (16:51 -0700)]
am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

* commit '7183a7a584397142ab7347d6f721011d743fb699':
  Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.

13 years agoMerge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall...
Wink Saville [Thu, 7 Apr 2011 23:49:02 +0000 (16:49 -0700)]
Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

13 years agoMerge "Fix build."
Robert Greenwalt [Thu, 7 Apr 2011 23:01:46 +0000 (16:01 -0700)]
Merge "Fix build."

13 years agoam 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug...
Bill Gruber [Thu, 7 Apr 2011 22:20:16 +0000 (15:20 -0700)]
am 60bfa4d0: am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '60bfa4d0f5d55eb474146330be7f5404521b1c67':
  IAB docs--status codes fix Bug: 4208641

13 years agoam 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
Bill Gruber [Thu, 7 Apr 2011 22:17:26 +0000 (15:17 -0700)]
am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '216d98949ddeb84359836594ab00be158d69545e':
  IAB docs--status codes fix Bug: 4208641

13 years agoam 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
Bill Gruber [Thu, 7 Apr 2011 22:14:54 +0000 (15:14 -0700)]
am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
  IAB docs--status codes fix Bug: 4208641

13 years agoam afecd1e9: IAB docs--status codes fix Bug: 4208641
Bill Gruber [Thu, 7 Apr 2011 22:09:33 +0000 (15:09 -0700)]
am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
  IAB docs--status codes fix Bug: 4208641

13 years agoam de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for...
Wink Saville [Thu, 7 Apr 2011 21:31:20 +0000 (14:31 -0700)]
am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

* commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a':
  ConnectivityService needs to use the new names for the NetConfig vars.

13 years agoam 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig...
Wink Saville [Thu, 7 Apr 2011 21:29:17 +0000 (14:29 -0700)]
am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
  ConnectivityService needs to use the new names for the NetConfig vars.

13 years agoMerge "ConnectivityService needs to use the new names for the NetConfig vars." into...
Wink Saville [Thu, 7 Apr 2011 21:28:06 +0000 (14:28 -0700)]
Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

13 years agoam 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24...
Teng-Hui Zhu [Thu, 7 Apr 2011 21:27:03 +0000 (14:27 -0700)]
am 4e790ee1: (-s ours) am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '4e790ee1894118a1ab2032d09e5016fa9414dae7':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoam 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 21:24:22 +0000 (14:24 -0700)]
am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoam 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not...
Xavier Ducrohet [Thu, 7 Apr 2011 21:24:00 +0000 (14:24 -0700)]
am 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from  do not merge.

* commit '65ef6e8690cc13e9e20582fd0236b18eaae204b9':
  Merge 59aad78e from master. do not merge.

13 years agoam bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 21:22:33 +0000 (14:22 -0700)]
am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoam f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Robert Greenwalt [Thu, 7 Apr 2011 21:22:03 +0000 (14:22 -0700)]
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
  Add external dependency API.

13 years agoam 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge.
Xavier Ducrohet [Thu, 7 Apr 2011 21:18:20 +0000 (14:18 -0700)]
am 96ac8560: am 515a08b0: Merge 59aad78e from  do not merge.

* commit '96ac85607b1462508981936b1be29ae5f9e4271d':
  Merge 59aad78e from master. do not merge.

13 years agoMerge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)]
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* changes:
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master

13 years agoresolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Robert Greenwalt [Thu, 7 Apr 2011 21:13:52 +0000 (14:13 -0700)]
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f

13 years agoMerge "Import revised translations."
Eric Fischer [Thu, 7 Apr 2011 21:08:55 +0000 (14:08 -0700)]
Merge "Import revised translations."

13 years agoam 515a08b0: Merge 59aad78e from master. do not merge.
Xavier Ducrohet [Thu, 7 Apr 2011 20:38:13 +0000 (13:38 -0700)]
am 515a08b0: Merge 59aad78e from  do not merge.

* commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
  Merge 59aad78e from master. do not merge.

13 years agoMerge "Coalesce input events that arrive faster than 333Hz."
Jeff Brown [Thu, 7 Apr 2011 20:18:38 +0000 (13:18 -0700)]
Merge "Coalesce input events that arrive faster than 333Hz."

13 years agoCoalesce input events that arrive faster than 333Hz.
Jeff Brown [Thu, 7 Apr 2011 18:38:09 +0000 (11:38 -0700)]
Coalesce input events that arrive faster than 333Hz.

Some drivers report individual finger updates one at a time
instead of all at once.  When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data.  Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.

This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.

Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.

Added logging code to help measure input dispatch and drawing
latency issues in the view hierarchy.  See ViewDebug.DEBUG_LATENCY.

Change-Id: Ia5898f781f19901d2225c529a910c32bdf4f504f

13 years agoMerge "Add external dependency API." into honeycomb-LTE
Robert Greenwalt [Thu, 7 Apr 2011 20:02:28 +0000 (13:02 -0700)]
Merge "Add external dependency API." into honeycomb-LTE

13 years agoam 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:48:22 +0000 (12:48 -0700)]
am 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

* commit '91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e':
  Refactor onSetupConnectionCompleted.

13 years agoam c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:48:17 +0000 (12:48 -0700)]
am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE

* commit 'c343c18376b8fd7d27a07adc5bb617d0260a8cdc':
  Make LinkProperties comparable.

13 years agoam 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:46:21 +0000 (12:46 -0700)]
am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
  Refactor onSetupConnectionCompleted.

13 years agoam 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:46:18 +0000 (12:46 -0700)]
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE

* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.

13 years agoMerge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:14 +0000 (12:44 -0700)]
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

13 years agoMerge "Make LinkProperties comparable." into honeycomb-LTE
John Wang [Thu, 7 Apr 2011 19:44:04 +0000 (12:44 -0700)]
Merge "Make LinkProperties comparable." into honeycomb-LTE

13 years agoMerge "Migrate most GL from context to driver."
Jason Sams [Thu, 7 Apr 2011 18:33:11 +0000 (11:33 -0700)]
Merge "Migrate most GL from context to driver."

13 years agoMerge "Media JNI code cleanup"
James Dong [Thu, 7 Apr 2011 18:16:49 +0000 (11:16 -0700)]
Merge "Media JNI code cleanup"

13 years agoMerge "Do not disable effect in AudioEffect destructor."
Eric Laurent [Thu, 7 Apr 2011 17:31:11 +0000 (10:31 -0700)]
Merge "Do not disable effect in AudioEffect destructor."

13 years agoam 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:38:41 +0000 (09:38 -0700)]
am 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE

* commit '7ff3c410be00776159ff7a433ce218fabf3f44c4':
  Add a 4G icon for LTE.

13 years agoam add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:37:06 +0000 (09:37 -0700)]
am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE

* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
  Add a 4G icon for LTE.

13 years agoMerge "Add a 4G icon for LTE." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 16:35:18 +0000 (09:35 -0700)]
Merge "Add a 4G icon for LTE." into honeycomb-LTE

13 years agoam d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start...
Teng-Hui Zhu [Thu, 7 Apr 2011 16:24:02 +0000 (09:24 -0700)]
am d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'd4e8e4bb3c2921ae9e15ef012bafc504b48c7efe':
  Fix the issue the video can't start to play

13 years agoam b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into...
Teng-Hui Zhu [Thu, 7 Apr 2011 16:14:50 +0000 (09:14 -0700)]
am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
  Fix the issue the video can't start to play

13 years agoam b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 16:07:52 +0000 (09:07 -0700)]
am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
  Fix the issue the video can't start to play

13 years agoMerge "Fix the issue the video can't start to play" into honeycomb-mr1
Teng-Hui Zhu [Thu, 7 Apr 2011 15:52:45 +0000 (08:52 -0700)]
Merge "Fix the issue the video can't start to play" into honeycomb-mr1

13 years agoMerge changes I4011db5c,I622bc5fa
Joe Onorato [Thu, 7 Apr 2011 01:45:14 +0000 (18:45 -0700)]
Merge changes I4011db5c,I622bc5fa

* changes:
  less logging
  A system setting for "advanced settings."

13 years agoam 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface...
Wink Saville [Thu, 7 Apr 2011 00:56:55 +0000 (17:56 -0700)]
am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '004da7e2e0287cdad63a9009841309d45f038787':
  Add getCdmaSubscriptionSource to CommandsInterface.

13 years agoam 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeyco...
Wink Saville [Thu, 7 Apr 2011 00:54:11 +0000 (17:54 -0700)]
am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
  Add getCdmaSubscriptionSource to CommandsInterface.

13 years agoMerge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
Wink Saville [Thu, 7 Apr 2011 00:52:22 +0000 (17:52 -0700)]
Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

13 years agoam 2059bdf3: am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift...
Roman Nurik [Thu, 7 Apr 2011 00:29:06 +0000 (17:29 -0700)]
am 2059bdf3: am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit '2059bdf34793dc75448e5cb6201db6c49a3a8e18':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

13 years agoam e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendation...
Roman Nurik [Thu, 7 Apr 2011 00:25:08 +0000 (17:25 -0700)]
am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit 'e2b81c3e886e47f00d54426ca82c66c6f56bc5b1':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

13 years agoMerge "Allow batching samples onto the pending motion event."
Jeff Brown [Thu, 7 Apr 2011 00:22:26 +0000 (17:22 -0700)]
Merge "Allow batching samples onto the pending motion event."

13 years agoam b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supporte...
Roman Nurik [Thu, 7 Apr 2011 00:21:21 +0000 (17:21 -0700)]
am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit 'b17cc8a83fd819efcb79d78d005e16b3f04d08df':
  Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

13 years agoMerge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Forma...
Roman Nurik [Thu, 7 Apr 2011 00:18:47 +0000 (17:18 -0700)]
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

13 years agoMerge "Word suggestion popup added to EditText."
Gilles Debunne [Thu, 7 Apr 2011 00:07:27 +0000 (17:07 -0700)]
Merge "Word suggestion popup added to EditText."

13 years agoMerge "invalidate WebView after Title change"
Michael Kolb [Wed, 6 Apr 2011 23:47:34 +0000 (16:47 -0700)]
Merge "invalidate WebView after Title change"

13 years agoMerge "Minor Alt-TAB / Recent Apps Dialog improvements."
Jeff Brown [Wed, 6 Apr 2011 22:57:21 +0000 (15:57 -0700)]
Merge "Minor Alt-TAB / Recent Apps Dialog improvements."

13 years agoMerge "Check if BT is disabled or not when sending audio state."
Jaikumar Ganesh [Wed, 6 Apr 2011 22:39:20 +0000 (15:39 -0700)]
Merge "Check if BT is disabled or not when sending audio state."