ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,956 Commits 2 Branches 0 Tags 54 MiB
81b95108a8
Commit Graph

32956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
4ee7a7cd52 Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 2011-05-20 15:27:03 -07:00
Jaikumar Ganesh
d39b7cf863 am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit 'd1735ef91af201ff140f8d954dd07eff80836d20':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:52:48 -07:00
Jaikumar Ganesh
96bb6336f5 am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:52:27 -07:00
Dianne Hackborn
7e4c1982d3 am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 14:32:35 -07:00
Dianne Hackborn
cbc706222f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Robert Greenwalt
26e447eff3 Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE 2011-05-20 14:25:29 -07:00
Jaikumar Ganesh
bbe85a84bc am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:21:29 -07:00
Jaikumar Ganesh
629c19dfbc am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:21:23 -07:00
Xavier Ducrohet
8949eabac7 Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:47 -07:00
Xavier Ducrohet
e2ac5a6dfa Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:42 -07:00
Jaikumar Ganesh
701d3366e0 Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 2011-05-20 13:37:00 -07:00
Jaikumar Ganesh
0b0b8a76d5 Merge "BT: Wrong publishing result of bonding error code." 2011-05-20 13:35:20 -07:00
Jim Miller
f69a64dbc2 am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '0a734b1894511e833936362820c9e8fec3ca7df3':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-20 13:27:25 -07:00
Jim Miller
a89de3c767 am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit 'ef2b26695e7fa00419787bb105d448a457e9ed83':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-20 13:27:00 -07:00
Jim Miller
2d99f8540a am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '14e45f9b19a846af074d73b3792e35de0448ac21':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-20 13:16:47 -07:00
Jim Miller
894077b7bf am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit '5e731140f38e06c42885fa300efc30da00711c76':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-20 13:16:43 -07:00
Jim Miller
43e0fc2793 Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 2011-05-20 13:13:19 -07:00
Jim Miller
d01bbac731 Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 2011-05-20 13:12:57 -07:00
Adam Powell
dde0e61601 am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:09:13 -07:00
Adam Powell
0233c6ef98 am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:04:11 -07:00
Adam Powell
d415a61653 Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 2011-05-20 12:59:43 -07:00
Gloria Wang
4b33903f4a am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 11:02:31 -07:00
Gloria Wang
8c9b1529d7 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 10:57:51 -07:00
Jaikumar Ganesh
17dc5870b2 am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" 
* commit '0c2d82c6f28ab6ec73d66fcc1f62e067829df426':
  OBEX: Fix PrivateOutputStream small write problem
 2011-05-20 10:51:25 -07:00
Jaikumar Ganesh
90c8f1ce3c am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" 
* commit '848a1e3d8522129c8a39d198a10b134926d71bd2':
  OBEX: Fix PrivateOutputStream small write problem
 2011-05-20 10:23:48 -07:00
Jaikumar Ganesh
ca7f168e4b Merge "OBEX: Fix PrivateOutputStream small write problem" 2011-05-20 09:40:32 -07:00
satok
568b229d9f am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:51:14 -07:00
satok
551d68b90c am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:41:03 -07:00
Dianne Hackborn
7583282db6 am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:34:21 -07:00
Dianne Hackborn
6c87dbce9f am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:30:32 -07:00
Dianne Hackborn
22585947ff Add new "-swNNNdp" resource qualifier. 
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
 2011-05-19 18:23:29 -07:00
Adam Powell
40b97c0b7f am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'd40575eb983eb7a1d383acc1f30f467374acd085':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:17:30 -07:00
Adam Powell
87c442a9b7 am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes
 2011-05-19 17:06:09 -07:00
Adam Powell
3da5b00cf0 Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 2011-05-19 15:48:38 -07:00
Irfan Sheriff
b4371390b0 am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit 'a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
  Move softap config handling to WifiConfigStore
 2011-05-19 15:01:48 -07:00
Irfan Sheriff
a0bda8e5fc am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 
* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
  Move softap config handling to WifiConfigStore
 2011-05-19 14:57:54 -07:00
Irfan Sheriff
5cd336e4d9 Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 2011-05-19 14:54:25 -07:00
Chet Haase
27699f0b77 am f0c6ddd9: am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit 'f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 14:03:04 -07:00
Chet Haase
5f953706cb am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 
* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
  DO NOT MERGE: Add custom fragment anims for popping backstack
 2011-05-19 13:59:06 -07:00
Chet Haase
31808fa85d Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 2011-05-19 13:57:03 -07:00
Kenny Root
f9fa770f38 Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-05-19 12:48:41 -07:00
Kenny Root
77123ca552 resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp 
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
 2011-05-19 12:48:14 -07:00
Wink Saville
2a88c9e891 am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE 
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
  Reset connection while data state changed.
 2011-05-19 11:28:36 -07:00
Wink Saville
fe0380f2e6 Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Joe Fernandez
46be04f085 am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '605be31c4a80e03dc0af76a73aaa33316ca4a635':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 11:06:04 -07:00
Kenny Root
e5c511391b am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread 
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
  Break apart queries to getInstalled* API
 2011-05-19 11:04:01 -07:00
Joe Fernandez
ecaf66a1b9 am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 10:59:16 -07:00
Kenny Root
46eb8c2d2d Merge "Break apart queries to getInstalled* API" into gingerbread 2011-05-19 10:55:00 -07:00
Joe Fernandez
10f5d9880b am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
 2011-05-19 10:53:04 -07:00
Joe Fernandez
5986a9eb56 Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 2011-05-19 10:49:45 -07:00