OSDN Git Service
Wink Saville [Tue, 24 May 2011 00:18:29 +0000 (17:18 -0700)]
am
61a5ab57: am
f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
* commit '
61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
Change getLteOnCdmaModeStatic to dynamically determine its result.
Dianne Hackborn [Mon, 23 May 2011 23:59:20 +0000 (16:59 -0700)]
Merge "resolved conflicts for merge of
070a19e0 to master"
Steve Block [Mon, 23 May 2011 21:34:00 +0000 (14:34 -0700)]
Merge "Log a StrictMode violation when WebView methods are called on the wrong thread"
Dianne Hackborn [Mon, 23 May 2011 21:08:12 +0000 (14:08 -0700)]
resolved conflicts for merge of
070a19e0 to master
Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411
Adam Powell [Mon, 23 May 2011 19:43:29 +0000 (12:43 -0700)]
Change action button layout for split action bars
Change-Id: Ie1427ae6b0334bf0a8afd5cae968c286c82a3837
Glenn Kasten [Mon, 23 May 2011 16:06:03 +0000 (09:06 -0700)]
Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"
Steve Block [Tue, 17 May 2011 18:05:03 +0000 (19:05 +0100)]
Log a StrictMode violation when WebView methods are called on the wrong thread
Bug:
4373919
Change-Id: I1f526e033ce316e51b3de7fe4ac88119fbc65b4e
Robert Greenwalt [Sun, 22 May 2011 04:35:38 +0000 (21:35 -0700)]
am
5a6bec53: resolved conflicts for merge of
dec3dda8 to honeycomb-plus-aosp
* commit '
5a6bec53e224b2db9ecbc6920faab08f4a962256':
Simplfy getActive* calls in ConnectivityService
Jaikumar Ganesh [Sun, 22 May 2011 04:35:22 +0000 (21:35 -0700)]
am
69ed0b62: 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 '
69ed0b628e18570f3fc7909fcdadc1e06f42e944':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
Jaikumar Ganesh [Sun, 22 May 2011 04:35:16 +0000 (21:35 -0700)]
am
e2271a55: am
d7030e55: am
198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
* commit '
e2271a55ad67f766a6a47239d1a3f7319a1e7b2e':
BT: Wrong publishing result of bonding error code.
Jim Miller [Sun, 22 May 2011 04:35:13 +0000 (21:35 -0700)]
am
940138de: am
0a734b18: am
14e45f9b: Merge "Fix
4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
* commit '
940138de9eae9be9ef60307af9e5f7a1168af533':
Fix
4462497: Move layouts from xlarge to large to enable 7" tablets
Jim Miller [Sun, 22 May 2011 04:34:56 +0000 (21:34 -0700)]
am
7d75e772: am
ef2b2669: am
5e731140: Merge "Fix
4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
* commit '
7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05':
Fix
4462474: Fixes crash on 7" tablet due to using wrong resource
Adam Powell [Sat, 21 May 2011 02:46:38 +0000 (19:46 -0700)]
Fix bug
4450805 - item selection dispatching in submenus.
Change-Id: I6c56c9c8c6bd6c719250df4a21bda7d0ef463de4
Fabrice Di Meglio [Sat, 21 May 2011 00:39:40 +0000 (17:39 -0700)]
Merge "RTL Ordering of visual elements in LinearLayout"
Fabrice Di Meglio [Thu, 1 Apr 2010 22:46:27 +0000 (15:46 -0700)]
RTL Ordering of visual elements in LinearLayout
- also update unit tests for testing LinearLayout
Change-Id: I0794d48c45a8fd4a899fdf6f6a1d05485b416e1a
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
Glenn Kasten [Fri, 20 May 2011 22:42:31 +0000 (15:42 -0700)]
Merge "Bug
4184736 unhide MediaPlayer.setTexture"
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.
The Android Open Source Project [Fri, 20 May 2011 21:36:19 +0000 (14:36 -0700)]
Reconcile with honeycomb-mr1-release
Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95
The Android Open Source Project [Fri, 20 May 2011 21:33:24 +0000 (14:33 -0700)]
Reconcile with honeycomb-release
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
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.
The Android Open Source Project [Fri, 20 May 2011 20:50:51 +0000 (13:50 -0700)]
Reconcile with gingerbread-release
Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651
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
Mathias Agopian [Fri, 20 May 2011 20:15:20 +0000 (13:15 -0700)]
Merge "Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default"
Adam Powell [Fri, 20 May 2011 20:13:28 +0000 (13:13 -0700)]
am
f2004180: am
f5abccef: am
73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
* commit '
f2004180f828584fa8525081a248e8c0f2055327':
New opaque cab assets; search dialog tweaks.
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:05:43 +0000 (11:05 -0700)]
am
4d8ceada: am
dbfd055d: am
a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug
4392094.
* commit '
4d8ceada09441f43a98f5c7dadde9192e7d6abf9':
Use pread() to get the decrypted data for container based DRM file. For bug
4392094.
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:55:53 +0000 (10:55 -0700)]
am
3bec9cc2: am
0c2d82c6: am
848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"
* commit '
3bec9cc27a4b87be644533d5fe44358dde399d49':
OBEX: Fix PrivateOutputStream small write problem
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
Alex Sakhartchouk [Fri, 20 May 2011 16:41:07 +0000 (09:41 -0700)]
Merge "Removing unused code"
Jaikumar Ganesh [Fri, 20 May 2011 16:40:32 +0000 (09:40 -0700)]
Merge "OBEX: Fix PrivateOutputStream small write problem"
Kristian Monsen [Fri, 20 May 2011 15:40:13 +0000 (08:40 -0700)]
Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"
Chet Haase [Fri, 20 May 2011 14:33:41 +0000 (07:33 -0700)]
Merge "Enable large font rendering with GPU acceleration"
Glenn Kasten [Wed, 13 Apr 2011 15:11:47 +0000 (08:11 -0700)]
Bug
4184736 unhide MediaPlayer.setTexture
Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
satok [Fri, 20 May 2011 14:03:38 +0000 (07:03 -0700)]
am
33bdc3c9: (-s ours) am
d9435bce: am
b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
* commit '
33bdc3c9995cbef477cec756b65d767558e6b836':
Do not merge. Backport two fixes for InputMethethodFramework
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 13:13:38 +0000 (22:13 +0900)]
Fix a bug on SwitchToLastInputMethod
Change-Id: Iab7531e7436375941ec3df4fba943af24e2f1231
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
satok [Fri, 20 May 2011 07:13:43 +0000 (16:13 +0900)]
Fix switchToLastInputMethod to fall back into the applicable keyboard if there is no candidate ime
Change-Id: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
Dianne Hackborn [Fri, 20 May 2011 05:02:22 +0000 (22:02 -0700)]
Fix another merge problem.
Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26
Dianne Hackborn [Fri, 20 May 2011 04:44:52 +0000 (21:44 -0700)]
resolved conflicts for merge of
06a8ceac to master
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
Mathias Agopian [Fri, 20 May 2011 03:41:27 +0000 (20:41 -0700)]
Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default
Change-Id: Ifb2069e095dba57b7d97e9f2d942fd85fa975f58
Mathias Agopian [Fri, 20 May 2011 02:42:20 +0000 (19:42 -0700)]
Merge "Fix a race that could cause GL commands to be executed from the wrong thread."
Mathias Agopian [Fri, 20 May 2011 02:41:37 +0000 (19:41 -0700)]
Merge "RefBase subclasses can now decide how they want to be destroyed."
Mathias Agopian [Thu, 19 May 2011 22:38:14 +0000 (15:38 -0700)]
Fix a race that could cause GL commands to be executed from the wrong thread.
Change-Id: Ia3d407f7bf2f5553f46cfdade70b7b0badb35beb
Mathias Agopian [Fri, 20 May 2011 01:03:31 +0000 (18:03 -0700)]
RefBase subclasses can now decide how they want to be destroyed.
This adds a destroy() virtual on RefBase which
sublasses can implement. destroy() is called
in lieu of the destructor whenthe last strong
ref goes away.
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
Svetoslav Ganov [Fri, 20 May 2011 01:29:45 +0000 (18:29 -0700)]
Merge "TouchExplorer - refactoring and a couple of bug fixes"
Svetoslav Ganov [Fri, 20 May 2011 01:16:31 +0000 (18:16 -0700)]
TouchExplorer - refactoring and a couple of bug fixes
1. Refactored the code to avoid code duplication.
2. Fixed a bug in removing unused pointers from the event.
3. Fixed a bug that was crashing the explorer.
4. Sending hover exit immediately at the end of touch exploration
gesture rather with a delay.
Change-Id: Ie288cb8090d6fb5e5c715afa6ea5660b17c019e0
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:21:09 +0000 (17:21 -0700)]
am
90177e59: (-s ours) am
d40575eb: am
b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
* commit '
90177e59e5211dd9ab33761ce800e8a86a49d1e2':
DO NOT MERGE Action bar config changes
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
Chet Haase [Thu, 19 May 2011 20:50:47 +0000 (13:50 -0700)]
Enable large font rendering with GPU acceleration
Change-Id: I7b022100fb0762613f9cf7753dbb0217e1e75f8d
Mathias Agopian [Thu, 19 May 2011 23:23:25 +0000 (16:23 -0700)]
Merge "Fix a crasher in SensorService"
Mathias Agopian [Thu, 19 May 2011 23:21:32 +0000 (16:21 -0700)]
Fix a crasher in SensorService
SensorService main thread wasn't java-enabled. however, in
some situations we end-up calling into the BatteryService from
that thread which causes a crash.
Change-Id: Iffba90e4c4b743dba84d62f1342001a9db31916d
Romain Guy [Thu, 19 May 2011 23:16:43 +0000 (16:16 -0700)]
Merge "Code cleanup."
Romain Guy [Thu, 19 May 2011 23:15:46 +0000 (16:15 -0700)]
Code cleanup.
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
Adam Powell [Thu, 19 May 2011 22:48:38 +0000 (15:48 -0700)]
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
Mathias Agopian [Thu, 19 May 2011 22:47:43 +0000 (15:47 -0700)]
Merge changes Id3a4a573,I7adf4ef0
* changes:
eglTerminate() now actually frees up all active egl objects
refactor EGL source code
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
John Reck [Thu, 19 May 2011 22:23:58 +0000 (15:23 -0700)]
Merge "expandGroup can now animate"
Irfan Sheriff [Thu, 19 May 2011 22:17:33 +0000 (15:17 -0700)]
am
5b9ceeba: am
a4815c0e: am
9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
* commit '
5b9ceebafd36db4491a49c1f00750ce50c4d4433':
Move softap config handling to WifiConfigStore
Chet Haase [Thu, 19 May 2011 22:17:14 +0000 (15:17 -0700)]
am
7189d571: (-s ours) am
f0c6ddd9: am
51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
* commit '
7189d571e2748972e1599ead3d503a9b185fdd3c':
DO NOT MERGE: Add custom fragment anims for popping backstack
Kenny Root [Thu, 19 May 2011 22:02:18 +0000 (15:02 -0700)]
resolved conflicts for merge of
b2d0ee16 to master
Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
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
Alex Sakhartchouk [Thu, 19 May 2011 21:58:49 +0000 (14:58 -0700)]
Removing unused code
Change-Id: I6eee2a6c9b9aa313a6ec16ad7ea28c075d1939a4
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