OSDN Git Service

android-x86/frameworks-native.git
13 years agoam d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than...
Conley Owens [Fri, 29 Apr 2011 21:55:55 +0000 (14:55 -0700)]
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.

13 years agoam 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception...
Conley Owens [Fri, 29 Apr 2011 21:55:35 +0000 (14:55 -0700)]
am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"

* commit '893812b2ee4a640ad398f7f79f90b92d52a5f3b1':
  Remove duplicate '=' in exception message

13 years agoam f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
James Dong [Fri, 29 Apr 2011 21:53:30 +0000 (14:53 -0700)]
am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.

* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
  Add avg bandwidth estimate every 2 seconds - do not merge.

13 years agoam ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
James Dong [Fri, 29 Apr 2011 21:42:58 +0000 (14:42 -0700)]
am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.

* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.

13 years agoam 5f2ff42b: Add data to bugreports.
Robert Greenwalt [Fri, 29 Apr 2011 17:14:26 +0000 (10:14 -0700)]
am 5f2ff42b: Add data to bugreports.

* commit '5f2ff42b282e093b61b9e7b07c79a74ea8ce3272':
  Add data to bugreports.

13 years agoam da882181: Merge "Eliminating dead code with no other effect than consuming battery...
Conley Owens [Fri, 29 Apr 2011 06:52:21 +0000 (23:52 -0700)]
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.

13 years agoMerge "Eliminating dead code with no other effect than consuming battery life."
Conley Owens [Thu, 28 Apr 2011 21:56:55 +0000 (14:56 -0700)]
Merge "Eliminating dead code with no other effect than consuming battery life."

13 years agoam d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic...
Scott Main [Thu, 28 Apr 2011 21:32:02 +0000 (14:32 -0700)]
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

13 years agoam 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring...
Scott Main [Thu, 28 Apr 2011 21:25:22 +0000 (14:25 -0700)]
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

13 years agoam c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug...
Scott Main [Thu, 28 Apr 2011 21:21:46 +0000 (14:21 -0700)]
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

13 years agoMerge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into...
Scott Main [Thu, 28 Apr 2011 21:08:57 +0000 (14:08 -0700)]
Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

13 years agoam a68a61df: Merge "Telephony: Data availability indication upon records loaded....
Wink Saville [Thu, 28 Apr 2011 20:54:14 +0000 (13:54 -0700)]
am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

* commit 'a68a61dfe37969426c535d076a20181155493226':
  Telephony: Data availability indication upon records loaded.

13 years agoam 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:52:28 +0000 (13:52 -0700)]
am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

* commit '05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
  Telephony: Corrections to signal strength values.

13 years agoam 379cbb1d: Send STK Service Running RIL Request after sim module is ready
Kazuhiro Ondo [Thu, 28 Apr 2011 20:52:26 +0000 (13:52 -0700)]
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

13 years agoMerge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:51:31 +0000 (13:51 -0700)]
Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

13 years agoMerge "Telephony: Corrections to signal strength values." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 20:51:22 +0000 (13:51 -0700)]
Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

13 years agoam e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
Conley Owens [Thu, 28 Apr 2011 19:00:53 +0000 (12:00 -0700)]
am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"

* commit 'e6e3322a3baef4cce7d382a7890718a805c4bd3b':
  Remove duplicate '=' in exception message

13 years agoam 8fff7805: Merge "Remove duplicate \'=\' in exception message"
Conley Owens [Thu, 28 Apr 2011 18:57:48 +0000 (11:57 -0700)]
am 8fff7805: Merge "Remove duplicate \'=\' in exception message"

* commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed':
  Remove duplicate '=' in exception message

13 years agoam 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:53:08 +0000 (11:53 -0700)]
am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
  GsmDCT: Reset DataConnection upon APN disable.

13 years agoam 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honey...
Wink Saville [Thu, 28 Apr 2011 18:53:05 +0000 (11:53 -0700)]
am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
  Remove subclass cast for calls to isDnsCheckDisabled.

13 years agoam 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:53:02 +0000 (11:53 -0700)]
am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE

* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
  Delay data reconnection after disconnected.

13 years agoMerge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:24 +0000 (11:50 -0700)]
Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

