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

84052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
5a60f05889 am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '13ab2c9fdaec119a40b628ae772fd1462fbb826d':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-23 15:09:43 -07:00
Dianne Hackborn
bfe20d1aa1 am 8bfba7df: Merge "fix wrong substring" 
* commit '8bfba7df376509cc944b80bd1f1715f1ef94b246':
  fix wrong substring
 2012-08-23 15:09:39 -07:00
Jean-Baptiste Queru
d86bebb4a9 am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit '322b0a160d29ddbac35d59655111c8730cadd3e2':
  Protecting more views from (bad) MotionEvents
 2012-08-23 15:09:35 -07:00
Irfan Sheriff
2a4aaf133c Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-08-23 14:58:43 -07:00
Katie McCormick
03a429ddcd resolved conflicts for merge of 9447af12 to jb-mr1-dev 
Change-Id: I5b5f086dd27a8c567b27fb9a7799b0552a8e0ae4
 2012-08-23 14:47:51 -07:00
Jeff Sharkey
630566381c am 2e9aa741: Merge "Make USER_PRESENT broadcast per-user." into jb-mr1-dev 
* commit '2e9aa74127b9f5d4bc3c424ceb198f58c21eba73':
  Make USER_PRESENT broadcast per-user.
 2012-08-23 14:46:52 -07:00
Jeff Sharkey
2e9aa74127 Merge "Make USER_PRESENT broadcast per-user." into jb-mr1-dev 2012-08-23 14:44:22 -07:00
Jeff Sharkey
6a25cbdd94 Make USER_PRESENT broadcast per-user. 
Bug: 7029707
Change-Id: Ic4671b96525dc2fb4d58ce3fca0a4627598a6cae
 2012-08-23 14:43:44 -07:00
Irfan Sheriff
2e5b13ef95 resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp 
Change-Id: I5f115310948a03d791c201fb605dfbb576c0576e
 2012-08-23 14:37:06 -07:00
Craig Mautner
5642a48fbb Fix unprotected variable access by serializing. 
The variables mKeyguardDisabled and mAllowDisableKeyguard were
being modified unprotected by mKeyguardTokenWatcher. Fix is to
serialize accesses to these variables by only referencing them
from the same Handler that mKeyguardTokenWatcher uses. Eliminates
synchronization blocks and mKeyguardDisabled variable.

Fixes bug 7045624.

Change-Id: I6355aa393507408296316bee61e178dc81e2a172
 2012-08-23 14:25:34 -07:00
Wink Saville
13ab2c9fda Merge "Telephony: Add ICC_UNKNOWN intent" 2012-08-23 14:25:23 -07:00
Adam Powell
0474282f7e am 11a03afa: Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev 
* commit '11a03afaadc626be039203d98d3d70e7d3ae7b49':
  Properly respect divider settings for TableLayout
 2012-08-23 14:20:15 -07:00
Dianne Hackborn
e39e8a204b Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action. 
Change-Id: I0c9336bb072b4622a5eab6d3ec104c4cc38e367a
 2012-08-23 14:19:46 -07:00
Amith Yamasani
037540da34 Handle null cache directory 
data/android directory doesn't exist sometimes, and hence cache
directory creation fails. Don't crash the process due to that.

Change-Id: I22d7ed5df9c70f021a87029e89a13a11b4b0303b
 2012-08-23 14:19:41 -07:00
Adam Powell
11a03afaad Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev 2012-08-23 14:18:22 -07:00
Victoria Lease
f91e9ad82b am 865a1756: Merge "Set text locale in language settings panel." into jb-mr1-dev 
* commit '865a1756b6169c5255350c70e443be9555374a3e':
  Set text locale in language settings panel.
 2012-08-23 14:17:35 -07:00
Victoria Lease
865a1756b6 Merge "Set text locale in language settings panel." into jb-mr1-dev 2012-08-23 14:14:38 -07:00
Roman Nurik
6a9f0ec8e4 am 1caca0a1: am 2b4b1afc: am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev 
* commit '1caca0a1f23b9ed679e953bfc1fd6b20edd7d3ad':
  Update TabCompat training sample code download.
 2012-08-23 14:14:21 -07:00
