OSDN Git Service
Wink Saville [Fri, 20 May 2011 23:14:33 +0000 (16:14 -0700)]
am
f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
* commit '
f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4':
Change getLteOnCdmaModeStatic to dynamically determine its result.
Dianne Hackborn [Fri, 20 May 2011 23:13:54 +0000 (16:13 -0700)]
am
5c8caba2: am
1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
* commit '
5c8caba2e590792531ffb2c9f4ea924993662abd':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Robert Greenwalt [Fri, 20 May 2011 22:45:55 +0000 (15:45 -0700)]
resolved conflicts for merge of
dec3dda8 to honeycomb-plus-aosp
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
Wink Saville [Fri, 20 May 2011 22:27:03 +0000 (15:27 -0700)]
Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
Jaikumar Ganesh [Fri, 20 May 2011 21:52:48 +0000 (14:52 -0700)]
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.
Jaikumar Ganesh [Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)]
am
d7030e55: am
198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
* commit '
d7030e551aa99ed9f533d46de5f3443ceb4c5703':
BT: Wrong publishing result of bonding error code.
Dianne Hackborn [Fri, 20 May 2011 21:32:35 +0000 (14:32 -0700)]
am
1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
* commit '
1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Dianne Hackborn [Fri, 20 May 2011 21:28:43 +0000 (14:28 -0700)]
Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
Robert Greenwalt [Fri, 20 May 2011 21:25:29 +0000 (14:25 -0700)]
Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE
Jaikumar Ganesh [Fri, 20 May 2011 21:21:29 +0000 (14:21 -0700)]
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.
Jaikumar Ganesh [Fri, 20 May 2011 21:21:23 +0000 (14:21 -0700)]
am
198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
* commit '
198ed3e46af4bd51fa6be0186bacdde9e832ba94':
BT: Wrong publishing result of bonding error code.
Jaikumar Ganesh [Fri, 20 May 2011 20:37:00 +0000 (13:37 -0700)]
Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
Jaikumar Ganesh [Fri, 20 May 2011 20:35:20 +0000 (13:35 -0700)]
Merge "BT: Wrong publishing result of bonding error code."
Jim Miller [Fri, 20 May 2011 20:27:25 +0000 (13:27 -0700)]
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
Jim Miller [Fri, 20 May 2011 20:27:00 +0000 (13:27 -0700)]
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
Jim Miller [Fri, 20 May 2011 20:16:47 +0000 (13:16 -0700)]
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
Jim Miller [Fri, 20 May 2011 20:16:43 +0000 (13:16 -0700)]
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
Jim Miller [Fri, 20 May 2011 20:13:19 +0000 (13:13 -0700)]
Merge "Fix
4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
Jim Miller [Fri, 20 May 2011 20:12:57 +0000 (13:12 -0700)]
Merge "Fix
4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
Adam Powell [Fri, 20 May 2011 20:09:13 +0000 (13:09 -0700)]
am
f5abccef: am
73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
* commit '
f5abccefb10e8a31363c98d6a8491cb8168b7174':
New opaque cab assets; search dialog tweaks.
Adam Powell [Fri, 20 May 2011 20:04:11 +0000 (13:04 -0700)]
am
73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
* commit '
73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
New opaque cab assets; search dialog tweaks.
Adam Powell [Fri, 20 May 2011 19:59:43 +0000 (12:59 -0700)]
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
Dianne Hackborn [Fri, 20 May 2011 17:37:34 +0000 (10:37 -0700)]
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
Wink Saville [Fri, 20 May 2011 19:12:00 +0000 (12:12 -0700)]
Change getLteOnCdmaModeStatic to dynamically determine its result.
bug:
4202572
Change-Id: I956b61840e2043229df29054dd2a6daccd7a845f
Robert Greenwalt [Fri, 20 May 2011 19:23:41 +0000 (12:23 -0700)]
Simplfy getActive* calls in ConnectivityService
One had been simplified on GB, but somehow it didn't make it here.
bug:
4463770
Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
Gloria Wang [Fri, 20 May 2011 18:02:31 +0000 (11:02 -0700)]
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.
Gloria Wang [Fri, 20 May 2011 17:57:51 +0000 (10:57 -0700)]
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.
Jaikumar Ganesh [Fri, 20 May 2011 17:51:25 +0000 (10:51 -0700)]
am
0c2d82c6: am
848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"
* commit '
0c2d82c6f28ab6ec73d66fcc1f62e067829df426':
OBEX: Fix PrivateOutputStream small write problem
Jaikumar Ganesh [Fri, 20 May 2011 17:23:48 +0000 (10:23 -0700)]
am
848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"
* commit '
848a1e3d8522129c8a39d198a10b134926d71bd2':
OBEX: Fix PrivateOutputStream small write problem
Gloria Wang [Fri, 20 May 2011 17:15:21 +0000 (10:15 -0700)]
Use pread() to get the decrypted data for container based DRM file.
For bug
4392094.
Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
Jaikumar Ganesh [Fri, 20 May 2011 16:40:32 +0000 (09:40 -0700)]
Merge "OBEX: Fix PrivateOutputStream small write problem"
satok [Fri, 20 May 2011 13:51:14 +0000 (06:51 -0700)]
am
d9435bce: am
b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
* commit '
d9435bcecc820c8715d8b6b920fd43042418a1e9':
Do not merge. Backport two fixes for InputMethethodFramework
satok [Fri, 20 May 2011 13:41:03 +0000 (06:41 -0700)]
am
b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
* commit '
b4788fdbfdda97bd9cfd0e483276934114d9c438':
Do not merge. Backport two fixes for InputMethethodFramework
satok [Fri, 20 May 2011 09:19:53 +0000 (18:19 +0900)]
Do not merge. Backport two fixes for InputMethethodFramework
Bug:
3420384
backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942
Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
Erik Ljungberg [Fri, 20 May 2011 10:39:18 +0000 (12:39 +0200)]
OBEX: Fix PrivateOutputStream small write problem
When data less than max packet size in length is sent into the write
method the data will only be added to the internal buffer. If several
calls to write is performed by the application continueOperation will
not be called at all. The solution to the problem is to always check
the internal buffer size and to call continueOperation every time
maxPacketSize bytes is in the internal buffer.
Change-Id: I5ebfa3c26db2c1aefe1a115d7782d8ceaa760937
Dianne Hackborn [Fri, 20 May 2011 02:34:21 +0000 (19:34 -0700)]
am
c851ea56: am
69cb8757: Add new "-swNNNdp" resource qualifier.
* commit '
c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.
Dianne Hackborn [Fri, 20 May 2011 02:30:32 +0000 (19:30 -0700)]
am
69cb8757: Add new "-swNNNdp" resource qualifier.
* commit '
69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.
Adam Powell [Fri, 20 May 2011 01:46:47 +0000 (18:46 -0700)]
New opaque cab assets; search dialog tweaks.
* New opaque assets (now actually opaque!)
* SearchDialog determines theme to use from parent context
* SearchDialog now disallows action modes
Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
Dianne Hackborn [Fri, 20 May 2011 01:13:32 +0000 (18:13 -0700)]
Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
Adam Powell [Fri, 20 May 2011 00:17:30 +0000 (17:17 -0700)]
am
d40575eb: am
b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
* commit '
d40575eb983eb7a1d383acc1f30f467374acd085':
DO NOT MERGE Action bar config changes
Jim Miller [Fri, 20 May 2011 00:11:08 +0000 (17:11 -0700)]
Fix
4462474: Fixes crash on 7" tablet due to using wrong resource
Change-Id: Id182bc6e9e69a308329412a91929a65af1329beb
Adam Powell [Fri, 20 May 2011 00:06:09 +0000 (17:06 -0700)]
am
b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
* commit '
b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
DO NOT MERGE Action bar config changes
Jim Miller [Fri, 20 May 2011 00:05:30 +0000 (17:05 -0700)]
Fix
4462497: Move layouts from xlarge to large to enable 7" tablets
This fixes LockScreen on 7" tablets by moving the resources to xlarge.
In addition, it has some minor layout tweaks to center pattern and
wave unlock widgets on both so we can share the layout resources.
Change-Id: Ibeee9320c9effcae6cf55c9ca417854f468c8edb
Adam Powell [Thu, 19 May 2011 22:48:38 +0000 (15:48 -0700)]
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 22:02:50 +0000 (15:02 -0700)]
DO NOT MERGE Action bar config changes
Handle action bar padding on configuration changes when the app
handles these changes itself.
Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
Irfan Sheriff [Thu, 19 May 2011 22:01:48 +0000 (15:01 -0700)]
am
a4815c0e: am
9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
* commit '
a4815c0ec06c293ea9f50b2b925d5a98d11f1143':
Move softap config handling to WifiConfigStore
Irfan Sheriff [Thu, 19 May 2011 21:57:54 +0000 (14:57 -0700)]
am
9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
* commit '
9c9088a54f6dee7a13dcc7a12297137147b01baa':
Move softap config handling to WifiConfigStore
Irfan Sheriff [Thu, 19 May 2011 21:54:25 +0000 (14:54 -0700)]
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
Chet Haase [Thu, 19 May 2011 21:03:04 +0000 (14:03 -0700)]
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
Chet Haase [Thu, 19 May 2011 20:59:06 +0000 (13:59 -0700)]
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
Chet Haase [Thu, 19 May 2011 20:57:03 +0000 (13:57 -0700)]
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
Chet Haase [Tue, 22 Mar 2011 18:35:22 +0000 (11:35 -0700)]
DO NOT MERGE: Add custom fragment anims for popping backstack
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.
The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.
Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
Kenny Root [Thu, 19 May 2011 19:48:41 +0000 (12:48 -0700)]
Merge "resolved conflicts for merge of
2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Kenny Root [Thu, 19 May 2011 19:48:14 +0000 (12:48 -0700)]
resolved conflicts for merge of
2433c443 to honeycomb-plus-aosp
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
Wink Saville [Thu, 19 May 2011 18:28:36 +0000 (11:28 -0700)]
am
ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
* commit '
ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
Wink Saville [Thu, 19 May 2011 18:25:45 +0000 (11:25 -0700)]
Merge "Reset connection while data state changed." into honeycomb-LTE
Joe Fernandez [Thu, 19 May 2011 18:06:04 +0000 (11:06 -0700)]
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
Kenny Root [Thu, 19 May 2011 18:04:01 +0000 (11:04 -0700)]
am
f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread
* commit '
f2006f3123dcdf598e052051041b49c89710b53e':
Break apart queries to getInstalled* API
Joe Fernandez [Thu, 19 May 2011 17:59:16 +0000 (10:59 -0700)]
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
Kenny Root [Thu, 19 May 2011 17:55:00 +0000 (10:55 -0700)]
Merge "Break apart queries to getInstalled* API" into gingerbread
Joe Fernandez [Thu, 19 May 2011 17:53:04 +0000 (10:53 -0700)]
am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:49:45 +0000 (10:49 -0700)]
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
Mike Lockwood [Thu, 19 May 2011 17:06:44 +0000 (10:06 -0700)]
am
ae448e2c: am
a88b42d5: USB: Add method to access raw USB device descriptors
* commit '
ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors
Mike Lockwood [Thu, 19 May 2011 17:01:53 +0000 (10:01 -0700)]
am
a88b42d5: USB: Add method to access raw USB device descriptors
* commit '
a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
Mike Lockwood [Thu, 19 May 2011 15:52:40 +0000 (11:52 -0400)]
USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adam Powell [Thu, 19 May 2011 02:16:31 +0000 (19:16 -0700)]
am
d466a463: am
b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit '
d466a4631f3e4f482dd658f42c277d6ad281a9d1':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Adam Powell [Thu, 19 May 2011 02:14:44 +0000 (19:14 -0700)]
am
b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit '
b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Adam Powell [Thu, 19 May 2011 02:13:22 +0000 (19:13 -0700)]
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 02:10:46 +0000 (19:10 -0700)]
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
Xavier Ducrohet [Thu, 19 May 2011 00:51:31 +0000 (17:51 -0700)]
am
582841e7: am
b18e700c: am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
582841e734bc85b247df64ac85b6ee09f7375f44':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:43:27 +0000 (17:43 -0700)]
am
b18e700c: am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
b18e700cb9c1d7090904449fc6878b8eae1d4693':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:40:08 +0000 (17:40 -0700)]
am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:36:16 +0000 (17:36 -0700)]
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
James Dong [Wed, 18 May 2011 23:33:20 +0000 (16:33 -0700)]
am
380244e9: am
d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
* commit '
380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
Using widevine:// to stream adaptive bitrate wvm content no longer
Robert Greenwalt [Wed, 18 May 2011 23:33:16 +0000 (16:33 -0700)]
am
59b1a4ed: Switch to use netd to add/remove routes.
* commit '
59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.
James Dong [Wed, 18 May 2011 23:09:58 +0000 (16:09 -0700)]
am
d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
* commit '
d148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
James Dong [Wed, 18 May 2011 23:06:14 +0000 (16:06 -0700)]
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
Wink Saville [Wed, 18 May 2011 22:59:04 +0000 (15:59 -0700)]
Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
Jean-Baptiste Queru [Wed, 18 May 2011 22:33:27 +0000 (15:33 -0700)]
Merge
4b999030
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
Irfan Sheriff [Tue, 10 May 2011 23:26:06 +0000 (16:26 -0700)]
Move softap config handling to WifiConfigStore
Move softap config to flat file and read/write on a seperate handler thread
Bug:
4391796
Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
Robert Greenwalt [Tue, 10 May 2011 22:05:02 +0000 (15:05 -0700)]
Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
Jean-Baptiste Queru [Wed, 18 May 2011 22:20:29 +0000 (15:20 -0700)]
am
6c427617: Merge "support humidity sensor type"
* commit '
6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type
Dianne Hackborn [Wed, 18 May 2011 22:16:05 +0000 (15:16 -0700)]
am
8416e5cf: am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
8416e5cf0a8439a3f605629068d3639f2a35e08b':
Fix fake display size when rotated.
Dianne Hackborn [Wed, 18 May 2011 22:12:07 +0000 (15:12 -0700)]
am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.
Dianne Hackborn [Wed, 18 May 2011 22:09:58 +0000 (15:09 -0700)]
Merge "Fix fake display size when rotated." into honeycomb-mr2
Dianne Hackborn [Wed, 18 May 2011 22:07:48 +0000 (15:07 -0700)]
Fix fake display size when rotated.
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
Jean-Baptiste Queru [Wed, 18 May 2011 22:00:11 +0000 (15:00 -0700)]
Merge "support humidity sensor type"
Jean-Baptiste Queru [Wed, 18 May 2011 16:52:18 +0000 (09:52 -0700)]
am
a38762f3: am
7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit '
a38762f340853cca5a07732c21e9fb816fd252b8':
MOTOYA changed two kinds of Japanese font files.
Jean-Baptiste Queru [Wed, 18 May 2011 16:46:16 +0000 (09:46 -0700)]
am
7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit '
7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
MOTOYA changed two kinds of Japanese font files.
Gloria Wang [Wed, 18 May 2011 16:30:01 +0000 (09:30 -0700)]
am
5a6c3d49: am
07e9267d: Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '
5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug
4422428 Squashed commit of the following:
Jean-Baptiste Queru [Wed, 18 May 2011 16:24:40 +0000 (09:24 -0700)]
Merge "MOTOYA changed two kinds of Japanese font files."
Gloria Wang [Wed, 18 May 2011 16:19:56 +0000 (09:19 -0700)]
am
07e9267d: Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '
07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug
4422428 Squashed commit of the following:
Gloria Wang [Wed, 18 May 2011 16:17:50 +0000 (09:17 -0700)]
Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
Kazuhiro Ondo [Wed, 18 May 2011 07:02:31 +0000 (00:02 -0700)]
am
01758e81: Linkproperties update via unsol data call state change.
* commit '
01758e81b3ad89934581885bb2fc7006510ec639':
Linkproperties update via unsol data call state change.
Kazuhiro Ondo [Sun, 1 May 2011 01:10:57 +0000 (20:10 -0500)]
Linkproperties update via unsol data call state change.
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.
Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
Wink Saville [Wed, 18 May 2011 03:38:05 +0000 (20:38 -0700)]
am
258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE
* commit '
258208a78ca90a7d3a45a2f15af4bbb21a266f47':
Remove SIM operator name hack
Wink Saville [Wed, 18 May 2011 03:35:35 +0000 (20:35 -0700)]
Merge "Remove SIM operator name hack" into honeycomb-LTE
Adam Powell [Wed, 18 May 2011 03:28:06 +0000 (20:28 -0700)]
am
98603eed: am
30a76196: Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
* commit '
98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
Fix bug
4416126 - orientation change bug with action bar overflow menu
Adam Powell [Wed, 18 May 2011 03:25:58 +0000 (20:25 -0700)]
am
30a76196: Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
* commit '
30a76196c8f426b530a80166817d3280acb2b100':
Fix bug
4416126 - orientation change bug with action bar overflow menu
Adam Powell [Wed, 18 May 2011 03:24:39 +0000 (20:24 -0700)]
Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2