Conley Owens
f26ec38c34
am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
...
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-28 23:52:41 -07:00
Conley Owens
eef8f14888
am 11d7ec24: Merge "Removing unnecessary computation."
...
* commit '11d7ec24a55319b68bcc96443372c263a41b7dc5':
Removing unnecessary computation.
2011-04-28 23:52:37 -07:00
Conley Owens
8b22ef66ef
am e41d2aed: Merge "Using robust equality check."
...
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
Using robust equality check.
2011-04-28 23:52:32 -07:00
Conley Owens
a951701226
am 1e29552b: Merge "We don\'t need these local references."
...
* commit '1e29552bd5feeb24952a0486e3263396978212df':
We don't need these local references.
2011-04-28 23:52:26 -07:00
Conley Owens
d66a92e687
am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
...
* commit 'da882181245fdf3eca827680d656cd298c9c318f':
Eliminating dead code with no other effect than consuming battery life.
2011-04-28 23:52:21 -07:00
James Dong
ec78f551b5
Add avg bandwidth estimate every 2 seconds - do not merge.
...
This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.
related-to-bug: 4339075
Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
2011-04-28 17:16:03 -07:00
Conley Owens
e178700929
Merge "Added null check on return value for getKeyDispatcherState()"
2011-04-28 15:07:00 -07:00
Conley Owens
501f7bca83
Merge "Eliminating dead logic - bitmap state simply cannot be null here."
2011-04-28 14:57:14 -07:00
Conley Owens
11d7ec24a5
Merge "Removing unnecessary computation."
2011-04-28 14:57:11 -07:00
Conley Owens
e41d2aed9c
Merge "Using robust equality check."
2011-04-28 14:57:08 -07:00
Conley Owens
1e29552bd5
Merge "We don't need these local references."
2011-04-28 14:56:59 -07:00
Conley Owens
da88218124
Merge "Eliminating dead code with no other effect than consuming battery life."
2011-04-28 14:56:55 -07:00
Scott Main
c932a56ac8
am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit 'd7f739b13e0336d6dd02df18d16a73636a795c3f':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:32:02 -07:00
Scott Main
d7f739b13e
am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit '114ba198f5ae19fc0a632e18369a912c54a0c44e':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:25:22 -07:00
Scott Main
114ba198f5
am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
...
* commit 'c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:21:46 -07:00
Scott Main
c59e80c4eb
Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
2011-04-28 14:08:57 -07:00
Wink Saville
418e486a1c
am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
...
* commit 'a68a61dfe37969426c535d076a20181155493226':
Telephony: Data availability indication upon records loaded.
2011-04-28 13:54:14 -07:00
Wink Saville
f49a96aa76
am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
...
* commit '05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
Telephony: Corrections to signal strength values.
2011-04-28 13:52:28 -07:00
Kazuhiro Ondo
5bc9d47851
am 379cbb1d: Send STK Service Running RIL Request after sim module is ready
...
* commit '379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d':
Send STK Service Running RIL Request after sim module is ready
2011-04-28 13:52:26 -07:00
Wink Saville
a68a61dfe3
Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
2011-04-28 13:51:31 -07:00
Wink Saville
05fcd239ab
Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
2011-04-28 13:51:22 -07:00
Ramesh Sudini
11cee41f3e
Telephony: Corrections to signal strength values.
...
RSRP is already -ve.
Change-Id: Ieff689a98088ad6aad9cfc6516169c92bbb0015d
2011-04-28 12:24:55 -07:00
Ramesh Sudini
662b016d6e
Telephony: Data availability indication upon records loaded.
...
This will make sure if records loaded comes after radio availability we dont miss sending
out dataAvailability.
Change-Id: Ibbecaa89f28e1441e799bf1681d0b4692cf0f13a
2011-04-28 12:24:13 -07:00
Kazuhiro Ondo
379cbb1dcc
Send STK Service Running RIL Request after sim module is ready
...
Currently "STK Service Running" is sent as soon as phone app is
started. And depending on the timing of vendor RIL initialization
the event may not be handled. This patch waits for SIM_READY,
RUIM_READY or NV_READY indicating vendor's SIM (equivalent) module
become ready to process the event.
Change-Id: I4182a5413201f11856989664c8f19ae1eca48e2f
2011-04-28 12:23:25 -07:00
Conley Owens
893812b2ee
am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit 'e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
2011-04-28 12:00:53 -07:00
Conley Owens
e6e3322a3b
am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
2011-04-28 11:57:48 -07:00
Wink Saville
7848b71b4f
am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
...
* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
GsmDCT: Reset DataConnection upon APN disable.
2011-04-28 11:53:08 -07:00
Wink Saville
e4c7f3ba0f
am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
...
* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
Remove subclass cast for calls to isDnsCheckDisabled.
2011-04-28 11:53:05 -07:00
Wink Saville
69e830dc31
am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
...
* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
Delay data reconnection after disconnected.
2011-04-28 11:53:02 -07:00
Wink Saville
7353301f73
Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
2011-04-28 11:50:24 -07:00
Wink Saville
1a517d0c25
Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
2011-04-28 11:50:15 -07:00
Wink Saville
8daec83f9a
Merge "Delay data reconnection after disconnected." into honeycomb-LTE
2011-04-28 11:50:05 -07:00
Irfan Sheriff
c1f39396b9
am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
...
* commit '8f87f8389866058a081e601fc0df45a3527a3150':
Define Protocol class for use with StateMachine
2011-04-28 11:48:47 -07:00
Conley Owens
8fff7805ab
Merge "Remove duplicate '=' in exception message"
2011-04-28 11:46:39 -07:00
Irfan Sheriff
8f87f83898
Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
2011-04-28 11:38:54 -07:00
Irfan Sheriff
3fc75e9267
Define Protocol class for use with StateMachine
...
Adds a common namespace for communication across
different state machines
Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
2011-04-28 11:10:03 -07:00
Bernhard Reutner-Fischer
c1a9b03a35
Remove duplicate '=' in exception message
...
Remove duplicate '=' in IllegalArgumentException of MyAdapter::getItem()
Change-Id: I151a1432a9f54c8d42bae295f3967b0be2223026
2011-04-28 20:06:44 +02:00
Conley Owens
a60594cb1c
Fixed bad merge in ViewRoot.java.
...
Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f
2011-04-28 11:06:34 -07:00
Eric Fischer
b2149f4a11
am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
Import revised translations. DO NOT MERGE
2011-04-28 10:25:52 -07:00
Conley Owens
4854f70c08
Ignore change since file no longer exists
2011-04-28 10:10:52 -07:00
Per Andersson
4ae02b37bb
Added null check on return value for getKeyDispatcherState()
...
The result from getKeyDispatcherState() was used without
checking if it returned null, which resulted in a NullPointerException.
Change-Id: I4b55ad44d5c08b7f729dbbdbcaed0e978a430258
2011-04-28 12:04:48 +02:00
Stephen Hines
5ac02e73c3
am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '697f8b331bb339e4db716efbb96e2182aac40255':
Check setName() for null string + fix rsRand().
2011-04-27 17:38:53 -07:00
Stephen Hines
697f8b331b
am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
...
* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
Check setName() for null string + fix rsRand().
2011-04-27 17:36:38 -07:00
Stephen Hines
00df8e230e
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
2011-04-27 17:32:40 -07:00
Conley Owens
c4791bd65c
Merge commit '5e3562a5' into m
...
Conflicts:
core/java/android/view/ViewRoot.java
Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
2011-04-27 16:58:24 -07:00
Conley Owens
eedf20c2ea
Ignore xml change since file no longer exists
2011-04-27 16:49:07 -07:00
Eric Fischer
1d10447631
am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
Import revised translations. DO NOT MERGE
2011-04-27 15:30:36 -07:00
Conley Owens
264254b273
am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard
2011-04-27 14:53:26 -07:00
Conley Owens
5e3562a5a5
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 14:53:15 -07:00
Conley Owens
8279c193d1
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 14:53:10 -07:00