Jean-Baptiste Queru
bb38dfd204 am 013ff819: am 0a72b3e1: ignore merge of 2e2849a5 to jb-dev-plus-aosp 
* commit '013ff819618614f07f279ee31ce3c52f931851fc':
  Empty DC's apnList when the DC is free.
 2012-08-23 14:14:18 -07:00
Adam Powell
c3c0e39ab5 Properly respect divider settings for TableLayout 
Make sure that TableLayout always knows it's in VERTICAL orientation.

Bug 7041351

Change-Id: I9935891a58e558840ac7956a0ffe8448e21de799
 2012-08-23 14:13:10 -07:00
Roman Nurik
1caca0a1f2 am 2b4b1afc: am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev 
* commit '2b4b1afcfa75dc2a3d9436bcde5538a49c56d124':
  Update TabCompat training sample code download.
 2012-08-23 14:11:45 -07:00
Jean-Baptiste Queru
013ff81961 am 0a72b3e1: ignore merge of 2e2849a5 to jb-dev-plus-aosp 
* commit '0a72b3e12ca96d830ce6639f045d1f4decf9e748':
  Empty DC's apnList when the DC is free.
 2012-08-23 14:11:38 -07:00
Dianne Hackborn
8bfba7df37 Merge "fix wrong substring" 2012-08-23 14:10:31 -07:00
Alex Yakavenka
ceb9bbc5df Telephony: Add ICC_UNKNOWN intent 
Change-Id: I1a666973dd23f510a0cce60ef7db462728717fc0
 2012-08-23 14:09:51 -07:00
Jean-Baptiste Queru
322b0a160d Merge "Protecting more views from (bad) MotionEvents" 2012-08-23 14:08:40 -07:00
Dianne Hackborn
489a185bb8 am 5d1122a3: Merge "Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev 
* commit '5d1122a3f84e1df80c63aca56310f2cf29bea7dc':
  Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action.
 2012-08-23 14:02:57 -07:00
Dianne Hackborn
5d1122a3f8 Merge "Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev 2012-08-23 14:00:22 -07:00
Dianne Hackborn
f1c26e2fd0 Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action. 
Change-Id: I0c9336bb072b4622a5eab6d3ec104c4cc38e367a
 2012-08-23 13:59:40 -07:00
John Spurlock
7dac3f0c3e am 156c9cc2: Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev 
* commit '156c9cc2bfda211132a6c3a6d990702e1f317a8f':
  Disable screensavers if below first battery warning level.
 2012-08-23 13:37:12 -07:00
John Spurlock
156c9cc2bf Merge "Disable screensavers if below first battery warning level." into jb-mr1-dev 2012-08-23 13:34:05 -07:00
John Spurlock
10fb224623 Disable screensavers if below first battery warning level. 
Don't activate on sleep if below the threshold, and quit any currently
running dream when the threshold is reached.

Bug:6999949
Change-Id: I961b350d24ee6f95e502228aaa57312b0ffbadc1
 2012-08-23 16:23:18 -04:00
Doug Zongker
af4a0f1d86 am d8b6fa29: Merge "pass --locale argument to recovery" into jb-mr1-dev 
* commit 'd8b6fa293133324d77040e45d0d4625fc90917ba':
  pass --locale argument to recovery
 2012-08-23 13:20:17 -07:00
Doug Zongker
d8b6fa2931 Merge "pass --locale argument to recovery" into jb-mr1-dev 2012-08-23 13:17:25 -07:00
Stephen Hines
4b456c8a02 am bb121d56: am 7cb7292f: (-s ours) am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit 'bb121d569cd6bc7bf4018ef12756247009988863':
  DO NOT MERGE - Fix readback lengths
 2012-08-23 12:37:38 -07:00
