drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,815 Commits 1 Branch 0 Tags
Commit Graph

79815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
9e75d57d05 am 399467a9: Merge "docs: better message when OS detection fails" into jb-dev 
* commit '399467a94a6420a3dd0daa8937958a6837e55d28':
  docs: better message when OS detection fails
 2012-06-28 12:01:01 -07:00
Scott Main
f443c5ea2c Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev 2012-06-28 12:00:49 -07:00
Scott Main
399467a94a Merge "docs: better message when OS detection fails" into jb-dev 2012-06-28 11:57:07 -07:00
Scott Main
9a4a7d19a1 docs: better message when OS detection fails 
Change-Id: I7fd7ee9f10832c6ccaf6dbf9aca5d3342a3bb566
 2012-06-28 11:55:29 -07:00
Eric Fischer
615f4cf22c am 9aa2d2a5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9aa2d2a5a56c5ec0bb8517f46cb39f6c12215d92':
  Import translations. DO NOT MERGE
 2012-06-28 11:51:33 -07:00
Eric Fischer
9aa2d2a5a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-28 11:48:21 -07:00
Chris Wren
29a5e4a383 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.
 2012-06-28 11:43:16 -07:00
Chris Wren
2761ccd479 Merge "Retain expanded state across more than one violent update." into jb-dev 2012-06-28 11:40:34 -07:00
Chris Wren
5ae1ea8400 Retain expanded state across more than one violent update. 
Bug: 6680363
Change-Id: Iebf2387fc5c8774c1c001dde5a4608d4e60720aa
 2012-06-28 14:35:43 -04:00
Eric Fischer
a57b7a8ce4 Import translations. DO NOT MERGE 
Change-Id: I5c3a2f0d534df06cf7d3385a2d369ba6edd09df7
Auto-generated-cl: translation import
 2012-06-28 11:30:35 -07:00
Daniel Sandler
51f755abfd am 9a8a28aa: Merge "Fix #6750492: NPE in tablet status bar" into jb-dev 
* commit '9a8a28aa72b9a4ebeaff3b30c497ce9bb5046083':
  Fix #6750492: NPE in tablet status bar
 2012-06-28 11:07:32 -07:00
Daniel Sandler
9a8a28aa72 Merge "Fix #6750492: NPE in tablet status bar" into jb-dev 2012-06-28 11:02:57 -07:00
Dianne Hackborn
19910f1f1a 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...
 2012-06-28 10:53:18 -07:00
Dianne Hackborn
e680c72211 Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev 2012-06-28 10:50:45 -07:00
Scott Main
23ece33972 am c4f7873c: Merge "docs: fix g+ gms description" into jb-dev 
* commit 'c4f7873cada2fca2d1d3390b113ca46c71dd86ad':
  docs: fix g+ gms description
 2012-06-28 10:40:18 -07:00
Daniel Sandler
15986c66cb Fix #6750492: NPE in tablet status bar 
Pull down a bugfix from BaseStatusBar.

Bug: 6750492
Change-Id: I9bd04e3a800d4dd2222844d2848208d611b60fe0
 2012-06-28 13:38:28 -04:00
Scott Main
c4f7873cad Merge "docs: fix g+ gms description" into jb-dev 2012-06-28 10:37:41 -07:00
Dirk Dougherty
355adfe790 am d91cce85: Merge "Doc change: swap notification image for generic." into jb-dev 
* commit 'd91cce8558d09295746588fa13a2cbb0f3e7ab59':
  Doc change: swap notification image for generic.
 2012-06-28 10:37:23 -07:00
Dirk Dougherty
d91cce8558 Merge "Doc change: swap notification image for generic." into jb-dev 2012-06-28 10:34:56 -07:00
Craig Mautner
2dca20e194 am 4fa46485: Merge "Update dumpsys power output." into jb-dev 
* commit '4fa4648515c3c1f77a31da186a9fe31d6c509412':
  Update dumpsys power output.
 2012-06-28 10:00:04 -07:00
Craig Mautner
4fa4648515 Merge "Update dumpsys power output." into jb-dev 2012-06-28 09:56:47 -07:00
Wink Saville
68e66497e7 Preserve retryCount when retrying. 
Bug: 6529189
Change-Id: I743aed08aa161d91899aeb2ccacffcd224e48c0a
 2012-06-28 09:34:41 -07:00
Daniel Sandler
c08dea2aa4 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
 2012-06-28 08:35:24 -07:00
