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

48046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Conley Owens
a6590e7fee am 13b21e60: Merge "Auto hide virtual keyboard" 
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
  Auto hide virtual keyboard
 2011-04-27 13:53:46 -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
Eric Fischer
a4e7353d33 Import revised translations. DO NOT MERGE 
Change-Id: I36de477855f825da9a3626becd1927c31639e23d
 2011-04-27 13:50:09 -07:00
Conley Owens
779fa1515d am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:48:45 -07:00
Conley Owens
ba5aebd106 am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage
 2011-04-27 13:41:12 -07:00
Alex Sakhartchouk
4658d779e3 Check setName() for null string + fix rsRand(). 
Change-Id: I5e0042930209861e2eb9acc91380e9473dac0997
 2011-04-27 13:30:43 -07:00
Conley Owens
13b21e608e Merge "Auto hide virtual keyboard" 2011-04-27 13:20:16 -07:00
Conley Owens
a538b4a206 Merge "onDetachedFromWindow is called before onAttachedToWindow" 2011-04-27 13:14:57 -07:00
Conley Owens
4a4d96e7ee Merge changes I0ab47e2f,Ib8016996 
* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:06:46 -07:00
Conley Owens
ac505b86b4 am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
  Add lock before calling initEglImage
 2011-04-27 12:46:09 -07:00
Conley Owens
f0556bb90f am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
  Add lock before calling initEglImage
 2011-04-27 12:43:19 -07:00
Conley Owens
86d1d74762 Merge "Add lock before calling initEglImage" 2011-04-27 12:28:05 -07:00
Gloria Wang
d84df05490 am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h 
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
  Add heartbeat error codes into MediaErrors.h
 2011-04-27 12:24:42 -07:00
Conley Owens
b54bebf47f am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted. 
* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
  Fix for startup NPE.
 2011-04-27 12:21:50 -07:00
Conley Owens
470239a090 am 30d59fa9: Ignore fix for startup NPE as file is deleted. 
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
  Fix for startup NPE.
 2011-04-27 12:18:03 -07:00
Gloria Wang
969749319c am 83ddcdf7: Add heartbeat error codes into MediaErrors.h 
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
  Add heartbeat error codes into MediaErrors.h
 2011-04-27 12:11:49 -07:00
Conley Owens
30d59fa90f Ignore fix for startup NPE as file is deleted. 
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
 2011-04-27 12:09:35 -07:00
Conley Owens
44935c2908 Merge "Fix for startup NPE." 2011-04-27 11:40:46 -07:00
Ramesh Sudini
38d284d323 Remove subclass cast for calls to isDnsCheckDisabled. 
Change-Id: Ic9121db810b295d9f614046932badf04f07a42db
 2011-04-26 21:17:06 -07:00
Gloria Wang
83ddcdf7fd Add heartbeat error codes into MediaErrors.h 
related-to-bug: 4322415

Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
 2011-04-26 19:35:32 -07:00
Nick Pelly
3fa53e448a am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:09:02 -07:00
Nick Pelly
36e6c4c194 am cc9ee72b: Implement dead service recovery in NFC extras library. 
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
  Implement dead service recovery in NFC extras library.
 2011-04-26 18:04:02 -07:00
Ramesh Sudini
315f107109 GsmDCT: Reset DataConnection upon APN disable. 
Change-Id: I36a715830604d0fe34f1ab5c8b1bf56eb5777e0f
 2011-04-26 16:53:38 -07:00
Ramesh Sudini
5ccc801a97 Delay data reconnection after disconnected. 
Change-Id: Iede631b5e92a48883ef87c66dd79490e92ec196a
 2011-04-26 16:47:18 -07:00
Nick Pelly
cc9ee72bd4 Implement dead service recovery in NFC extras library. 
Change-Id: I4f1d714c625470df4cda2c4c9aacb8d27bfabb10
 2011-04-26 16:38:00 -07:00
Conley Owens
ca15bf7ae0 am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit '54a952c84317afc64034ded8baad3d788a54026d':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 16:01:13 -07:00
Conley Owens
54a952c843 am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 15:50:33 -07:00
Conley Owens
bf4769c7da am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 
* commit '17ba30b549a847f3aab854173a9484851f694453':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
 2011-04-26 15:46:32 -07:00
Conley Owens
17ba30b549 Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 2011-04-26 14:36:48 -07:00