Commit Graph

32947 Commits

Author SHA1 Message Date
Elliott Hughes
626d865d41 Merge "Tidy up exception throwing in the media native code." 2011-04-08 18:37:01 -07:00
Dianne Hackborn
9c5d5fb4ad Merge "Rework thumbnails in activity manager." 2011-04-08 18:28:14 -07:00
Jamie Gennis
bcfb78cf5d am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
  Stagefright: authenticate ANativeWindow.
2011-04-08 17:43:33 -07:00
Jamie Gennis
e2138567d9 am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
  Stagefright: authenticate ANativeWindow.
2011-04-08 17:41:38 -07:00
Jamie Gennis
f82a9a29d7 am 66380f76: Stagefright: authenticate ANativeWindow.
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
  Stagefright: authenticate ANativeWindow.
2011-04-08 17:40:00 -07:00
Robert Greenwalt
acb1c0b91b am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
* commit 'da2790fa0adc187440c35261256c9989ca1b6ed8':
  Make ApnSettings threadsafe.
2011-04-08 17:23:50 -07:00
Robert Greenwalt
4e3f02dc82 am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
  Make ApnSettings threadsafe.
2011-04-08 17:21:43 -07:00
Robert Greenwalt
40ff957b48 Merge "Make ApnSettings threadsafe." into honeycomb-LTE 2011-04-08 17:19:53 -07:00
Joe Onorato
eeb92fa219 Merge "Use the new API file format, and some minor tweaks to the old XML files that make the parser easier." 2011-04-08 17:10:57 -07:00
Robert Greenwalt
bcbd73bb87 am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
  Fix getActiveApnTypes for GsmDCT.
2011-04-08 16:44:42 -07:00
Robert Greenwalt
0dc5550afe am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
  Fix notification of disconnected networks.
2011-04-08 16:44:32 -07:00
Robert Greenwalt
7fa484bb6f am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
  Fix getActiveApnTypes for GsmDCT.
2011-04-08 16:38:39 -07:00
Robert Greenwalt
76db8f5faf am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
  Fix notification of disconnected networks.
2011-04-08 16:38:34 -07:00
Robert Greenwalt
884a16e3be Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE 2011-04-08 16:31:03 -07:00
Robert Greenwalt
8ad8536fa9 Merge "Fix notification of disconnected networks." into honeycomb-LTE 2011-04-08 16:22:06 -07:00
Elliott Hughes
c9aba836e1 Merge "More JNI exception-throwing cleanup." 2011-04-08 16:15:26 -07:00
Brian Carlstrom
7b6b355e83 Merge "Add keychain user with special keystore access permissions" 2011-04-08 15:40:06 -07:00
Wink Saville
6eb4f5b5a4 am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
* commit '4a28096dec16666d9425cb8e23641985f963a4f3':
  Check different CellLocation type in GsmDataConnectionTracker
2011-04-08 15:31:24 -07:00
Robert Greenwalt
11331dd924 am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
* commit '01f8f290cd2c01c7ed9a1966f39fa74032352dc8':
  Rename PhoneBase's DataConnectionTracker member.
2011-04-08 15:31:21 -07:00
Wink Saville
6a93332948 Merge "resolved conflicts for merge of 4b1a37d7 to master" 2011-04-08 15:25:14 -07:00
Wink Saville
aeac73bc7a resolved conflicts for merge of 4b1a37d7 to master
Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188
2011-04-08 14:57:51 -07:00
Fabrice Di Meglio
231fcec730 Merge "TextLayoutCache - add glyphs caching" 2011-04-08 14:51:08 -07:00
Brian Carlstrom
4d51522f5f Add keychain user with special keystore access permissions
Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
2011-04-08 14:06:39 -07:00
Wink Saville
098c69629b am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
  Check different CellLocation type in GsmDataConnectionTracker
2011-04-08 13:23:24 -07:00
Wink Saville
5489f042dc Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE 2011-04-08 13:20:20 -07:00
Robert Greenwalt
d0856efeac am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
  Rename PhoneBase's DataConnectionTracker member.
2011-04-08 12:23:49 -07:00
Wink Saville
8e0392e80e am 5203a5bc: Cleanup debugging.
* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
  Cleanup debugging.
2011-04-08 11:35:11 -07:00
Wink Saville
4a0fd7cd3b am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
  DataConnection: set CID to the correct value.
2011-04-08 10:44:43 -07:00
Wink Saville
3e2844ad79 am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
* commit '1905e166ed40ee11e80476848ef40e817512f740':
  DataConnection: set CID to the correct value.
2011-04-08 10:41:09 -07:00
Wink Saville
68a57ea882 Merge "DataConnection: set CID to the correct value." into honeycomb-LTE 2011-04-08 10:38:25 -07:00
Brian Carlstrom
4e2d4c8c63 Merge "Tolerate missing AccountManager resource, not just missing resource name" 2011-04-08 10:28:34 -07:00
Robert Greenwalt
5fe1e0fbd3 am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
* commit '2ce73e77c99effb9521db15c882529ccbafd57a6':
  Fix isApnTypeActive in GDCT.
2011-04-08 10:11:43 -07:00
Robert Greenwalt
73b494a72d am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
  Fix isApnTypeActive in GDCT.
2011-04-08 10:09:03 -07:00
Elliott Hughes
40a2d50af1 Merge "Use jniThrowException for exception throwing from native code." 2011-04-08 10:08:19 -07:00
Robert Greenwalt
91cd40d0cf Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE 2011-04-08 10:07:31 -07:00
Robert Greenwalt
f83b30ec1b am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.
* commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727':
  Fix ISO country code of Slovenia.
2011-04-08 10:07:26 -07:00
Robert Greenwalt
3c0875c741 am 4410660e: Fix ISO country code of Slovenia.
* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
  Fix ISO country code of Slovenia.
2011-04-08 10:05:01 -07:00
Teng-Hui Zhu
753c2a6c8d Merge "Don't send pause again when coming back from full screen" 2011-04-08 09:19:01 -07:00
Wu-cheng Li
97a03dc6ac Merge "Add camera focus area API." 2011-04-08 02:47:39 -07:00
Dianne Hackborn
ecc3707e96 Merge "Improve activity manager debug dumps." 2011-04-07 18:46:54 -07:00
Nicolas Roard
9a3dead827 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
2011-04-07 17:27:53 -07:00
Nicolas Roard
17d071f1b9 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
2011-04-07 17:25:56 -07:00
Nicolas Roard
d3390c2951 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
2011-04-07 17:24:05 -07:00
Nicolas Roard
d0277b0001 Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 2011-04-07 17:21:53 -07:00
Adam Cohen
f1f34e4a48 Merge "Fix crash in bug 4259574" 2011-04-07 17:12:19 -07:00
Daisuke Miyakawa
7340b4f5e3 Merge "Add params for primary account to ContactsContract" 2011-04-07 17:03:18 -07:00
Wink Saville
5855251b2b 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.
2011-04-07 16:53:34 -07:00
Wink Saville
077600118b 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.
2011-04-07 16:51:50 -07:00
Wink Saville
9e4c369be4 Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE 2011-04-07 16:49:02 -07:00
Robert Greenwalt
8ffe69fbda Merge "Fix build." 2011-04-07 16:01:46 -07:00