Robert Ly
fb2ed9869b docs: fix g+ gms description 
Change-Id: Icff59207ab788c81cf8e53252813b9a207548e41
 2012-06-28 08:05:20 -07:00
The Android Automerger
f0c1a9368e merge in jb-release history after reset to jb-dev 2012-06-28 07:02:47 -07:00
Chris Wren
a9ee110cd9 am 89304586: Merge "Retain expanded state across violent updates." into jb-dev 
* commit '8930458639527448429362255af96e94f5aba5ed':
  Retain expanded state across violent updates.
 2012-06-28 04:33:07 -07:00
Chris Wren
8930458639 Merge "Retain expanded state across violent updates." into jb-dev 2012-06-28 04:30:48 -07:00
Dirk Dougherty
7b6be8ef4c Doc change: swap notification image for generic. 
Change-Id: I10f8d877e86d9f8b9c03d31caab5dbd533d672c4
 2012-06-28 00:57:27 -07:00
Dirk Dougherty
d5aa20001a 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.
 2012-06-28 00:57:11 -07:00
Dirk Dougherty
6c2ecbd5e3 Merge "Doc change: update Missed Call part of notification image." into jb-dev 2012-06-28 00:54:37 -07:00
Dirk Dougherty
3229a61cad Doc change: update Missed Call part of notification image. 
Change-Id: Ibffe3dcefce343838ba5b3dfde1edf05bfc0f9ad
 2012-06-28 00:52:08 -07:00
Joe Fernandez
2e662a2170 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
 2012-06-28 00:34:23 -07:00
Joe Fernandez
c327025bd7 Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev 2012-06-28 00:31:03 -07:00
Joe Fernandez
caa008fdfb docs: ADK2 update for new IDE download files and instructions 
Change-Id: Id0e3e42a0a0c19afafa039f9df6763ae337b1f0b
 2012-06-28 00:10:49 -07:00
Dirk Dougherty
7a2319120d am e1c6947f: Doc change: update caption for notifications screen shot. 
* commit 'e1c6947facebb4df082433ca8365c45847330de8':
  Doc change: update caption for notifications screen shot.
 2012-06-27 20:00:32 -07:00
Dirk Dougherty
e1c6947fac Doc change: update caption for notifications screen shot. 
Change-Id: I7d5a947a36f315365875887e540be9ecb7402175
 2012-06-27 19:56:17 -07:00
Wink Saville
1157e1a8d4 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
 2012-06-27 16:23:33 -07:00
Adam Powell
74d762a3ee Fix bug in parsing attributes for MediaRouteButton 
Change-Id: Ib61506f7b09b1e043f3f21d2fd46281fbced00f4
 2012-06-27 16:19:45 -07:00
Matthew Xie
691976fae6 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.
 2012-06-27 15:50:10 -07:00
Matthew Xie
29775794d6 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 2012-06-27 15:47:53 -07:00
Jake Hamby
4a02a5ccfc am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev 
* commit 'ca2c7b7d96625cf515af88ad30062405b38cb094':
  Fix detection of CDMA CMAS cell broadcasts.
 2012-06-27 15:30:17 -07:00
Jake Hamby
ca2c7b7d96 Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev 2012-06-27 15:27:43 -07:00
Matthew Xie
9107e37b24 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
 2012-06-27 15:12:01 -07:00
Chris Wren
c9433ecb51 Retain expanded state across violent updates. 
Bug: 6680363
Change-Id: I81e3b3a4e15b4ed240af62ad1023d4bbd9aaa646
 2012-06-27 17:57:56 -04:00
Ying Wang
809705c331 am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7bdc151eecf5cb01af19964c43e99f41069d093d':
  Import translations. DO NOT MERGE
 2012-06-27 14:44:43 -07:00
Ying Wang
7bdc151eec Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-27 14:41:20 -07:00
The Android Automerger
cc03b048b9 merge in jb-release history after reset to jb-dev 2012-06-27 14:08:26 -07:00
Ying Wang
0503ae7451 Import translations. DO NOT MERGE 
Change-Id: I887e4963f5e4f7690461900b5f5c993d42c8db67
 2012-06-27 14:00:38 -07:00
John Spurlock
928c88774d am c6a2fa8c: Merge "Disable assist gesture when keyguard is active" into jb-dev 
* commit 'c6a2fa8cba32f5310a052cea2307b898f0522fab':
  Disable assist gesture when keyguard is active
 2012-06-27 13:29:16 -07:00
John Spurlock
c6a2fa8cba Merge "Disable assist gesture when keyguard is active" into jb-dev 2012-06-27 13:27:09 -07:00