Justin Ho
c2bde01014 am fd9619f6: am 3bc03666: am 72404a82: Merge "Update Back softkey icon Bug: 6020915" into jb-dev 
* commit 'fd9619f647a618b7bded59875186d1bcdde32ba1':
  Update Back softkey icon Bug: 6020915
 2012-08-23 12:37:31 -07:00
Irfan Sheriff
1afb5af16e am b25617e7: am 46b29d8d: (-s ours) am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer" 
* commit 'b25617e72e10f9b8ffd1d9ca6db5414db6a02e92':
  WifiWatchdog: handle exception from ArpPeer
 2012-08-23 12:37:27 -07:00
Stephen Hines
bb121d569c am 7cb7292f: (-s ours) am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '7cb7292f046bb860069a0881fc45753872551079':
  DO NOT MERGE - Fix readback lengths
 2012-08-23 12:34:40 -07:00
Justin Ho
fd9619f647 am 3bc03666: am 72404a82: Merge "Update Back softkey icon Bug: 6020915" into jb-dev 
* commit '3bc03666ccd322f8ebc0c303dabe920b2ae6944c':
  Update Back softkey icon Bug: 6020915
 2012-08-23 12:34:37 -07:00
Irfan Sheriff
b25617e72e am 46b29d8d: (-s ours) am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer" 
* commit '46b29d8dd558c734f058b3806a0b56a2a23b33fd':
  WifiWatchdog: handle exception from ArpPeer
 2012-08-23 12:34:19 -07:00
John Spurlock
d8351a48b0 am 21b53df7: Merge "Add framework support for multiple dreams." into jb-mr1-dev 
* commit '21b53df7c3fc7501c9c9e238eb820a6dcf992650':
  Add framework support for multiple dreams.
 2012-08-23 10:46:55 -07:00
John Spurlock
21b53df7c3 Merge "Add framework support for multiple dreams." into jb-mr1-dev 2012-08-23 10:44:05 -07:00
Amith Yamasani
eea5e1f504 am 41d4332a: Merge "Handle null cache directory" into jb-mr1-dev 
* commit '41d4332ab0641d3f5dd2ad8da7e325cd9f81f3c1':
  Handle null cache directory
 2012-08-23 10:15:35 -07:00
Amith Yamasani
41d4332ab0 Merge "Handle null cache directory" into jb-mr1-dev 2012-08-23 10:13:42 -07:00
Amith Yamasani
92d570529c Handle null cache directory 
data/android directory doesn't exist sometimes, and hence cache
directory creation fails. Don't crash the process due to that.

Change-Id: I22d7ed5df9c70f021a87029e89a13a11b4b0303b
 2012-08-23 10:07:52 -07:00
Doug Zongker
e33b4007ee pass --locale argument to recovery 
When RecoverySystem boots into recovery (to install an update or wipe
data and/or cache), pass the --locale argument with the currently
selected locale.

Change-Id: Ib280330932a402be2011207bff8f05caa9b999cd
 2012-08-23 09:52:14 -07:00
Jean-Baptiste Queru
9455f8f266 am 729f810d: am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 
* commit '729f810d3bca086cf651aa4e2299594a57d6d543':
  WifiStateMachine: ignore auth-fail event during WPS connection
 2012-08-23 09:45:30 -07:00
Jean-Baptiste Queru
729f810d3b am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 
* commit '8f7100a03768d2863255024cf0c604cac10c9d5d':
  WifiStateMachine: ignore auth-fail event during WPS connection
 2012-08-23 09:43:45 -07:00
Jean-Baptiste Queru
8f7100a037 Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 2012-08-23 09:31:03 -07:00
Craig Mautner
dbc93bf240 am 6715d1ef: Merge "Clean up displayId and layerStack usage." into jb-mr1-dev 
* commit '6715d1effaa70abf261112d2771d4d555cc109c2':
  Clean up displayId and layerStack usage.
 2012-08-23 08:47:11 -07:00
Craig Mautner
6715d1effa Merge "Clean up displayId and layerStack usage." into jb-mr1-dev 2012-08-23 08:44:53 -07:00