OSDN Git Service
Wink Saville [Wed, 25 Jul 2012 05:00:35 +0000 (22:00 -0700)]
am
bc8bab89: (-s ours) Merge "Don\'t send terminal response without cmd details." into jb-dev
* commit '
bc8bab8949e3ab1ccfff5b5b96ed3726cfa938bb':
Don't send terminal response without cmd details.
Wink Saville [Tue, 24 Jul 2012 15:27:02 +0000 (08:27 -0700)]
Merge "Don't send terminal response without cmd details." into jb-dev
Scott Main [Tue, 24 Jul 2012 01:49:55 +0000 (18:49 -0700)]
am
9f061e28: fix information about layout overrides bug:
6852515
* commit '
9f061e2809ce89e0646519791cb69825abbb03a5':
fix information about layout overrides bug:
6852515
Scott Main [Tue, 24 Jul 2012 01:49:50 +0000 (18:49 -0700)]
am
fc815c32: Merge "docs: update Building Your First App class to reflect changes to New Project setup in eclipse" into jb-dev
* commit '
fc815c328bea63c2dee7e67b81c95d7c4d5696bb':
docs: update Building Your First App class to reflect changes to New Project setup in eclipse
Jake Hamby [Tue, 24 Jul 2012 01:33:11 +0000 (18:33 -0700)]
resolved conflicts for merge of
f364fccf to jb-dev-plus-aosp
Change-Id: If2913010a98e7c0d1cb3a9efc3389b50d4079532
Scott Main [Tue, 24 Jul 2012 01:32:03 +0000 (18:32 -0700)]
fix information about layout overrides
bug:
6852515
Change-Id: I80681a06e87aad3de8243bb731d7513e5aa29d08
Scott Main [Tue, 24 Jul 2012 01:20:08 +0000 (18:20 -0700)]
Merge "docs: update Building Your First App class to reflect changes to New Project setup in eclipse" into jb-dev
Scott Main [Fri, 20 Jul 2012 04:11:49 +0000 (21:11 -0700)]
docs: update Building Your First App class to reflect changes to New Project setup in eclipse
Change-Id: I57c02676fbc2886872c2d294c5517b458e8751c5
Jake Hamby [Mon, 23 Jul 2012 23:24:10 +0000 (16:24 -0700)]
Merge "Fix detection of CDMA cell broadcast messages." into jb-dev
Joe Fernandez [Mon, 23 Jul 2012 22:41:02 +0000 (15:41 -0700)]
am
7ba01780: Merge "Revert "docs: ADT r20.0.2 Release Notes, bug fixes"" into jb-dev
* commit '
7ba017807593bad0ae01204ff9c5f4af7d4a537a':
Revert "docs: ADT r20.0.2 Release Notes, bug fixes"
Joe Fernandez [Mon, 23 Jul 2012 22:38:19 +0000 (15:38 -0700)]
Merge "Revert "docs: ADT r20.0.2 Release Notes, bug fixes"" into jb-dev
Scott Main [Mon, 23 Jul 2012 22:30:42 +0000 (15:30 -0700)]
am
67922bb2: docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
* commit '
67922bb286c7a39afe6171cccdabcdcf96e0826a':
docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
Joe Fernandez [Mon, 23 Jul 2012 22:29:40 +0000 (15:29 -0700)]
Revert "docs: ADT r20.0.2 Release Notes, bug fixes"
This reverts commit
04364be7344a9429e7a07b1daf7da91bc684b264
Change-Id: I7d0c9c7a4e876de8e44c4f46578b8e5d60c488e6
Scott Main [Mon, 23 Jul 2012 21:33:42 +0000 (14:33 -0700)]
docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
Change-Id: I247d2bfd549a48dcaaa1c5668559e3d5d2cd6fc5
Jake Hamby [Mon, 23 Jul 2012 21:42:33 +0000 (14:42 -0700)]
Fix detection of CDMA cell broadcast messages.
The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.
Bug:
6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
Scott Main [Mon, 23 Jul 2012 18:03:10 +0000 (11:03 -0700)]
am
c7504032: Merge "docs: remove link that points to empty page" into jb-dev
* commit '
c7504032f3826a27da7ac9d75b1b56c7e4c4ce32':
docs: remove link that points to empty page
Scott Main [Mon, 23 Jul 2012 18:00:54 +0000 (11:00 -0700)]
Merge "docs: remove link that points to empty page" into jb-dev
Scott Main [Mon, 23 Jul 2012 17:58:03 +0000 (10:58 -0700)]
docs: remove link that points to empty page
Change-Id: I9adbacf5d5b3cdc47f9e8ff2f280e481b6a047b5
Joe Fernandez [Mon, 23 Jul 2012 16:48:58 +0000 (09:48 -0700)]
am
04364be7: docs: ADT r20.0.2 Release Notes, bug fixes
* commit '
04364be7344a9429e7a07b1daf7da91bc684b264':
docs: ADT r20.0.2 Release Notes, bug fixes
John Wang [Fri, 20 Jul 2012 01:08:55 +0000 (18:08 -0700)]
Don't send terminal response without cmd details.
bug:
6481578
Change-Id: Ie9f6e33c49307ddd884015a400f90e5477cc551e
Joe Fernandez [Fri, 20 Jul 2012 15:42:26 +0000 (08:42 -0700)]
docs: ADT r20.0.2 Release Notes, bug fixes
Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
Nick Kralevich [Fri, 20 Jul 2012 00:14:51 +0000 (17:14 -0700)]
am
2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"
* commit '
2c932143ffe865d49c741e466b425bdbabbd1f2f':
s/LOG/ALOG/ in HAVE_SELINUX blocks
Nick Kralevich [Thu, 19 Jul 2012 23:25:41 +0000 (16:25 -0700)]
Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"
Jake Hamby [Thu, 19 Jul 2012 23:02:26 +0000 (16:02 -0700)]
am
06d3df9a: Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"
* commit '
06d3df9aa05a0221a4cdc4245ae73f7936616170':
Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
Jake Hamby [Thu, 19 Jul 2012 22:30:02 +0000 (15:30 -0700)]
Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"
Xavier Ducrohet [Thu, 19 Jul 2012 21:30:39 +0000 (14:30 -0700)]
am
b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." into jb-dev
* commit '
b71393bd34a48eeb622292e78f43b99e374a5e3a':
Fix aapt -G to properly support class attr in fragment.
Xavier Ducrohet [Thu, 19 Jul 2012 21:27:58 +0000 (14:27 -0700)]
Merge "Fix aapt -G to properly support class attr in fragment." into jb-dev
Scott Main [Thu, 19 Jul 2012 18:31:27 +0000 (11:31 -0700)]
am
b949d416: update Google IO announcement on homepage
* commit '
b949d41602eb5118df5509a6731e55fcc0316874':
update Google IO announcement on homepage
Scott Main [Thu, 19 Jul 2012 18:23:01 +0000 (11:23 -0700)]
update Google IO announcement on homepage
Change-Id: If859991b64492d2b334271038c854342771566e4
Xavier Ducrohet [Thu, 19 Jul 2012 01:06:09 +0000 (18:06 -0700)]
Fix aapt -G to properly support class attr in fragment.
The code added attributes android:name and class to a
KeyedVector under the same key (fragment) so the 2nd
add (android:name) removed class with was never checked.
This replace the value type in the KeyedVector to be
Vector<NamespaceAttributePair> instead of just
NamespaceAttributePair.
Change-Id: I009b8a8cca878191661c2a63bb14c967d230498d
The Android Open Source Project [Thu, 19 Jul 2012 15:37:10 +0000 (08:37 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: I0249d315e647dcdc2f3dea4d258ef5bf2065731d
Brian Carlstrom [Thu, 19 Jul 2012 06:07:50 +0000 (23:07 -0700)]
am
553e3898: Merge "Improve test key names to reproduce public issue" into jb-dev
* commit '
553e3898c0ae5f7344d84279c7d425ffbeb6a90d':
Improve test key names to reproduce public issue
Brian Carlstrom [Thu, 19 Jul 2012 06:05:27 +0000 (23:05 -0700)]
Merge "Improve test key names to reproduce public issue" into jb-dev
The Android Automerger [Thu, 19 Jul 2012 04:44:46 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
James Dong [Thu, 19 Jul 2012 03:15:11 +0000 (20:15 -0700)]
am
5d478b9c: Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
* commit '
5d478b9c1009b077649f7f870d993832d380d63c':
Changed to obtain a parcel in each notify() call in jni.
Ying Wang [Thu, 19 Jul 2012 03:14:46 +0000 (20:14 -0700)]
am
a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
a4d4df16a6d18add37971bbd41ba58b4ce2ee608':
Import translations. DO NOT MERGE
Scott Main [Thu, 19 Jul 2012 03:14:39 +0000 (20:14 -0700)]
am
12a54752: docs: update hw accel attribute\'s default behavior and fix link to l10n tutorial
* commit '
12a5475205243bc2d069a87d2c7d4982b5f4d11d':
docs: update hw accel attribute's default behavior and fix link to l10n tutorial
Daniel Sandler [Thu, 19 Jul 2012 03:14:33 +0000 (20:14 -0700)]
am
0038ec11: Merge "Fix stuck status bars." into jb-dev
* commit '
0038ec1107baf179a54a2f10b6643f918b1e7059':
Fix stuck status bars.
Dirk Dougherty [Thu, 19 Jul 2012 03:14:28 +0000 (20:14 -0700)]
am
a44794f4: Merge "Doc change: add button link to developer console." into jb-dev
* commit '
a44794f45e46cec0f23a690480274aad171775d2':
Doc change: add button link to developer console.
Joe Fernandez [Thu, 19 Jul 2012 03:14:24 +0000 (20:14 -0700)]
am
23369747: Merge "docs: Updating <uses-sdk> docs, bug fix: b/
6836256" into jb-dev
* commit '
233697471689a41a36f69cc9bda1e663d2f67804':
docs: Updating <uses-sdk> docs, bug fix: b/
6836256
Romain Guy [Thu, 19 Jul 2012 03:14:02 +0000 (20:14 -0700)]
am
3409e728: Correctly pre-clip paths when recording display lists Bug #
6836448 External bug: code.google.com/p/android/issues/detail?id=34946
* commit '
3409e728e22609b54de8b33d1e614ca51f6d6a77':
Correctly pre-clip paths when recording display lists Bug #
6836448 External bug: http://code.google.com/p/android/issues/detail?id=34946
Scott Main [Thu, 19 Jul 2012 03:13:56 +0000 (20:13 -0700)]
am
634ccf7e: Merge "docs: fix broken links" into jb-dev
* commit '
634ccf7eb80046749df2f8f30ec3d4dc23fa3457':
docs: fix broken links
Joe Fernandez [Thu, 19 Jul 2012 03:13:47 +0000 (20:13 -0700)]
am
c98a56de: Merge "docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes" into jb-dev
* commit '
c98a56de61263b25920dbdc7fa9396c91ecbce7d':
docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes
James Dong [Thu, 19 Jul 2012 01:43:37 +0000 (18:43 -0700)]
Merge "Changed to obtain a parcel in each notify() call in jni." into jb-dev
Ying Wang [Wed, 18 Jul 2012 21:58:18 +0000 (14:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Naveen Kalla [Wed, 18 Jul 2012 21:51:11 +0000 (14:51 -0700)]
Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
This test was missed out while migrating telephony to frameworks/opt.
Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
Ying Wang [Wed, 18 Jul 2012 21:19:56 +0000 (14:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5077a3d3cb71f2dff0f460174134bdc49663e27b
Auto-generated-cl: translation import
Scott Main [Wed, 18 Jul 2012 18:31:21 +0000 (11:31 -0700)]
docs: update hw accel attribute's default behavior and fix link to l10n tutorial
Change-Id: I445a5ef7513749ab55537c16dac2ee00aee0859d
Daniel Sandler [Wed, 18 Jul 2012 17:30:45 +0000 (10:30 -0700)]
Merge "Fix stuck status bars." into jb-dev
Dirk Dougherty [Wed, 18 Jul 2012 16:59:08 +0000 (09:59 -0700)]
Merge "Doc change: add button link to developer console." into jb-dev
Joe Fernandez [Wed, 18 Jul 2012 16:05:06 +0000 (09:05 -0700)]
Merge "docs: Updating <uses-sdk> docs, bug fix: b/
6836256" into jb-dev
Brian Carlstrom [Wed, 18 Jul 2012 06:40:49 +0000 (23:40 -0700)]
Improve test key names to reproduce public issue
Also fixes other unrelated test failures.
Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug:
6837950
Change-Id: I2c5ed1cbfbe0ab6f4ddd8619696d6545be0519a8
Daniel Sandler [Tue, 3 Jul 2012 18:31:22 +0000 (14:31 -0400)]
Fix stuck status bars.
An odd little bit of logic (attempting to defend against
the status bar getting stuck on orientation change) was
ironically causing it to get stuck if the bar was closed
twice in very rapid succession (which can happen if you
manage to click the settings button as the panel is about to
close).
Other tweaks to help defend against this sort of problem in
the future:
- When the screen goes off, immediately collapse the
notification panel (without animation)
- When completing panel collapse, force the height of the
expanded view to 0 (in case it ended up some other way by
this point).
- Reduce a weird little glitch when you start
animateCollapse() in the middle of a reveal animation.
(The panel would jump to full height.)
Bug:
6765842
Change-Id: I233467c73e130f64401333319943289cbf3daa56
Romain Guy [Wed, 18 Jul 2012 00:46:03 +0000 (17:46 -0700)]
Correctly pre-clip paths when recording display lists
Bug #
6836448
External bug: http://code.google.com/p/android/issues/detail?id=34946
DO NOT MERGE
DisplayListRenderer::drawPath was not invoking quickReject() properly,
passing x,y,width,height instead of left,top,right,bottom. A path
could thus get rejected when it should be drawn instead.
While working on this change I found a similar issue with another
drawing command, drawBitmapData().
Change-Id: I8306faf72db14d71b54ecb7de295c9a6957d9494
Robert Greenwalt [Tue, 17 Jul 2012 23:55:22 +0000 (16:55 -0700)]
Merge commit '
c8cb059f' into manualmerge
Conflicts:
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
Scott Main [Tue, 17 Jul 2012 23:46:11 +0000 (16:46 -0700)]
Merge "docs: fix broken links" into jb-dev
Joe Fernandez [Tue, 17 Jul 2012 23:45:58 +0000 (16:45 -0700)]
docs: Updating <uses-sdk> docs, bug fix: b/
6836256
Change-Id: I61e80e843db09b748417f2a234600edad922cdc5
Dirk Dougherty [Tue, 17 Jul 2012 23:36:28 +0000 (16:36 -0700)]
Doc change: add button link to developer console.
Change-Id: Ib53dce17ef99b62e7de5b6ef716ab5a4a8617800
Joe Fernandez [Tue, 17 Jul 2012 22:56:15 +0000 (15:56 -0700)]
Merge "docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes" into jb-dev
Joe Fernandez [Sat, 14 Jul 2012 00:31:31 +0000 (17:31 -0700)]
docs: SDK/ADT r20.0.1, NDK r8b, Platform 4.1.1 Release Notes
Change-Id: Ibaf20b014465df91fecfaccd79e778000fdbc90f
Scott Main [Tue, 17 Jul 2012 22:36:32 +0000 (15:36 -0700)]
docs: fix broken links
Change-Id: Ic2ca7a3ae1d8283d2b101028c5782159d822d98f
Robert Greenwalt [Tue, 17 Jul 2012 22:10:10 +0000 (15:10 -0700)]
Merge "Fix our interpretation of apn setting's bearer." into jb-dev
Robert Greenwalt [Tue, 17 Jul 2012 21:46:34 +0000 (14:46 -0700)]
Fix our interpretation of apn setting's bearer.
Between ICS and JB we changed it to use TelephonyManager's network type
enumeration. This changes it back to represent the RIL's radio
technology. The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.
bug:
6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
Scott Main [Tue, 17 Jul 2012 21:14:40 +0000 (14:14 -0700)]
am
28a3897d: docs: re-add download.jd file to support archived SDK downloads
* commit '
28a3897d08e0d2bce69225a89cbada792761f0ed':
docs: re-add download.jd file to support archived SDK downloads
Scott Main [Tue, 17 Jul 2012 19:57:03 +0000 (12:57 -0700)]
docs: re-add download.jd file to support archived SDK downloads
Change-Id: If814238c8fa017ce10e7fe770826a1e162fe5e87
Wink Saville [Tue, 17 Jul 2012 19:36:56 +0000 (12:36 -0700)]
am
33034b13: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '
33034b13cae1429d526722374bd39be3f9605ae4':
Create telephony-common and mms-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:30:57 +0000 (12:30 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Wink Saville [Tue, 10 Jul 2012 19:37:54 +0000 (12:37 -0700)]
Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
Ying Wang [Tue, 17 Jul 2012 19:22:31 +0000 (12:22 -0700)]
am
1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
1ed1c399939e035707dd6da7057570a8da96394e':
Import translations. DO NOT MERGE
Ying Wang [Tue, 17 Jul 2012 19:19:12 +0000 (12:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Dirk Dougherty [Tue, 17 Jul 2012 19:17:10 +0000 (12:17 -0700)]
am
1c185c20: Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev
* commit '
1c185c2068212c78d124897fdfe33cebb194d84a':
Doc change: Fixes to IAB purchase state docs.
Dirk Dougherty [Tue, 17 Jul 2012 19:14:09 +0000 (12:14 -0700)]
Merge "Doc change: Fixes to IAB purchase state docs." into jb-dev
Roman Nurik [Tue, 17 Jul 2012 19:06:22 +0000 (12:06 -0700)]
am
d0e84d30: docs: Add link to action bar design pattern.
* commit '
d0e84d30c89300993d45307959a86ad1ceb06da2':
docs: Add link to action bar design pattern.
Ying Wang [Tue, 17 Jul 2012 18:31:03 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c3c2a4556764f14d354ea0431b6cba175b2c49f
Auto-generated-cl: translation import
Roman Nurik [Tue, 17 Jul 2012 17:28:22 +0000 (10:28 -0700)]
docs: Add link to action bar design pattern.
Change-Id: I3e00c3bb81f785c70138ae1069e065d9118f031e
related-to-bug:
5833099
Elliott Hughes [Tue, 17 Jul 2012 01:15:45 +0000 (18:15 -0700)]
am
3c04cc44: Merge "Don\'t talk about Froyo as if it\'s still in the future."
* commit '
3c04cc44c400d0ed2155428fa50d5facc91cd893':
Don't talk about Froyo as if it's still in the future.
Adam Powell [Tue, 17 Jul 2012 00:33:40 +0000 (17:33 -0700)]
am
38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev
* commit '
388953942b536b5eebd942ef78ae5b7499bc2078':
Properly switch MediaRouter to wired audio over a2dp.
Adam Powell [Tue, 17 Jul 2012 00:30:42 +0000 (17:30 -0700)]
Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev
Scott Main [Mon, 16 Jul 2012 22:50:01 +0000 (15:50 -0700)]
am
1878bef2: Merge "docs: adjustments to correct text alignment" into jb-dev
* commit '
1878bef2c455e11b6166326130d422a1c10ee1b1':
docs: adjustments to correct text alignment
Dirk Dougherty [Mon, 16 Jul 2012 22:46:49 +0000 (15:46 -0700)]
am
63c3117e: Merge "Doc change: API diffs for 16." into jb-dev
* commit '
63c3117e275e54707606eeb9bf6aa0955919c80c':
Doc change: API diffs for 16.
Scott Main [Mon, 16 Jul 2012 22:46:35 +0000 (15:46 -0700)]
Merge "docs: adjustments to correct text alignment" into jb-dev
Dirk Dougherty [Mon, 16 Jul 2012 22:44:07 +0000 (15:44 -0700)]
Merge "Doc change: API diffs for 16." into jb-dev
Scott Main [Mon, 16 Jul 2012 22:40:59 +0000 (15:40 -0700)]
docs: adjustments to correct text alignment
Change-Id: Iaec7412d56431713cd6976f76bf1ab4e06efb1ce
Elliott Hughes [Mon, 16 Jul 2012 22:40:25 +0000 (15:40 -0700)]
Merge "Don't talk about Froyo as if it's still in the future."
Adam Cohen [Mon, 16 Jul 2012 22:33:19 +0000 (15:33 -0700)]
am
c80f72f7: Merge "Fixing issue where you couldn\'t set null RemoteViews for a widget" into jb-dev
* commit '
c80f72f75e8d5b5fa85b694b64510fad74ea345d':
Fixing issue where you couldn't set null RemoteViews for a widget
Elliott Hughes [Mon, 16 Jul 2012 22:30:53 +0000 (15:30 -0700)]
Don't talk about Froyo as if it's still in the future.
Change-Id: I40c26a7a27459f7e8dd51c9f03fa860dee3a3a02
Adam Cohen [Mon, 16 Jul 2012 22:29:44 +0000 (15:29 -0700)]
Merge "Fixing issue where you couldn't set null RemoteViews for a widget" into jb-dev
Katie McCormick [Mon, 16 Jul 2012 22:14:15 +0000 (15:14 -0700)]
am
eb672796: Merge "Doc update: GCM doc cleanup, continued." into jb-dev
* commit '
eb6727963713137a0f68f02207f057ebec597691':
Doc update: GCM doc cleanup, continued.
Katie McCormick [Mon, 16 Jul 2012 22:11:45 +0000 (15:11 -0700)]
Merge "Doc update: GCM doc cleanup, continued." into jb-dev
Katie McCormick [Thu, 12 Jul 2012 18:57:36 +0000 (11:57 -0700)]
Doc update: GCM doc cleanup, continued.
Change-Id: Ia668bc6b80b5d53c9fa815db888e75d8efbbc772
Adam Cohen [Mon, 16 Jul 2012 19:02:10 +0000 (12:02 -0700)]
Fixing issue where you couldn't set null RemoteViews for a widget
-> As noted here: http://code.google.com/p/android/issues/detail?id=35014
Change-Id: Id5d1c47b6961d4b448453d8b16700801c0137f2b
Ying Wang [Mon, 16 Jul 2012 18:50:32 +0000 (11:50 -0700)]
am
6b7b9b4a: Import translations. DO NOT MERGE
* commit '
6b7b9b4abe3a55a5349951f64a348826e90996c9':
Import translations. DO NOT MERGE
Ying Wang [Mon, 16 Jul 2012 18:29:20 +0000 (11:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I90c2a81acb707d11c4268ed78c8c06871370faa6
Auto-generated-cl: translation import
Dirk Dougherty [Mon, 16 Jul 2012 18:02:25 +0000 (11:02 -0700)]
Doc change: API diffs for 16.
Change-Id: Id6c4f7f1f7d869847de580d8b2431b37e69260b4
Dirk Dougherty [Wed, 11 Jul 2012 23:07:32 +0000 (16:07 -0700)]
Doc change: Fixes to IAB purchase state docs.
Change-Id: I7ae5db84c3783085e2c3fbbf3b43fab68e6e89e9
Romain Guy [Mon, 16 Jul 2012 08:55:55 +0000 (01:55 -0700)]
am
8d170421: Merge "Fix wrong condition."
* commit '
8d1704215e80ebec61f6d77c503d83b32d881096':
Fix wrong condition.
Romain Guy [Mon, 16 Jul 2012 07:57:42 +0000 (00:57 -0700)]
Merge "Fix wrong condition."
SeongJae Park [Sat, 14 Jul 2012 05:18:51 +0000 (14:18 +0900)]
Fix wrong condition.
Should check width and height, not width and width.
Change-Id: Ie84d3605b2a7a0f4776adb876608ea92f56817c4
Wink Saville [Thu, 28 Jun 2012 16:34:41 +0000 (09:34 -0700)]
Preserve retryCount when retrying.
Bug:
6529189
Change-Id: I743aed08aa161d91899aeb2ccacffcd224e48c0a
Wink Saville [Thu, 21 Jun 2012 06:47:40 +0000 (23:47 -0700)]
When reconnecting disassociate dc and apnContext.
This is done in onActionIntentReconnectAlarm, which is called when
retrying after an error, by setting the ApnContext.DataConnection &
DataConnctionAc to null which intern clears the DataConnection.mApnList.
With the mApnList cleared DataConnection.mRefCount will not be incremented
because the DC will not be found by findReadyDataConnection. Thus fixing
at least one cause of
6529189.
Bug:
6529189
Change-Id: I40ff1966f6fbd2f69e97d77b9db7122e4c5b992f