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

30742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Conley Owens
8fff7805ab Merge "Remove duplicate '=' in exception message" 2011-04-28 11:46:39 -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
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
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
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
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
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
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
Nick Pelly
cc9ee72bd4 Implement dead service recovery in NFC extras library. 
Change-Id: I4f1d714c625470df4cda2c4c9aacb8d27bfabb10
 2011-04-26 16:38:00 -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
Kenny Root
bb93dad925 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
bb10986c3d 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
13ce221e43 Merge "libutils: Fix an improper const-cast in RefBase" 2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
45e13ec1c5 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
Irfan Sheriff
78d4e71dec 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
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
Jean-Baptiste Queru
4b72eec34c Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 2011-04-25 13:33:37 -07:00
Irfan Sheriff
d2127c438f Handle DHCP renewal and wakeup in framework 
The native DHCP client renews IP address, but can fail to do so when the device
is in suspend. This has lead to issues where device fails to renew in time and
on networks with lots of devices re-using expired DHCP IP addresses, it leads to
severe issues.

Handle DHCP renewal and wakeup in framework

Bug: 3344732
Change-Id: Ie4062e04a477f4a233946155e40a7c999b337c3f
 2011-04-22 15:08:02 -07:00
Josh Stone
c4fbbe06a5 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
Jaikumar Ganesh
24a16e6c53 am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7" 
* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
  Unable to push files to Windows 7
 2011-04-19 15:57:24 -07:00
Jaikumar Ganesh
c34c88b948 am ec1a8f7a: Merge "Unable to push files to Windows 7" 
* commit 'ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
  Unable to push files to Windows 7
 2011-04-19 15:28:26 -07:00
Jaikumar Ganesh
ec1a8f7aa7 Merge "Unable to push files to Windows 7" 2011-04-19 14:48:08 -07:00