Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,090 Commits 3 Branches 0 Tags
889bb20f1bb47437331d404a59b86e6dfa4e2e93
Commit Graph

16851 Commits

Author SHA1 Message Date
Conley Owens
27e8f1a3a6 am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
 2011-04-29 14:56:15 -07:00
Conley Owens
014757eea2 am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
 2011-04-29 14:56:05 -07:00
Conley Owens
49df110aeb am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 14:55:55 -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
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
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
Conley Owens
a60594cb1c Fixed bad merge in ViewRoot.java. 
Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f
 2011-04-28 11:06:34 -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
cfe7b9fcfa am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow" 
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
  onDetachedFromWindow is called before onAttachedToWindow
 2011-04-27 13:53:37 -07:00
Conley Owens
a538b4a206 Merge "onDetachedFromWindow is called before onAttachedToWindow" 2011-04-27 13:14:57 -07:00
Jean-Baptiste Queru
31418a1e9b am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '45e13ec1c5cd765162b7450b1c3a4632e8979894':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 10:24:27 -07:00
Jean-Baptiste Queru
5fcfce965f am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 00:39:44 -07:00
Robert Greenwalt
759efacd2d am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
  Make new networkAttribute parameter non-optional.
 2011-04-26 00:23:03 -07:00
Robert Greenwalt
af2eb4f6db Make new networkAttribute parameter non-optional. 
Dependencymet sets the default dep-met value for the network.  Should
be set to true unless you know what you're doing.

Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
 2011-04-25 16:04:45 -07:00
Freeman Ng
1e2e390fc7 am 3b9089c1: new LTE prepay related values 
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
  new LTE prepay related values
 2011-04-22 16:46:52 -07:00
Freeman Ng
3b9089c1fa new LTE prepay related values 
bug: 4082355
Change-Id: Id5a8f9b8bca64d9cf6ee13b00bd32c4911e9a3fa
 2011-04-22 16:42:57 -07:00
Scott Main
a23ae0d7be am 69ccfd7a: am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb 
* commit '69ccfd7a29fc492c25dcb96dc74daf2e900118f5':
  docs: add a little info to Configuration class description
 2011-04-21 10:57:10 -07:00
Scott Main
69ccfd7a29 am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb 
* commit 'ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83':
  docs: add a little info to Configuration class description
 2011-04-21 10:55:20 -07:00
Scott Main
ca7f30ebb2 am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb 
* commit 'b8a57841316171d6db4311a65914720213516153':
  docs: add a little info to Configuration class description
 2011-04-21 10:53:08 -07:00
Scott Main
63848e3df3 docs: add a little info to Configuration class description 
Change-Id: I3278759bd1c323330c1143ef71d0644872caa085
 2011-04-20 22:20:46 -07:00
Jozef BABJAK
41a5ed7cd9 Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise. 
Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
 2011-04-19 12:28:22 +02:00
Wink Saville
3767784999 am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
  Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
 2011-04-18 15:24:47 -07:00
Wink Saville
64c42cae44 Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
 2011-04-18 14:55:10 -07:00
Martin Wallgren
505bd0d60d onDetachedFromWindow is called before onAttachedToWindow 
Multiple threads are adding messages about the current
state of the views to the main looper. This can cause
onDetachedFromWindow to be posted on the looper before
onAttachedToWindow. This change will make sure to only
dispatch onDetachedFromWindow if we have previously
dispatched onAttachToWindow.

Change-Id: Ibc7cbcafb098bc000d2ef5480d2110d3fff4d55a
 2011-04-13 15:03:35 +02:00
Benoit Goby
0b9b8711a1 am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:23:42 -07:00
Benoit Goby
43be7a6120 EthernetDataTracker: implement setDependencyMet 
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
 2011-04-11 20:13:10 -07:00
Benoit Goby
316594715d am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
 2011-04-11 18:53:57 -07:00
Benoit Goby
2869d1715d resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
 2011-04-11 18:41:23 -07:00
Benoit Goby
08c39c6a11 Add support for USB Ethernet adapters 
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
 2011-04-11 16:33:43 -07:00
Jason parks
f953d3e2ea am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
  Implement teardown script.
 2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089 am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
 2011-04-11 14:23:59 -07:00
Wink Saville
1b00dc66d4 am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:08:19 -07:00
Wink Saville
3156a8c169 Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab Move ProcessedMessage into HierarchicalStateMachine. 
ProcessedMessage is really private to HSM and so moving
it into the HSM class.

Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
 2011-04-11 11:51:28 -07:00
Freeman Ng
2df36fd6ec am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
  Add prepaid data services URL to Secure Settings
 2011-04-11 11:19:18 -07:00
Freeman Ng
b7e8a54d98 Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 2011-04-11 11:10:18 -07:00
Freeman Ng
96be4e01e6 Add prepaid data services URL to Secure Settings 
This is really a Gservices value being accessed through Secure Settings

bug: 4100048
Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
 2011-04-07 18:21:40 -07:00
Nicolas Roard
16d8de7a29 am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 
* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
 2011-04-07 17:25:56 -07:00
Nicolas Roard
3e37a2f3ae am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 
* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
  Remove uncalled function -- java counterpart of the fix for bug:4183801
 2011-04-07 17:24:05 -07:00
Nicolas Roard
fcba23536b Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1 2011-04-07 17:21:53 -07:00
Nicolas Roard
4bae836784 Remove uncalled function -- java counterpart of 
the fix for bug:4183801

Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
 2011-04-07 15:04:26 -07:00
Teng-Hui Zhu
4e790ee189 am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:24:22 -07:00
Teng-Hui Zhu
29fa50be24 am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1 
* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
  DO NOT MERGE : cherry pick of change Ieb7ae26b from master
  DO NOT MERGE : cherry pick of change I0f9f2c65 from master
 2011-04-07 14:22:33 -07:00
Robert Greenwalt
f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp 
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
 2011-04-07 14:13:52 -07:00
Robert Greenwalt
70c3d1c23b Merge "Add external dependency API." into honeycomb-LTE 2011-04-07 13:02:28 -07:00
John Wang
c343c18376 am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE 
* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.
 2011-04-07 12:46:18 -07:00
John Wang
5d6f116703 Merge "Make LinkProperties comparable." into honeycomb-LTE 2011-04-07 12:44:04 -07:00
John Wang
4e900091c4 Make LinkProperties comparable. 
Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
 2011-04-07 12:36:56 -07:00