OSDN Git Service
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 18:29:08 +0000 (11:29 -0700)]
Ummm... f*, stop breaking the build.
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
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
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
Kazuhiro Ondo [Tue, 7 Jun 2011 15:45:49 +0000 (10:45 -0500)]
Set locale based on SIM preferred language.
Unless user had selected a desired locale, EFli or EFpl will be
used to decide the locale to be used.
Note this locale setting is not persistent - only valid while
SIM card is present.
Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
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
Mike Lockwood [Thu, 9 Jun 2011 18:48:11 +0000 (14:48 -0400)]
UsbService: Fix JNI reference leak
http://code.google.com/p/android/issues/detail?id=17365
Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
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.
Justin Ho [Thu, 9 Jun 2011 16:42:22 +0000 (09:42 -0700)]
Updating default wallpaper of large devices to match xlarge
Change-Id: I3fbcefce70e862fdc8e332f919485f1ec904a1b1
Marco Nelissen [Thu, 9 Jun 2011 16:39:52 +0000 (09:39 -0700)]
Make sure we don't read from invalid fds
b/
4580570
Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
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:51:44 +0000 (21:51 -0700)]
Fix for not reporting correct "sw" in compat mode.
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
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
Dianne Hackborn [Thu, 9 Jun 2011 03:24:29 +0000 (20:24 -0700)]
Fix issue #
4582417: Need to add new PackageManager...
...FEATURE_ constant for FAKE_MULTITOUCH in MR2
Change-Id: Ib6950d9dbdd58618aec593de7e0cf1c01b7d6ef9
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:33:56 +0000 (19:33 -0700)]
Set emergency call text visibility.
Set emergency call text visibility based on
emergencyCallCapable config for sim missing
and networklock screens.
bug:
4392059
Change-Id: Ibfe92405ada7b452927940295c090d88ecd79519
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
Jim Miller [Sat, 21 May 2011 00:11:04 +0000 (17:11 -0700)]
Fix layout issue on Xoom when device thinks there's a SIM.
bug:
4411799
Change-Id: I2c7deff557bcd226444730401c8347ea3d6cab56
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
Xavier Ducrohet [Wed, 8 Jun 2011 00:48:35 +0000 (17:48 -0700)]
Merge
06942bc4 from hc-mr1.
Layoutlib - use the new getParser callback when possible.
Change-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223
Xavier Ducrohet [Wed, 8 Jun 2011 00:03:10 +0000 (17:03 -0700)]
Merge
988eeeb5 from hc-mr1.
Support for custom declare-styleable attr with enum/flag in layoutlib.
Change-Id: I10426a3f2c76bed207c03fab7885b4269337a70f
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
Adam Powell [Wed, 8 Jun 2011 22:13:50 +0000 (15:13 -0700)]
Public styles for action bar tabs
Change-Id: Id77d32c6d83ea72662ae8972710860f5fe42e617
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"
John Wang [Tue, 7 Jun 2011 22:37:09 +0000 (15:37 -0700)]
Do not merge. Return null id for Non-phone device.
For non-phone device, i.e. tablet doesn't have voice capability,
getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.
This behavior is suggested by developer scheme
http://android-developers.blogspot.com/2011/03/identifying-app-installations.html
and enforced by CTS testGetDeviceId.
bug:
4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
Kazuhiro Ondo [Sat, 4 Jun 2011 00:13:35 +0000 (19:13 -0500)]
Report data status from ApnContext even if data is detached
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.
The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.
Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
Jean-Baptiste Queru [Wed, 8 Jun 2011 20:00:58 +0000 (13:00 -0700)]
Tweak setViewport stuff for fwd-compat
Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
Wink Saville [Wed, 8 Jun 2011 19:59:37 +0000 (12:59 -0700)]
am
a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
* commit '
a558fdf156601a477964139fee57da29de7f31b3':
Fix default preferred network.
Kazuhiro Ondo [Wed, 1 Jun 2011 05:38:42 +0000 (00:38 -0500)]
Use CSIM to get provision information
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.
Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.
Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
Wink Saville [Wed, 8 Jun 2011 19:56:27 +0000 (12:56 -0700)]
Merge "Fix default preferred network." into honeycomb-LTE
Wink Saville [Wed, 8 Jun 2011 19:18:07 +0000 (12:18 -0700)]
Fix default preferred network.
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.
Some cleanup.
Bug:
4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
Jeff Brown [Tue, 7 Jun 2011 23:58:06 +0000 (16:58 -0700)]
Merge "Fix swipe gesture cosine calculation. Bug:
4124987" into honeycomb-mr2
Jeff Brown [Tue, 7 Jun 2011 23:50:14 +0000 (16:50 -0700)]
Fix swipe gesture cosine calculation.
Bug:
4124987
Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.
Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
Adam Powell [Tue, 7 Jun 2011 23:37:35 +0000 (16:37 -0700)]
am
7ed8ff18: am
68b81434: Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '
7ed8ff18ce16312b86bd7da855e185b9ecc934a8':
Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector
Jake Hamby [Tue, 7 Jun 2011 23:32:10 +0000 (16:32 -0700)]
am
ae62b7b0: resolved conflicts for merge of
66040bbb to gingerbread-plus-aosp
* commit '
ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
Fixes for SMS Cell Broadcast support.
Jake Hamby [Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)]
resolved conflicts for merge of
66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
Adam Powell [Tue, 7 Jun 2011 23:22:32 +0000 (16:22 -0700)]
am
68b81434: Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
* commit '
68b81434963db90e0d5b14710e4edd86084ede3c':
Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector
Adam Powell [Tue, 7 Jun 2011 23:19:26 +0000 (16:19 -0700)]
Merge "Fix bug
4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2
Adam Powell [Tue, 7 Jun 2011 23:13:08 +0000 (16:13 -0700)]
Fix bug
4533120 - rough handling of invalid event streams in
ScaleGestureDetector
Make ScaleGestureDetector a bit more tolerant of bogus event streams.
Change-Id: I28a8b1ea494b7f1ca9d4c4623b95aee38f213369
John Wang [Tue, 7 Jun 2011 22:56:19 +0000 (15:56 -0700)]
am
fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit '
fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
Make getDeviceId return null for Non-phone device.
Dianne Hackborn [Tue, 7 Jun 2011 22:56:05 +0000 (15:56 -0700)]
am
ee3de4a9: am
a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '
ee3de4a950a188c6a4d5fb732242249af4807837':
Remove compat mode dialog.
Dianne Hackborn [Tue, 7 Jun 2011 22:52:38 +0000 (15:52 -0700)]
am
b5b98f87: am
dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '
b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
DO NOT MERGE. Experimental compatibility mode UI.
John Wang [Tue, 7 Jun 2011 22:49:34 +0000 (15:49 -0700)]
Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
Dianne Hackborn [Tue, 7 Jun 2011 22:47:14 +0000 (15:47 -0700)]
am
a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '
a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
Remove compat mode dialog.
Dianne Hackborn [Tue, 7 Jun 2011 22:45:14 +0000 (15:45 -0700)]
Merge "Remove compat mode dialog." into honeycomb-mr2
Dianne Hackborn [Tue, 7 Jun 2011 22:44:22 +0000 (15:44 -0700)]
Remove compat mode dialog.
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
Dianne Hackborn [Tue, 7 Jun 2011 22:39:43 +0000 (15:39 -0700)]
am
dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
* commit '
dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
DO NOT MERGE. Experimental compatibility mode UI.
John Wang [Tue, 7 Jun 2011 22:37:09 +0000 (15:37 -0700)]
Make getDeviceId return null for Non-phone device.
For non-phone device, i.e. tablet doesn't have voice capability,
getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.
This behavior is suggested by developer scheme
http://android-developers.blogspot.com/2011/03/identifying-app-installations.html
and enforced by CTS testGetDeviceId.
bug:
4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
Dianne Hackborn [Tue, 7 Jun 2011 22:36:51 +0000 (15:36 -0700)]
Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2
Xavier Ducrohet [Tue, 7 Jun 2011 22:09:39 +0000 (15:09 -0700)]
am
67f09cd0: (-s ours) am
d6ce6791: Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '
67f09cd090adae6365ca36546b0a517e51255876':
Cherrypick
d1ed33c4 from hc-mr1. do not merge.
Xavier Ducrohet [Tue, 7 Jun 2011 22:09:31 +0000 (15:09 -0700)]
am
ab3f5779: (-s ours) am
ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit '
ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f':
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Romain Guy [Tue, 7 Jun 2011 22:09:02 +0000 (15:09 -0700)]
am
fbef58fa: am
258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '
fbef58faad5a31faf36294e4d160cbd148ed5458':
Disable plugins if setPluginsEnabled(false) called.
Jake Hamby [Tue, 7 Jun 2011 22:03:51 +0000 (15:03 -0700)]
Merge "resolved conflicts for merge of
0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Mathias Agopian [Tue, 7 Jun 2011 22:02:53 +0000 (15:02 -0700)]
am
a6a4a9ed: am
f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit '
a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
fix a surface leak introduced by a failed merge (DO NOT MERGE)
OSDN Git Service