13 years agoMerge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:15 +0000 (11:50 -0700)]
Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

13 years agoMerge "Delay data reconnection after disconnected." into honeycomb-LTE
Wink Saville [Thu, 28 Apr 2011 18:50:05 +0000 (11:50 -0700)]
Merge "Delay data reconnection after disconnected." into honeycomb-LTE

13 years agoam 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
Irfan Sheriff [Thu, 28 Apr 2011 18:48:47 +0000 (11:48 -0700)]
am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

* commit '8f87f8389866058a081e601fc0df45a3527a3150':
  Define Protocol class for use with StateMachine

13 years agoMerge "Remove duplicate '=' in exception message"
Conley Owens [Thu, 28 Apr 2011 18:46:39 +0000 (11:46 -0700)]
Merge "Remove duplicate '=' in exception message"

13 years agoMerge "Define Protocol class for use with StateMachine" into honeycomb-LTE
Irfan Sheriff [Thu, 28 Apr 2011 18:38:54 +0000 (11:38 -0700)]
Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

13 years agoam 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 28 Apr 2011 17:25:52 +0000 (10:25 -0700)]
am 1d104476: (-s ours) am a4e7353d: Import revised translations.  DO NOT MERGE

* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
  Import revised translations.  DO NOT MERGE

13 years agoIgnore change since file no longer exists
Conley Owens [Thu, 28 Apr 2011 17:10:52 +0000 (10:10 -0700)]
Ignore change since file no longer exists

13 years agoam 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()....
Stephen Hines [Thu, 28 Apr 2011 00:38:53 +0000 (17:38 -0700)]
am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '697f8b331bb339e4db716efbb96e2182aac40255':
  Check setName() for null string + fix rsRand().

13 years agoam 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
Stephen Hines [Thu, 28 Apr 2011 00:36:38 +0000 (17:36 -0700)]
am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
  Check setName() for null string + fix rsRand().

13 years agoMerge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
Stephen Hines [Thu, 28 Apr 2011 00:32:40 +0000 (17:32 -0700)]
Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

13 years agoMerge commit '5e3562a5' into m
Conley Owens [Wed, 27 Apr 2011 23:58:24 +0000 (16:58 -0700)]
Merge commit '5e3562a5' into m

Conflicts:
core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87

13 years agoIgnore xml change since file no longer exists
Conley Owens [Wed, 27 Apr 2011 23:49:07 +0000 (16:49 -0700)]
Ignore xml change since file no longer exists

13 years agoam a4e7353d: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 22:30:36 +0000 (15:30 -0700)]
am a4e7353d: Import revised translations.  DO NOT MERGE

* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
  Import revised translations.  DO NOT MERGE

13 years agoam a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 21:53:26 +0000 (14:53 -0700)]
am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"

* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
  Auto hide virtual keyboard

13 years agoam cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWi...
Conley Owens [Wed, 27 Apr 2011 21:53:15 +0000 (14:53 -0700)]
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"

* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
  onDetachedFromWindow is called before onAttachedToWindow

13 years agoam 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 21:53:10 +0000 (14:53 -0700)]
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoam 13b21e60: Merge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 20:53:46 +0000 (13:53 -0700)]
am 13b21e60: Merge "Auto hide virtual keyboard"

* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
  Auto hide virtual keyboard

13 years agoam a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
Conley Owens [Wed, 27 Apr 2011 20:53:37 +0000 (13:53 -0700)]
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"

* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
  onDetachedFromWindow is called before onAttachedToWindow

13 years agoam 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 20:48:45 +0000 (13:48 -0700)]
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoam ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 20:41:12 +0000 (13:41 -0700)]
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage

13 years agoMerge "Auto hide virtual keyboard"
Conley Owens [Wed, 27 Apr 2011 20:20:16 +0000 (13:20 -0700)]
Merge "Auto hide virtual keyboard"

13 years agoMerge "onDetachedFromWindow is called before onAttachedToWindow"
Conley Owens [Wed, 27 Apr 2011 20:14:57 +0000 (13:14 -0700)]
Merge "onDetachedFromWindow is called before onAttachedToWindow"

13 years agoMerge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 20:06:46 +0000 (13:06 -0700)]
Merge changes I0ab47e2f,Ib8016996

* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoam f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:46:09 +0000 (12:46 -0700)]
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
  Add lock before calling initEglImage

13 years agoam 86d1d747: Merge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:43:19 +0000 (12:43 -0700)]
am 86d1d747: Merge "Add lock before calling initEglImage"

* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
  Add lock before calling initEglImage

13 years agoMerge "Add lock before calling initEglImage"
Conley Owens [Wed, 27 Apr 2011 19:28:05 +0000 (12:28 -0700)]
Merge "Add lock before calling initEglImage"

13 years agoam 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
Gloria Wang [Wed, 27 Apr 2011 19:24:42 +0000 (12:24 -0700)]
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit '969749319ca17f6e0c6836303a78cc484df2539b':
  Add heartbeat error codes into MediaErrors.h

13 years agoam 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:21:50 +0000 (12:21 -0700)]
am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
  Fix for startup NPE.

13 years agoam 30d59fa9: Ignore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:18:03 +0000 (12:18 -0700)]
am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
  Fix for startup NPE.

13 years agoam 83ddcdf7: Add heartbeat error codes into MediaErrors.h
Gloria Wang [Wed, 27 Apr 2011 19:11:49 +0000 (12:11 -0700)]
am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
  Add heartbeat error codes into MediaErrors.h

13 years agoIgnore fix for startup NPE as file is deleted.
Conley Owens [Wed, 27 Apr 2011 19:09:31 +0000 (12:09 -0700)]
Ignore fix for startup NPE as file is deleted.

Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20

13 years agoMerge "Fix for startup NPE."
Conley Owens [Wed, 27 Apr 2011 18:40:46 +0000 (11:40 -0700)]
Merge "Fix for startup NPE."

13 years agoam 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
Nick Pelly [Wed, 27 Apr 2011 01:09:02 +0000 (18:09 -0700)]
am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
  Implement dead service recovery in NFC extras library.

13 years agoam cc9ee72b: Implement dead service recovery in NFC extras library.
Nick Pelly [Wed, 27 Apr 2011 01:04:02 +0000 (18:04 -0700)]
am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
  Implement dead service recovery in NFC extras library.

13 years agoam 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from...
Conley Owens [Tue, 26 Apr 2011 23:01:13 +0000 (16:01 -0700)]
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)

13 years agoam bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI...
Conley Owens [Tue, 26 Apr 2011 22:50:33 +0000 (15:50 -0700)]
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)

13 years agoam 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
Conley Owens [Tue, 26 Apr 2011 22:46:32 +0000 (15:46 -0700)]
am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit '17ba30b549a847f3aab854173a9484851f694453':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)

13 years agoMerge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
Conley Owens [Tue, 26 Apr 2011 21:36:48 +0000 (14:36 -0700)]
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

13 years agoam bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast...
Kenny Root [Tue, 26 Apr 2011 18:45:46 +0000 (11:45 -0700)]
am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit 'bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930':
  libutils: Fix an improper const-cast in RefBase

13 years agoam bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
Kenny Root [Tue, 26 Apr 2011 18:41:31 +0000 (11:41 -0700)]
am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
  libutils: Fix an improper const-cast in RefBase

13 years agoam 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
Kenny Root [Tue, 26 Apr 2011 18:32:22 +0000 (11:32 -0700)]
am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
  libutils: Fix an improper const-cast in RefBase

13 years agoMerge "libutils: Fix an improper const-cast in RefBase"
Kenny Root [Tue, 26 Apr 2011 18:26:33 +0000 (11:26 -0700)]
Merge "libutils: Fix an improper const-cast in RefBase"

13 years agoam 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mString...
Jean-Baptiste Queru [Tue, 26 Apr 2011 17:24:27 +0000 (10:24 -0700)]
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.

13 years agoam 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework
Irfan Sheriff [Tue, 26 Apr 2011 15:54:54 +0000 (08:54 -0700)]
am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework

* commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
  Handle DHCP renewal and wakeup in framework

13 years agoam 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was...
Jean-Baptiste Queru [Tue, 26 Apr 2011 08:20:37 +0000 (01:20 -0700)]
am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.

13 years agoam e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug...
Scott Main [Tue, 26 Apr 2011 08:18:21 +0000 (01:18 -0700)]
am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit 'e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de':
  docs: update a couple usb driver URLs bug: 4339758

13 years agoam 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
Eric Laurent [Tue, 26 Apr 2011 08:14:07 +0000 (01:14 -0700)]
am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume

* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
  Fix issue 4335692: HDMI media volume

13 years agoam e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758
Scott Main [Tue, 26 Apr 2011 08:12:14 +0000 (01:12 -0700)]
am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit 'e1e3d7d97caf89307230e85997f5d23074b216cb':
  docs: update a couple usb driver URLs bug: 4339758

13 years agoam d2127c43: Handle DHCP renewal and wakeup in framework
Irfan Sheriff [Tue, 26 Apr 2011 08:01:31 +0000 (01:01 -0700)]
am d2127c43: Handle DHCP renewal and wakeup in framework

* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
  Handle DHCP renewal and wakeup in framework

13 years agoam 97fee855: docs: update a couple usb driver URLs bug: 4339758
Scott Main [Tue, 26 Apr 2011 07:45:35 +0000 (00:45 -0700)]
am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
  docs: update a couple usb driver URLs bug: 4339758

13 years agoam 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized...
Jean-Baptiste Queru [Tue, 26 Apr 2011 07:39:44 +0000 (00:39 -0700)]
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.

13 years agoam ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
Robert Greenwalt [Tue, 26 Apr 2011 07:23:03 +0000 (00:23 -0700)]
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE

* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
  Make new networkAttribute parameter non-optional.

13 years agoam dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is...
Ramesh Sudini [Tue, 26 Apr 2011 07:21:37 +0000 (00:21 -0700)]
am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."

* commit 'dcbba67afc08d0ac9af53e95d5997af11f869853':
  Telephony: Fix merge issue "Set enabled state before notification is sent out."

13 years agoam 223995dc: Fix issue 4335692: HDMI media volume
Eric Laurent [Tue, 26 Apr 2011 07:19:34 +0000 (00:19 -0700)]
am 223995dc: Fix issue 4335692: HDMI media volume

* commit '223995dcf28aca2399258951a59559a7ae318ceb':
  Fix issue 4335692: HDMI media volume

13 years agoMerge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
Robert Greenwalt [Mon, 25 Apr 2011 23:19:30 +0000 (16:19 -0700)]
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE

13 years agoMerge "Re-assingning local variable if mStringBlocks was initialized here. NPE is...
Jean-Baptiste Queru [Mon, 25 Apr 2011 20:33:37 +0000 (13:33 -0700)]
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

13 years agoam 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs...
Joe Fernandez [Fri, 22 Apr 2011 23:48:44 +0000 (16:48 -0700)]
am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013

* commit '41f665a5f9d4e73ba8dabceb721c9c8873591bac':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013

13 years agoam 3b9089c1: new LTE prepay related values
Freeman Ng [Fri, 22 Apr 2011 23:46:52 +0000 (16:46 -0700)]
am 3b9089c1: new LTE prepay related values

* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
  new LTE prepay related values

13 years agoam c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug...
Joe Fernandez [Fri, 22 Apr 2011 23:46:37 +0000 (16:46 -0700)]
am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013

* commit 'c84362a72ab958c4ffe34c16d8cf76883d48f0e8':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013

13 years agoam a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
Joe Fernandez [Fri, 22 Apr 2011 23:36:33 +0000 (16:36 -0700)]
am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013

* commit 'a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
  docs: Fixing Issue with code for Adding Tabs topic bug 4293013

13 years agolibutils: Fix an improper const-cast in RefBase
Josh Stone [Fri, 22 Apr 2011 18:13:35 +0000 (11:13 -0700)]
libutils: Fix an improper const-cast in RefBase

Under Fedora 15 Beta, gcc 4.6.0 warns:

  frameworks/base/libs/utils/RefBase.cpp: In member function
    ‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
  frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
    ‘const android::RefBase::weakref_impl’ as ‘this’ argument of
    ‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
    discards qualifiers [-fpermissive]

trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.

Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c

13 years agoam a2c180a0: am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:42:25 +0000 (17:42 -0700)]
am a2c180a0: am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes

