ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,315 Commits 2 Branches 0 Tags 54 MiB
691a24f04d
Commit Graph

32315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Conley Owens
691a24f04d 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
2aaa7e9bff Ignore xml change since file no longer exists 2011-04-27 16:49:07 -07:00
Conley Owens
40480f7847 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
81cb77ebcf 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
0581488aa6 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
697922855c 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
ddc25bb92e 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
Conley Owens
1a43e04fd7 Merge "onDetachedFromWindow is called before onAttachedToWindow" 2011-04-27 13:14:57 -07:00
Conley Owens
61b1dd24a9 Merge changes I0ab47e2f,Ib8016996 
* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:06:46 -07:00
Conley Owens
f0015cab94 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
a97b487178 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
4dc780e366 Merge "Add lock before calling initEglImage" 2011-04-27 12:28:05 -07:00
Gloria Wang
27030e51a0 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
3cf9899bfa 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
100a051134 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
6f9bbdf31a 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
ff13c6559c Ignore fix for startup NPE as file is deleted. 
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
 2011-04-27 12:09:35 -07:00
Conley Owens
9deec6fe2a Merge "Fix for startup NPE." 2011-04-27 11:40:46 -07:00
Nick Pelly
e8e764a417 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
4dd1b75e82 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
Conley Owens
8365cd27bc 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
93d0d8663d 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
7f4b15761b 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
2d904f106b Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)" 2011-04-26 14:36:48 -07:00
Kenny Root
f3faf0bc3d 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
 2011-04-26 11:45:46 -07:00
Kenny Root
dd3718af90 am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:41:31 -07:00
Kenny Root
b5e7f05190 am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:32:22 -07:00
Kenny Root
c364113a1b Merge "libutils: Fix an improper const-cast in RefBase" 2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
62d9009da1 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
Irfan Sheriff
bb16d2f792 am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework 
* commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
  Handle DHCP renewal and wakeup in framework
 2011-04-26 08:54:54 -07:00
Jean-Baptiste Queru
84199cac5d 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.
 2011-04-26 01:20:37 -07:00
Scott Main
b1002d9ec5 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
 2011-04-26 01:18:21 -07:00
Eric Laurent
4e19d9ee2d am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume 
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
  Fix issue 4335692: HDMI media volume
 2011-04-26 01:14:07 -07:00
Scott Main
f350c5e7c7 am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758 
* commit 'e1e3d7d97caf89307230e85997f5d23074b216cb':
  docs: update a couple usb driver URLs bug: 4339758
 2011-04-26 01:12:14 -07:00
Irfan Sheriff
6e218d3f06 am d2127c43: Handle DHCP renewal and wakeup in framework 
* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
  Handle DHCP renewal and wakeup in framework
 2011-04-26 01:01:31 -07:00
Scott Main
bba61e6644 am 97fee855: docs: update a couple usb driver URLs bug: 4339758 
* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
  docs: update a couple usb driver URLs bug: 4339758
 2011-04-26 00:45:35 -07:00
Jean-Baptiste Queru
a89e25181f 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
64e6e9ef73 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
Ramesh Sudini
588823c28a 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."
 2011-04-26 00:21:37 -07:00
Eric Laurent
eaead44d23 am 223995dc: Fix issue 4335692: HDMI media volume 
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
  Fix issue 4335692: HDMI media volume
 2011-04-26 00:19:34 -07:00
Robert Greenwalt
b7f462b9f7 Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 2011-04-25 16:19:30 -07:00
Jean-Baptiste Queru
26603203b6 Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 2011-04-25 13:33:37 -07:00
Joe Fernandez
7b339d2592 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
 2011-04-22 16:48:44 -07:00
Freeman Ng
62bc73e09e am 3b9089c1: new LTE prepay related values 
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
  new LTE prepay related values
 2011-04-22 16:46:52 -07:00
Joe Fernandez
7d6a9fb6e2 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
 2011-04-22 16:46:37 -07:00
Joe Fernandez
0582a8bc1f 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
 2011-04-22 16:36:33 -07:00
Josh Stone
e6b21626a5 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
 2011-04-22 11:13:35 -07:00
Scott Main
b2b2227c12 am a2c180a0: am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes 
* commit 'a2c180a0dde842d76d75c8b22ee7db29b482757e':
  docs: fix typo in 3.0 notes
 2011-04-21 17:42:25 -07:00
Scott Main
caeae23123 am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes 
* commit 'caf60ebdbdf9769624f17395aabac4cf11ee130d':
  docs: fix typo in 3.0 notes
 2011-04-21 17:39:30 -07:00
Scott Main
b724172599 am 48c187f9: docs: fix typo in 3.0 notes 
* commit '48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
  docs: fix typo in 3.0 notes
 2011-04-21 17:36:40 -07:00