| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'gingerbread' of ↵ | Steve Kondik | 2011-07-26 | 1 | -12/+36 |
| | | | | | | | | | | | | | | | git://android.git.kernel.org/platform/frameworks/base into upstream-2.3.5 Conflicts: core/java/android/content/pm/IPackageManager.aidl core/java/android/server/BluetoothService.java packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java services/java/com/android/server/PackageManagerService.java telephony/java/com/android/internal/telephony/gsm/GSMPhone.java wifi/java/android/net/wifi/WifiStateTracker.java Change-Id: I254bd490297376ae8070fffcb07d4fe15afe3a8d | ||||
| * | libutils: Fix an improper const-cast in RefBase | Josh Stone | 2011-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | 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 | ||||
| * | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+534 |
| | | |||||
| * | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -534/+0 |
| | | |||||
| * | Initial Contribution | The Android Open Source Project | 2008-10-21 | 1 | -0/+534 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |