OSDN Git Service
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:33 +0000 (14:48 -0700)]
Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:28 +0000 (14:48 -0700)]
Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp
Jean-Baptiste Queru [Mon, 2 Jul 2012 21:48:19 +0000 (14:48 -0700)]
Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp
Eric Fischer [Mon, 2 Jul 2012 21:09:49 +0000 (14:09 -0700)]
am
c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
c70ec659e8f63b31e11f5f0a82c638261d67056e':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 2 Jul 2012 21:07:11 +0000 (14:07 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
John Huang [Mon, 2 Jul 2012 19:55:01 +0000 (12:55 -0700)]
am
46c923af: Merge "Fix country code for Netherlands Antilles." into jb-dev
* commit '
46c923afd50741c8d185a6d0c7666a86c9dfe712':
Fix country code for Netherlands Antilles.
John Huang [Mon, 2 Jul 2012 19:52:29 +0000 (12:52 -0700)]
Merge "Fix country code for Netherlands Antilles." into jb-dev
Scott Main [Mon, 2 Jul 2012 19:36:14 +0000 (12:36 -0700)]
am
0dc12ee0: Merge "docs: new dashboard stats for 7/2" into jb-dev
* commit '
0dc12ee0f1cde86522724f176ed5a6d62142c47d':
docs: new dashboard stats for 7/2
Scott Main [Mon, 2 Jul 2012 19:33:03 +0000 (12:33 -0700)]
Merge "docs: new dashboard stats for 7/2" into jb-dev
Wink Saville [Mon, 2 Jul 2012 19:26:21 +0000 (12:26 -0700)]
Fix country code for Netherlands Antilles.
Change the cc to "ai" from "nl" otherwise the timezone is
set to Netherlands which is +1 rather than the Caribbean
which is -4.
Bug:
6765706
Change-Id: Ie399efe95ce93b73eb4e60cfc47e621cce85e6e5
Eric Fischer [Mon, 2 Jul 2012 19:25:39 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5eae952127a0af6618ab96065cd50d78bbaea189
Auto-generated-cl: translation import
Scott Main [Mon, 2 Jul 2012 18:35:18 +0000 (11:35 -0700)]
docs: new dashboard stats for 7/2
Change-Id: I29cdbbc9ef11ccd6398613b8dce8e25ab406318f
Dirk Dougherty [Mon, 2 Jul 2012 18:18:38 +0000 (11:18 -0700)]
am
73d90e79: Merge "Doc change: fix incorrect links to dashboard." into jb-dev
* commit '
73d90e797bf52b52372314477553b140818717c9':
Doc change: fix incorrect links to dashboard.
Dirk Dougherty [Mon, 2 Jul 2012 18:15:29 +0000 (11:15 -0700)]
Merge "Doc change: fix incorrect links to dashboard." into jb-dev
Dirk Dougherty [Mon, 2 Jul 2012 18:07:20 +0000 (11:07 -0700)]
am
418203d1: Doc change: Add Google Play balance back into monetizing docs.
* commit '
418203d1d57d9aca455e84b6a4e6bee8a000fdd6':
Doc change: Add Google Play balance back into monetizing docs.
Dirk Dougherty [Mon, 2 Jul 2012 18:01:53 +0000 (11:01 -0700)]
Doc change: fix incorrect links to dashboard.
Change-Id: I31c754aa036b0770c7cd8596594bb2cedd47f1a7
Dirk Dougherty [Fri, 29 Jun 2012 01:26:55 +0000 (18:26 -0700)]
Doc change: Add Google Play balance back into monetizing docs.
Change-Id: I4326cbd7b93f0429b34f56f7ad67d910bcb0c6e1
Santos Cordon [Fri, 22 Jun 2012 18:27:46 +0000 (11:27 -0700)]
Telephony Capability-Distinguish dialing & connect - DO NOT MERGE
New capability returns true if the device can distinguish between
dialing/active and connected reliably. Currently returns true only for
GSM phones.
Change-Id: I50751abaf74b31fdc747f4d04ca9a2ac4d73a1ff
Wink Saville [Mon, 28 May 2012 05:12:07 +0000 (22:12 -0700)]
When we disconnect shutdown the StateMachine. DO NOT MERGE
Need to stop the StateMachine threads and release
all resources when we disconnect.
bug:
6342470
Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
Wink Saville [Tue, 29 May 2012 19:40:46 +0000 (12:40 -0700)]
Enhance StateMachine Quitting and logging support. DO NOT MERGE
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.
Rename halting to onHalting.
Add onQuitting
Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.
bug:
5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
Conflicts:
services/java/com/android/server/NsdService.java
The Android Open Source Project [Sat, 30 Jun 2012 01:28:24 +0000 (18:28 -0700)]
Reconcile with jb-release
Change-Id: I815e9292c3078eddde37ede41876d9219e4e2784
Siva Velusamy [Sat, 30 Jun 2012 01:13:14 +0000 (18:13 -0700)]
am
27ad058a: Merge "Fix Minor typos" into jb-dev
* commit '
27ad058a941e742bc519b76d3a7940f31f988f1f':
Fix Minor typos
Siva Velusamy [Sat, 30 Jun 2012 01:10:29 +0000 (18:10 -0700)]
Merge "Fix Minor typos" into jb-dev
Ying Wang [Sat, 30 Jun 2012 00:53:20 +0000 (17:53 -0700)]
am
2612de14: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:50:47 +0000 (17:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Siva Velusamy [Fri, 29 Jun 2012 23:49:49 +0000 (16:49 -0700)]
Fix Minor typos
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
Scott Main [Fri, 29 Jun 2012 23:50:05 +0000 (16:50 -0700)]
am
e02e5d8d: docs: fix link to gcm
* commit '
e02e5d8d5874d9b247b3dff9153b7c9802f60130':
docs: fix link to gcm
Scott Main [Fri, 29 Jun 2012 23:45:55 +0000 (16:45 -0700)]
docs: fix link to gcm
Change-Id: If198e72f1c3a37c82fe782ec88dd6a0c98e17105
Scott Main [Fri, 29 Jun 2012 23:28:48 +0000 (16:28 -0700)]
am
ef2b7fa2: Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev
* commit '
ef2b7fa2c311b91108a6a7296e004e89bc87fa9c':
docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs.
Scott Main [Fri, 29 Jun 2012 23:26:19 +0000 (16:26 -0700)]
Merge "docs: move FAQ and old notepad tutorial to other places where we can properly redirect. This way the docs are accessible from existing links and they at least appear with a sidenav Also resolve a bunch of links to the notepad docs." into jb-dev
Scott Main [Fri, 29 Jun 2012 23:22:42 +0000 (16:22 -0700)]
am
f0d68a97: Merge "docs: Google IO bug fixes - b.corp.google.com/issue?id=
6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev
* commit '
f0d68a975fc4cf0e43c94f1678a311b2ed201c92':
docs: Google IO bug fixes - http://b.corp.google.com/issue?id=
6756248 - http://code.google.com/p/android/issues/detail?id=33877
Scott Main [Fri, 29 Jun 2012 23:04:25 +0000 (16:04 -0700)]
docs: move FAQ and old notepad tutorial to other places where we can properly redirect.
This way the docs are accessible from existing links and they at least appear with a sidenav
Also resolve a bunch of links to the notepad docs.
Change-Id: I828e0bb8df32ee5658cae22c8f34b9fc1512fbae
Scott Main [Fri, 29 Jun 2012 23:19:52 +0000 (16:19 -0700)]
Merge "docs: Google IO bug fixes - b.corp.google.com/issue?id=
6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev
The Android Automerger [Fri, 29 Jun 2012 22:51:56 +0000 (15:51 -0700)]
merge in jb-release history after reset to jb-dev
Dianne Hackborn [Fri, 29 Jun 2012 22:43:37 +0000 (15:43 -0700)]
am
bfb752f8: Merge "Fix issue #
6761130: Clearing app data in settings does not clear app\'s USB storage" into jb-dev
* commit '
bfb752f8f0e4d73dc251c19d2ef79649fbbe4fd1':
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:40:18 +0000 (15:40 -0700)]
Merge "Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage" into jb-dev
Joe Fernandez [Fri, 29 Jun 2012 21:39:00 +0000 (14:39 -0700)]
docs: Google IO bug fixes
- http://b.corp.google.com/issue?id=
6756248
- http://code.google.com/p/android/issues/detail?id=33877
Change-Id: Ib77bb865d7a5f8194ce8a1bac59c15612a3dc654
Dianne Hackborn [Fri, 29 Jun 2012 22:00:21 +0000 (15:00 -0700)]
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
The package manager calls to clear data / clear cache were not also
having default container service clear the data on external storage. Now
they do.
Change-Id: Ib5e5eb6adf2cac5a4cc094cc1a02ac8cfb6a2edf
Christopher Tate [Fri, 29 Jun 2012 19:42:52 +0000 (12:42 -0700)]
am
1598a508: Merge "Do not back up / restore the rotation-related settings" into jb-dev
* commit '
1598a50818b638d20120f71bab01c1792ecd4b6a':
Do not back up / restore the rotation-related settings
Christopher Tate [Fri, 29 Jun 2012 19:40:34 +0000 (12:40 -0700)]
Merge "Do not back up / restore the rotation-related settings" into jb-dev
Christopher Tate [Fri, 29 Jun 2012 18:55:02 +0000 (11:55 -0700)]
Do not back up / restore the rotation-related settings
Change-Id: I4c5f8c31fa78acc1dfa2676e89b2c1c7bbd12a06
Ying Wang [Fri, 29 Jun 2012 18:40:36 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf052543d1c7cd9afb6fe415df2ad72c5de94ea8
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 29 Jun 2012 15:13:43 +0000 (08:13 -0700)]
Reconcile with jb-release
Change-Id: Ibb735de39e6d7a0452b9f04145121ee7154d9b99
Dianne Hackborn [Fri, 29 Jun 2012 00:42:23 +0000 (17:42 -0700)]
am
074b54fb: Merge "Maybe fix issue #
6756472: Share button is not defocusing the shade" into jb-dev
* commit '
074b54fbc0b6254c0ba308e0cf2e86c1cc929348':
Maybe fix issue #
6756472: Share button is not defocusing the shade
Dianne Hackborn [Fri, 29 Jun 2012 00:39:41 +0000 (17:39 -0700)]
Merge "Maybe fix issue #
6756472: Share button is not defocusing the shade" into jb-dev
The Android Automerger [Fri, 29 Jun 2012 00:09:42 +0000 (17:09 -0700)]
merge in jb-release history after reset to jb-dev
Dianne Hackborn [Thu, 28 Jun 2012 23:07:22 +0000 (16:07 -0700)]
Maybe fix issue #
6756472: Share button is not defocusing the shade
I got this reproduce a few times, then wasn't able to. I made this
change and then couldn't reproduce it. Maybe it fixed it.
The change here is to explicitly pass in the handler class to
apply() and reapply(), instead of relying it being set as a member of
the RemoteViews class. This is much cleaner and more explicitly about
setting that for the click callbacks.
Bug:
6756472
Change-Id: I8d029c3836501df3206c433838124b4be3890a8b
Dirk Dougherty [Thu, 28 Jun 2012 23:28:07 +0000 (16:28 -0700)]
am
50cf26c4: Doc change: cherry-pick from ics-mr1: review comments on Distribute section.
* commit '
50cf26c4268e986c5bb2b867da2e86975ca00494':
Doc change: cherry-pick from ics-mr1: review comments on Distribute section.
Dirk Dougherty [Fri, 22 Jun 2012 18:44:48 +0000 (11:44 -0700)]
Doc change: cherry-pick from ics-mr1: review comments on Distribute section.
Change-Id: Iefad9627b0fe7f54b21e14d332759d7c52c854ce
Dirk Dougherty [Thu, 28 Jun 2012 22:56:16 +0000 (15:56 -0700)]
am
c9d24b27: Merge "Doc change: fix broken links to logcat info." into jb-dev
* commit '
c9d24b27079258728ee08ad7d6b79abfda2df494':
Doc change: fix broken links to logcat info.
Dirk Dougherty [Thu, 28 Jun 2012 22:53:55 +0000 (15:53 -0700)]
Merge "Doc change: fix broken links to logcat info." into jb-dev
Dirk Dougherty [Thu, 28 Jun 2012 22:35:12 +0000 (15:35 -0700)]
Doc change: fix broken links to logcat info.
Change-Id: I006ade072232734cb049e5268bbc4d7a1efb5c55
Dianne Hackborn [Thu, 28 Jun 2012 22:36:40 +0000 (15:36 -0700)]
am
cfb0f409: Merge "Fix issue #
6745498: Cannot view consecutive event details from agenda view" into jb-dev
* commit '
cfb0f40903cf2180ce0947cdd965e2f5b90b48bb':
Fix issue #
6745498: Cannot view consecutive event details from agenda view
Dianne Hackborn [Thu, 28 Jun 2012 22:33:53 +0000 (15:33 -0700)]
Merge "Fix issue #
6745498: Cannot view consecutive event details from agenda view" into jb-dev
Mike Cleron [Thu, 28 Jun 2012 21:21:28 +0000 (14:21 -0700)]
am
98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev
* commit '
98fd6405aec16c6062f562bf6e7c5f2d50da5d60':
Fix NPEs when using the APIs a little oddly.
Mike Cleron [Thu, 28 Jun 2012 21:18:48 +0000 (14:18 -0700)]
Merge "Fix NPEs when using the APIs a little oddly." into jb-dev
Dianne Hackborn [Thu, 28 Jun 2012 20:49:17 +0000 (13:49 -0700)]
Fix issue #
6745498: Cannot view consecutive event details from agenda view
- There was a long-standing bug when using FLAG_ACTIVITY_REORDER_TO_FRONT
where we could find and use an activity that is currently finishing.
- There was a recently introduced bug where activities being destroyed
would not be removed from the history stack at the time they are done
being destroyed, allowing the above bug to be exposed.
- Removing a task would not kill any processes associated with the app
that had a different name from the app itself.
Change-Id: I4401ab6d348a69e1ac4fb8f719d2c69d5a78e567
Scott Main [Thu, 28 Jun 2012 19:04:04 +0000 (12:04 -0700)]
am
f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev
* commit '
f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
Minor corrections to the javadoc overview to reflect late API changes.
Scott Main [Thu, 28 Jun 2012 19:01:01 +0000 (12:01 -0700)]
am
399467a9: Merge "docs: better message when OS detection fails" into jb-dev
* commit '
399467a94a6420a3dd0daa8937958a6837e55d28':
docs: better message when OS detection fails
Scott Main [Thu, 28 Jun 2012 19:00:49 +0000 (12:00 -0700)]
Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev
Scott Main [Thu, 28 Jun 2012 18:57:07 +0000 (11:57 -0700)]
Merge "docs: better message when OS detection fails" into jb-dev
Scott Main [Thu, 28 Jun 2012 18:55:29 +0000 (11:55 -0700)]
docs: better message when OS detection fails
Change-Id: I7fd7ee9f10832c6ccaf6dbf9aca5d3342a3bb566
Eric Fischer [Thu, 28 Jun 2012 18:51:33 +0000 (11:51 -0700)]
am
9aa2d2a5: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9aa2d2a5a56c5ec0bb8517f46cb39f6c12215d92':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 28 Jun 2012 18:48:21 +0000 (11:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Chris Wren [Thu, 28 Jun 2012 18:43:16 +0000 (11:43 -0700)]
am
2761ccd4: Merge "Retain expanded state across more than one violent update." into jb-dev
* commit '
2761ccd4799971b7ad696f6f94036ca16113c78d':
Retain expanded state across more than one violent update.
Chris Wren [Thu, 28 Jun 2012 18:40:34 +0000 (11:40 -0700)]
Merge "Retain expanded state across more than one violent update." into jb-dev
Chris Wren [Thu, 28 Jun 2012 18:35:43 +0000 (14:35 -0400)]
Retain expanded state across more than one violent update.
Bug:
6680363
Change-Id: Iebf2387fc5c8774c1c001dde5a4608d4e60720aa
Eric Fischer [Thu, 28 Jun 2012 18:30:35 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c3a2f0d534df06cf7d3385a2d369ba6edd09df7
Auto-generated-cl: translation import
Daniel Sandler [Thu, 28 Jun 2012 18:07:32 +0000 (11:07 -0700)]
am
9a8a28aa: Merge "Fix #
6750492: NPE in tablet status bar" into jb-dev
* commit '
9a8a28aa72b9a4ebeaff3b30c497ce9bb5046083':
Fix #
6750492: NPE in tablet status bar
Daniel Sandler [Thu, 28 Jun 2012 18:02:57 +0000 (11:02 -0700)]
Merge "Fix #
6750492: NPE in tablet status bar" into jb-dev
Dianne Hackborn [Thu, 28 Jun 2012 17:53:18 +0000 (10:53 -0700)]
am
e680c722: Merge "Fix issue #
6706369: Sometimes the "App info" popup shows..." into jb-dev
* commit '
e680c72211434777d50c1e20e6c06b5a3cdc3207':
Fix issue #
6706369: Sometimes the "App info" popup shows...
Dianne Hackborn [Thu, 28 Jun 2012 17:50:45 +0000 (10:50 -0700)]
Merge "Fix issue #
6706369: Sometimes the "App info" popup shows..." into jb-dev
Scott Main [Thu, 28 Jun 2012 17:40:18 +0000 (10:40 -0700)]
am
c4f7873c: Merge "docs: fix g+ gms description" into jb-dev
* commit '
c4f7873cada2fca2d1d3390b113ca46c71dd86ad':
docs: fix g+ gms description
Daniel Sandler [Thu, 28 Jun 2012 17:38:28 +0000 (13:38 -0400)]
Fix #
6750492: NPE in tablet status bar
Pull down a bugfix from BaseStatusBar.
Bug:
6750492
Change-Id: I9bd04e3a800d4dd2222844d2848208d611b60fe0
Scott Main [Thu, 28 Jun 2012 17:37:41 +0000 (10:37 -0700)]
Merge "docs: fix g+ gms description" into jb-dev
Dirk Dougherty [Thu, 28 Jun 2012 17:37:23 +0000 (10:37 -0700)]
am
d91cce85: Merge "Doc change: swap notification image for generic." into jb-dev
* commit '
d91cce8558d09295746588fa13a2cbb0f3e7ab59':
Doc change: swap notification image for generic.
Dirk Dougherty [Thu, 28 Jun 2012 17:34:56 +0000 (10:34 -0700)]
Merge "Doc change: swap notification image for generic." into jb-dev
Craig Mautner [Thu, 28 Jun 2012 17:00:04 +0000 (10:00 -0700)]
am
4fa46485: Merge "Update dumpsys power output." into jb-dev
* commit '
4fa4648515c3c1f77a31da186a9fe31d6c509412':
Update dumpsys power output.
Craig Mautner [Thu, 28 Jun 2012 16:56:47 +0000 (09:56 -0700)]
Merge "Update dumpsys power output." into jb-dev
Daniel Sandler [Thu, 28 Jun 2012 15:35:24 +0000 (08:35 -0700)]
Fix NPEs when using the APIs a little oddly.
This should help developers use some of the features of
Style via subclassing rather than duplicating functionality.
Bug:
6716608
Change-Id: I048e8221c8046e9779e08e6e262ac3fb37b01cb3
Robert Ly [Thu, 28 Jun 2012 15:05:20 +0000 (08:05 -0700)]
docs: fix g+ gms description
Change-Id: Icff59207ab788c81cf8e53252813b9a207548e41
The Android Automerger [Thu, 28 Jun 2012 14:02:47 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
Chris Wren [Thu, 28 Jun 2012 11:33:07 +0000 (04:33 -0700)]
am
89304586: Merge "Retain expanded state across violent updates." into jb-dev
* commit '
8930458639527448429362255af96e94f5aba5ed':
Retain expanded state across violent updates.
Chris Wren [Thu, 28 Jun 2012 11:30:48 +0000 (04:30 -0700)]
Merge "Retain expanded state across violent updates." into jb-dev
Dirk Dougherty [Thu, 28 Jun 2012 06:10:06 +0000 (23:10 -0700)]
Doc change: swap notification image for generic.
Change-Id: I10f8d877e86d9f8b9c03d31caab5dbd533d672c4
Dirk Dougherty [Thu, 28 Jun 2012 07:57:11 +0000 (00:57 -0700)]
am
6c2ecbd5: Merge "Doc change: update Missed Call part of notification image." into jb-dev
* commit '
6c2ecbd5e3e7bcbd84be94704ec904f8c29ebd37':
Doc change: update Missed Call part of notification image.
Dirk Dougherty [Thu, 28 Jun 2012 07:54:37 +0000 (00:54 -0700)]
Merge "Doc change: update Missed Call part of notification image." into jb-dev
Dirk Dougherty [Thu, 28 Jun 2012 07:52:08 +0000 (00:52 -0700)]
Doc change: update Missed Call part of notification image.
Change-Id: Ibffe3dcefce343838ba5b3dfde1edf05bfc0f9ad
Joe Fernandez [Thu, 28 Jun 2012 07:34:23 +0000 (00:34 -0700)]
am
c327025b: Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev
* commit '
c327025bd79595a78883460690e74b302f9999d2':
docs: ADK2 update for new IDE download files and instructions
Joe Fernandez [Thu, 28 Jun 2012 07:31:03 +0000 (00:31 -0700)]
Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev
Joe Fernandez [Thu, 28 Jun 2012 06:33:20 +0000 (23:33 -0700)]
docs: ADK2 update for new IDE download files and instructions
Change-Id: Id0e3e42a0a0c19afafa039f9df6763ae337b1f0b
Dirk Dougherty [Thu, 28 Jun 2012 03:00:32 +0000 (20:00 -0700)]
am
e1c6947f: Doc change: update caption for notifications screen shot.
* commit '
e1c6947facebb4df082433ca8365c45847330de8':
Doc change: update caption for notifications screen shot.
Dirk Dougherty [Thu, 28 Jun 2012 02:56:17 +0000 (19:56 -0700)]
Doc change: update caption for notifications screen shot.
Change-Id: I7d5a947a36f315365875887e540be9ecb7402175
Matthew Xie [Wed, 27 Jun 2012 22:50:10 +0000 (15:50 -0700)]
am
29775794: Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev
* commit '
29775794d6014196063534415ad61d60e84e9c9a':
Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode.
Matthew Xie [Wed, 27 Jun 2012 22:47:53 +0000 (15:47 -0700)]
Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev
Jake Hamby [Wed, 27 Jun 2012 22:30:17 +0000 (15:30 -0700)]
am
ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev
* commit '
ca2c7b7d96625cf515af88ad30062405b38cb094':
Fix detection of CDMA CMAS cell broadcasts.
Jake Hamby [Wed, 27 Jun 2012 22:27:43 +0000 (15:27 -0700)]
Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev
Matthew Xie [Wed, 27 Jun 2012 08:15:27 +0000 (01:15 -0700)]
Get rid of the extra bt_disable call when turning on airplane mode
Get rid of enabling bt when in airplane mode.
Current code has 2 paths that trying to place bluetooth in cold state when
turning airplane mode on. This caused extra call of bt_disable that
causing a kernel sleep failure. The fix removes one of the sys call.
This CL keeps Bluetooth in cold state after turning airplane mode on
instead of seting it to hotoff state
bug
6563480
Change-Id: I30c413707157acb4a8e83ded9452256cf6260899
Chris Wren [Wed, 27 Jun 2012 21:37:03 +0000 (17:37 -0400)]
Retain expanded state across violent updates.
Bug:
6680363
Change-Id: I81e3b3a4e15b4ed240af62ad1023d4bbd9aaa646
Ying Wang [Wed, 27 Jun 2012 21:44:43 +0000 (14:44 -0700)]
am
7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
7bdc151eecf5cb01af19964c43e99f41069d093d':
Import translations. DO NOT MERGE
OSDN Git Service
