OSDN Git Service
Wink Saville [Tue, 14 Jun 2011 21:48:51 +0000 (14:48 -0700)]
am
fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '
fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
Wink Saville [Tue, 14 Jun 2011 21:47:07 +0000 (14:47 -0700)]
am
c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit '
c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
Wink Saville [Tue, 14 Jun 2011 21:47:04 +0000 (14:47 -0700)]
am
82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '
82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
Wink Saville [Tue, 14 Jun 2011 21:44:31 +0000 (14:44 -0700)]
Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:23 +0000 (14:44 -0700)]
Merge "Make APN re-connect delay configuable" into honeycomb-LTE
Wink Saville [Tue, 14 Jun 2011 21:44:12 +0000 (14:44 -0700)]
Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
Mathias Agopian [Tue, 14 Jun 2011 20:30:34 +0000 (13:30 -0700)]
am
a9007fbd: am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
a9007fbdae6671f66535da4b9dad04b19aaf9186':
DO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 20:26:38 +0000 (13:26 -0700)]
am
69b4587b: DO NOT MERGE. may fix build on some version of gcc
* commit '
69b4587bfbb3e98f793959d9123340360fa233a2':
DO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
Dianne Hackborn [Tue, 14 Jun 2011 18:42:09 +0000 (11:42 -0700)]
am
74c48f2b: am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
74c48f2b2b7084e1bfddb2dddf7587b0cf821ea6':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:40:06 +0000 (11:40 -0700)]
am
6c0533f9: am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
Add new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 18:38:01 +0000 (11:38 -0700)]
am
700a1f25: Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
* commit '
700a1f25719138b94c453beb6325e627a11a9883':
Update resources documentation with new qualifiers.
Dianne Hackborn [Tue, 14 Jun 2011 18:36:05 +0000 (11:36 -0700)]
am
c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '
c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
Add new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 18:27:09 +0000 (11:27 -0700)]
Merge "Update resources documentation with new qualifiers." into honeycomb-mr2
Dianne Hackborn [Tue, 14 Jun 2011 18:24:29 +0000 (11:24 -0700)]
Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
John Wang [Tue, 14 Jun 2011 17:05:40 +0000 (10:05 -0700)]
am
49572479: Update sim missing message in lock screen.
* commit '
49572479a9cb479f2b323f011c1a9f8142ec1a46':
Update sim missing message in lock screen.
Mathias Agopian [Mon, 13 Jun 2011 21:15:00 +0000 (14:15 -0700)]
am
77079399: am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
77079399fca3e9c71e2ac06f3da26934e1c278b9':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 21:13:21 +0000 (14:13 -0700)]
am
a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
Jean-Baptiste Queru [Mon, 13 Jun 2011 19:25:21 +0000 (12:25 -0700)]
Merge/Ignore
653fd9cf
Change-Id: Ia17ee5cace2d97d87de821a82d4412f6e60aac65
Dan Morrill [Mon, 13 Jun 2011 18:59:38 +0000 (11:59 -0700)]
Fix merge conflict for '
c2e1e329'.
Conflicts:
core/res/res/values/config.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
Dan Morrill [Sat, 11 Jun 2011 16:52:50 +0000 (09:52 -0700)]
am
8688d470: Moving flag to a member field instead of a stack variable.
* commit '
8688d4708117db446d6ba2855f1d8ad715bb4d72':
Moving flag to a member field instead of a stack variable.
Dianne Hackborn [Sat, 11 Jun 2011 01:42:12 +0000 (18:42 -0700)]
am
fc441bff: am
fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
* commit '
fc441bfff9eb68be08eb922ea05c78c5d6fba27a':
Fix some problems with moving in and out of detached state.
Dianne Hackborn [Sat, 11 Jun 2011 01:39:48 +0000 (18:39 -0700)]
am
fd63814a: Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
* commit '
fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6':
Fix some problems with moving in and out of detached state.
Dianne Hackborn [Sat, 11 Jun 2011 01:37:22 +0000 (18:37 -0700)]
Merge "Fix some problems with moving in and out of detached state." into honeycomb-mr2
Jim Miller [Sat, 11 Jun 2011 00:43:37 +0000 (17:43 -0700)]
am
5fe24ec7: am
8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
* commit '
5fe24ec77d183774dfb06262b80b32be608480c7':
Fix layout issue on table when device thinks there's a SIM.
Jim Miller [Sat, 11 Jun 2011 00:41:20 +0000 (17:41 -0700)]
am
8daefb9c: Fix layout issue on table when device thinks there\'s a SIM.
* commit '
8daefb9c63cce5e0a87ba38c40dd4f48be3809e1':
Fix layout issue on table when device thinks there's a SIM.
John Wang [Sat, 11 Jun 2011 00:28:11 +0000 (17:28 -0700)]
am
2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
* commit '
2addaf97b319e257677ac3e5bbb772ba40cfa78a':
Add toString for IccCard Status and App.
John Wang [Sat, 11 Jun 2011 00:19:42 +0000 (17:19 -0700)]
Merge "Add toString for IccCard Status and App." into honeycomb-LTE
Teng-Hui Zhu [Fri, 10 Jun 2011 21:27:13 +0000 (14:27 -0700)]
am
b5141a9f: am
90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '
b5141a9fc7e841167c3e07f8797d8aef9a787d25':
fix one NPE when webChromeClient don't have progress view support
Teng-Hui Zhu [Fri, 10 Jun 2011 21:22:52 +0000 (14:22 -0700)]
am
90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '
90bdb69bf95e5865547a55260dd61744b0bcc911':
fix one NPE when webChromeClient don't have progress view support
Teng-Hui Zhu [Fri, 10 Jun 2011 21:19:22 +0000 (14:19 -0700)]
Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2
Robert Greenwalt [Fri, 10 Jun 2011 21:13:25 +0000 (14:13 -0700)]
am
1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
* commit '
1ea549e8990d2d73ccd9e92db1e7312423ee423e':
CDMALTE: Get roaming status based on SID/NID
Robert Greenwalt [Fri, 10 Jun 2011 21:08:28 +0000 (14:08 -0700)]
Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
Dianne Hackborn [Fri, 10 Jun 2011 14:46:51 +0000 (07:46 -0700)]
am
5624b793: am
2bb2d48f: Commit final (maybe) MR 2 API.
* commit '
5624b793cb791621a586931d9f02eefdf6cfc7c8':
Commit final (maybe) MR 2 API.
Dianne Hackborn [Fri, 10 Jun 2011 14:46:27 +0000 (07:46 -0700)]
Dianne Hackborn [Fri, 10 Jun 2011 14:45:38 +0000 (07:45 -0700)]
am
c6adfed6: am
f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit '
c6adfed6dcea8482e482db58bd396ea8de08426a':
Okay *now* really enforce the limit on non-public styles.
Dianne Hackborn [Fri, 10 Jun 2011 02:26:25 +0000 (19:26 -0700)]
am
2bb2d48f: Commit final (maybe) MR 2 API.
* commit '
2bb2d48f9ca1726b8de957ec7ea321c767409c12':
Commit final (maybe) MR 2 API.
Dianne Hackborn [Fri, 10 Jun 2011 00:40:08 +0000 (17:40 -0700)]
Dianne Hackborn [Fri, 10 Jun 2011 00:28:00 +0000 (17:28 -0700)]
am
f795e9a8: Okay *now* really enforce the limit on non-public styles.
* commit '
f795e9a86d4f62e5314ef95978c3ea17d90975db':
Okay *now* really enforce the limit on non-public styles.
Dianne Hackborn [Thu, 9 Jun 2011 23:18:07 +0000 (16:18 -0700)]
am
820caf7b: am
8821ba86: Ummm... f*, stop breaking the build.
* commit '
820caf7b04f1e5c83599437e9e783e91322eb4f9':
Ummm... f*, stop breaking the build.
Dianne Hackborn [Thu, 9 Jun 2011 23:14:12 +0000 (16:14 -0700)]
am
8821ba86: Ummm... f*, stop breaking the build.
* commit '
8821ba860693f5206c56ae727a4231e4d6f0a735':
Ummm... f*, stop breaking the build.
Dianne Hackborn [Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)]
am
a8d7ea06: am
220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '
a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
Enforce public resource restriction on bag parents.
Dianne Hackborn [Thu, 9 Jun 2011 23:02:02 +0000 (16:02 -0700)]
am
220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
* commit '
220cd77de62956eb76c5084e1d1341d69bfd214a':
Enforce public resource restriction on bag parents.
Dianne Hackborn [Thu, 9 Jun 2011 22:55:54 +0000 (15:55 -0700)]
Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2
Robert Greenwalt [Thu, 9 Jun 2011 22:54:45 +0000 (15:54 -0700)]
am
75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE
* commit '
75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22':
Set locale based on SIM preferred language.
Robert Greenwalt [Thu, 9 Jun 2011 22:48:16 +0000 (15:48 -0700)]
Merge "Set locale based on SIM preferred language." into honeycomb-LTE
Dianne Hackborn [Thu, 9 Jun 2011 18:29:08 +0000 (11:29 -0700)]
Enforce public resource restriction on bag parents.
Need to put some more styles in the SDK to avoid breaking apps.
Also, welcome Android 3.2.
Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
Dan Morrill [Thu, 9 Jun 2011 21:52:40 +0000 (14:52 -0700)]
am
a1a107b8: Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread
* commit '
a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
Dan Morrill [Thu, 9 Jun 2011 21:43:58 +0000 (14:43 -0700)]
Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread
James Dong [Thu, 9 Jun 2011 19:50:25 +0000 (12:50 -0700)]
am
2488a943: am
e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit '
2488a94350e0c0b088da2646557c9a0f3a0e9847':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
Mike Lockwood [Thu, 9 Jun 2011 19:50:23 +0000 (12:50 -0700)]
am
e502c536: am
b3174c46: UsbService: Fix JNI reference leak
* commit '
e502c5364f8e715eb0da54441460b8f3cb76b7ff':
UsbService: Fix JNI reference leak
Justin Ho [Thu, 9 Jun 2011 19:50:10 +0000 (12:50 -0700)]
am
9b0a8f9a: am
1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit '
9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93':
Updating default wallpaper of large devices to match xlarge
Xavier Ducrohet [Thu, 9 Jun 2011 19:49:55 +0000 (12:49 -0700)]
am
2e0f7118: am
8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '
2e0f71181792780b55826bcc562ae79951e76f1b':
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Conley Owens [Thu, 9 Jun 2011 19:21:05 +0000 (12:21 -0700)]
am
644f36ea: am
d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit '
644f36eab4eb9911ad897c9caae68b9c5a72388f':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Conley Owens [Thu, 9 Jun 2011 19:14:11 +0000 (12:14 -0700)]
am
d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit '
d8b027b18f5a922ef729c6ee363eecb053358d47':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
James Dong [Thu, 9 Jun 2011 19:03:52 +0000 (12:03 -0700)]
am
e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit '
e3b80c838753fe8c9049950216c6379098465810':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
Mike Lockwood [Thu, 9 Jun 2011 19:01:31 +0000 (12:01 -0700)]
am
b3174c46: UsbService: Fix JNI reference leak
* commit '
b3174c46ade0be4628813a74b317da538e367bc8':
UsbService: Fix JNI reference leak
James Dong [Thu, 9 Jun 2011 18:56:09 +0000 (11:56 -0700)]
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
Marco Nelissen [Thu, 9 Jun 2011 18:41:57 +0000 (11:41 -0700)]
am
90dc22fa: am
a02d9bf9: Make sure we don\'t read from invalid fds
* commit '
90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
Make sure we don't read from invalid fds
Conley Owens [Thu, 9 Jun 2011 18:12:04 +0000 (11:12 -0700)]
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
Marco Nelissen [Thu, 9 Jun 2011 17:36:24 +0000 (10:36 -0700)]
am
a02d9bf9: Make sure we don\'t read from invalid fds
* commit '
a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
Make sure we don't read from invalid fds
Justin Ho [Thu, 9 Jun 2011 17:22:17 +0000 (10:22 -0700)]
am
1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
* commit '
1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
Updating default wallpaper of large devices to match xlarge
Xavier Ducrohet [Thu, 9 Jun 2011 17:19:14 +0000 (10:19 -0700)]
am
8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '
8ee28811ad208d224ac8d317e4644aabc9ffb886':
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Justin Ho [Thu, 9 Jun 2011 17:18:13 +0000 (10:18 -0700)]
Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2
Xavier Ducrohet [Thu, 9 Jun 2011 17:12:40 +0000 (10:12 -0700)]
Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* changes:
Merge
06942bc4 from hc-mr1.
Merge
988eeeb5 from hc-mr1.
Dianne Hackborn [Thu, 9 Jun 2011 05:38:03 +0000 (22:38 -0700)]
am
3aabdeac: am
5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '
3aabdeaceff8405406d90c329a6691552559556d':
Fix for not reporting correct "sw" in compat mode.
Dianne Hackborn [Thu, 9 Jun 2011 05:35:25 +0000 (22:35 -0700)]
am
5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '
5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
Fix for not reporting correct "sw" in compat mode.
Dianne Hackborn [Thu, 9 Jun 2011 05:33:34 +0000 (22:33 -0700)]
Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
Dianne Hackborn [Thu, 9 Jun 2011 04:41:55 +0000 (21:41 -0700)]
am
2d618e41: am
e22fe933: Fix issue #
4582417: Need to add new PackageManager...
* commit '
2d618e415fa0ed8a1e7ac8d0ffe98cebdf6c208b':
Fix issue #
4582417: Need to add new PackageManager...
Dianne Hackborn [Thu, 9 Jun 2011 04:38:33 +0000 (21:38 -0700)]
am
e22fe933: Fix issue #
4582417: Need to add new PackageManager...
* commit '
e22fe9331ad8a9f81470751fdeca7633f654cffa':
Fix issue #
4582417: Need to add new PackageManager...
John Wang [Thu, 9 Jun 2011 03:41:41 +0000 (20:41 -0700)]
am
08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE
* commit '
08a8f3f9dc035bc462061ae87090a8da59c6713a':
Set emergency call text visibility.
John Wang [Thu, 9 Jun 2011 03:38:59 +0000 (20:38 -0700)]
Merge "Set emergency call text visibility." into honeycomb-LTE
Mathias Agopian [Thu, 9 Jun 2011 03:19:28 +0000 (20:19 -0700)]
am
17574b9a: (-s ours) am
19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '
17574b9a0a7cc1cf215935fce2474ca30d387046':
Fix a leak in RefBase (DO NOT MERGE)
Dianne Hackborn [Thu, 9 Jun 2011 03:06:40 +0000 (20:06 -0700)]
am
a1396dfe: am
02140891: Merge "Work on issue #
4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit '
a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
Work on issue #
4518815: Compatibility mode introduces compatibility regression...
Dianne Hackborn [Thu, 9 Jun 2011 03:02:43 +0000 (20:02 -0700)]
am
02140891: Merge "Work on issue #
4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit '
021408910af170268cb486910d4dd5a7d838c2bb':
Work on issue #
4518815: Compatibility mode introduces compatibility regression...
Dianne Hackborn [Thu, 9 Jun 2011 03:00:50 +0000 (20:00 -0700)]
Merge "Work on issue #
4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
Mathias Agopian [Thu, 9 Jun 2011 02:56:06 +0000 (19:56 -0700)]
am
19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '
19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
Fix a leak in RefBase (DO NOT MERGE)
John Wang [Thu, 9 Jun 2011 02:41:39 +0000 (19:41 -0700)]
am
735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE
* commit '
735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
Fix layout issue on Xoom when device thinks there's a SIM.
John Wang [Thu, 9 Jun 2011 02:37:56 +0000 (19:37 -0700)]
Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE
Mathias Agopian [Thu, 9 Jun 2011 02:34:30 +0000 (19:34 -0700)]
am
b40e85f9: am
645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
* commit '
b40e85f90146a654bfe5657187be491147814ea0':
Fix a leak in RefBase
Mathias Agopian [Thu, 9 Jun 2011 02:30:47 +0000 (19:30 -0700)]
am
645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2
* commit '
645434fb4eff408698423d70904fb8fc709a5225':
Fix a leak in RefBase
Mathias Agopian [Thu, 9 Jun 2011 02:28:39 +0000 (19:28 -0700)]
Merge "Fix a leak in RefBase" into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 21:09:47 +0000 (14:09 -0700)]
Work on issue #
4518815: Compatibility mode introduces compatibility regression...
...for Market App iRunner
There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.
Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.
Also a few changes here and there to get rid of $#*&^!! debug logs.
Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
Adam Powell [Thu, 9 Jun 2011 00:16:16 +0000 (17:16 -0700)]
am
73d54e7b: am
4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
* commit '
73d54e7b54f95401ad290bf9d305cad449db7ae3':
Public styles for action bar tabs
Adam Powell [Wed, 8 Jun 2011 23:58:35 +0000 (16:58 -0700)]
am
4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2
* commit '
4381f6421ca408d1dc66430ddfb107c5011bfe25':
Public styles for action bar tabs
Adam Powell [Wed, 8 Jun 2011 23:54:50 +0000 (16:54 -0700)]
Merge "Public styles for action bar tabs" into honeycomb-mr2
Mathias Agopian [Wed, 8 Jun 2011 23:05:30 +0000 (16:05 -0700)]
Fix a leak in RefBase
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Id85e749ba04521199555dd701198edd097c313d4
Mathias Agopian [Wed, 8 Jun 2011 23:05:30 +0000 (16:05 -0700)]
Fix a leak in RefBase (DO NOT MERGE)
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
Wink Saville [Wed, 8 Jun 2011 22:03:43 +0000 (15:03 -0700)]
am
799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
* commit '
799f04c09cc7284e0660d419bcb24af57b86f08e':
Report data status from ApnContext even if data is detached
Wink Saville [Wed, 8 Jun 2011 22:03:35 +0000 (15:03 -0700)]
am
33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE
* commit '
33e1424b2e924e9b0162aa648137e8254f729161':
Use CSIM to get provision information
Wink Saville [Wed, 8 Jun 2011 22:00:46 +0000 (15:00 -0700)]
Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
Wink Saville [Wed, 8 Jun 2011 21:58:53 +0000 (14:58 -0700)]
Merge "Use CSIM to get provision information" into honeycomb-LTE
Jean-Baptiste Queru [Wed, 8 Jun 2011 21:14:56 +0000 (14:14 -0700)]
am
0315a2c5: (-s ours) am
f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit '
0315a2c5640dc91cd1689db9dff997e43e4effca':
Tweak setViewport stuff for fwd-compat
Jean-Baptiste Queru [Wed, 8 Jun 2011 21:07:19 +0000 (14:07 -0700)]
am
f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit '
f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
Tweak setViewport stuff for fwd-compat
John Wang [Wed, 8 Jun 2011 21:04:37 +0000 (14:04 -0700)]
am
fe682fd7: am
cea03df2: Do not merge. Return null id for Non-phone device.
* commit '
fe682fd74d96f5a72259aed6dd27c02c8fc7caf7':
Do not merge. Return null id for Non-phone device.
Jeff Brown [Wed, 8 Jun 2011 21:04:33 +0000 (14:04 -0700)]
am
5f0b1721: am
25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
* commit '
5f0b1721eece5ca614044cda638f11fbec0eab0a':
Fix swipe gesture cosine calculation. Bug:
4124987
John Wang [Wed, 8 Jun 2011 20:52:26 +0000 (13:52 -0700)]
am
cea03df2: Do not merge. Return null id for Non-phone device.
* commit '
cea03df201dc6659654234bc5fbfebf1b6a06e42':
Do not merge. Return null id for Non-phone device.
Jeff Brown [Wed, 8 Jun 2011 20:52:22 +0000 (13:52 -0700)]
am
25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
* commit '
25bd8abce993e17b382ea5c29a1cb68dd095cf45':
Fix swipe gesture cosine calculation. Bug:
4124987
Jean-Baptiste Queru [Wed, 8 Jun 2011 20:10:58 +0000 (13:10 -0700)]
Merge "Tweak setViewport stuff for fwd-compat"
OSDN Git Service