* commit 'a2c180a0dde842d76d75c8b22ee7db29b482757e':
  docs: fix typo in 3.0 notes

13 years agoam caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:39:30 +0000 (17:39 -0700)]
am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes

* commit 'caf60ebdbdf9769624f17395aabac4cf11ee130d':
  docs: fix typo in 3.0 notes

13 years agoam 48c187f9: docs: fix typo in 3.0 notes
Scott Main [Fri, 22 Apr 2011 00:36:40 +0000 (17:36 -0700)]
am 48c187f9: docs: fix typo in 3.0 notes

* commit '48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
  docs: fix typo in 3.0 notes

13 years agoam 69ccfd7a: am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuratio...
Scott Main [Thu, 21 Apr 2011 17:57:10 +0000 (10:57 -0700)]
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

13 years agoam ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class descr...
Scott Main [Thu, 21 Apr 2011 17:55:20 +0000 (10:55 -0700)]
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

13 years agoam b8a57841: Merge "docs: add a little info to Configuration class description" into...
Scott Main [Thu, 21 Apr 2011 17:53:08 +0000 (10:53 -0700)]
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

13 years agoMerge "docs: add a little info to Configuration class description" into honeycomb
Scott Main [Thu, 21 Apr 2011 17:51:14 +0000 (10:51 -0700)]
Merge "docs: add a little info to Configuration class description" into honeycomb

13 years agoam fdf854cc: am 1ccfd8ed: am d155e1a2: docs: change ZTE usb driver link
Scott Main [Thu, 21 Apr 2011 17:26:50 +0000 (10:26 -0700)]
am fdf854cc: am 1ccfd8ed: am d155e1a2: docs: change ZTE usb driver link

* commit 'fdf854cce521438bef666148453ff5f97e6f38e3':
  docs: change ZTE usb driver link

13 years agoam 1ccfd8ed: am d155e1a2: docs: change ZTE usb driver link
Scott Main [Thu, 21 Apr 2011 17:18:13 +0000 (10:18 -0700)]
am 1ccfd8ed: am d155e1a2: docs: change ZTE usb driver link

* commit '1ccfd8ed7db0d6a8e9ac268baed060f0518cb4e5':
  docs: change ZTE usb driver link

13 years agoam d155e1a2: docs: change ZTE usb driver link
Scott Main [Thu, 21 Apr 2011 17:08:20 +0000 (10:08 -0700)]
am d155e1a2: docs: change ZTE usb driver link

* commit 'd155e1a2d8768e383824c565a5b4f5a7546960ea':
  docs: change ZTE usb driver link

13 years agoam afa79585: Remove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 18:33:11 +0000 (11:33 -0700)]
am afa79585: Remove getCurrentDataConnectionList.

* commit 'afa79585e0e517d9fdfe6065bc5084cab9bb2300':
  Remove getCurrentDataConnectionList.

13 years agoam 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"
Jaikumar Ganesh [Tue, 19 Apr 2011 23:01:36 +0000 (16:01 -0700)]
am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

* commit '24a16e6c53d9b45c0cfdf150425002adc919955b':
  Unable to push files to Windows 7

13 years agoam c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"
Jaikumar Ganesh [Tue, 19 Apr 2011 22:57:24 +0000 (15:57 -0700)]
am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
  Unable to push files to Windows 7

13 years agoam ec1a8f7a: Merge "Unable to push files to Windows 7"
Jaikumar Ganesh [Tue, 19 Apr 2011 22:28:26 +0000 (15:28 -0700)]
am ec1a8f7a: Merge "Unable to push files to Windows 7"

* commit 'ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
  Unable to push files to Windows 7

13 years agoMerge "Unable to push files to Windows 7"
Jaikumar Ganesh [Tue, 19 Apr 2011 21:48:08 +0000 (14:48 -0700)]
Merge "Unable to push files to Windows 7"

13 years agoam 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher...
Andreas Huber [Mon, 18 Apr 2011 22:45:21 +0000 (15:45 -0700)]
am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit '5ce9eb9a34ffac3ff5aea0db81a902a380105d5b':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

13 years agoam f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when tryin...
Andreas Huber [Mon, 18 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.