diff options
author | Steve Kondik <shade@chemlab.org> | 2011-02-28 19:57:08 -0500 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2011-02-28 19:57:08 -0500 |
commit | 0352af015fa313a1be3deda6956fa4bcd8f50e66 (patch) | |
tree | 317badef4730aa39e2a1c9e461e949d8dd8fe533 /tools | |
parent | f1df5d9d3fc04b6d0e8268102eb3bc9c27937fac (diff) | |
parent | 322891c689c845b5aa63dbca606967eb9f8f900b (diff) | |
download | frameworks_base-0352af015fa313a1be3deda6956fa4bcd8f50e66.zip frameworks_base-0352af015fa313a1be3deda6956fa4bcd8f50e66.tar.gz frameworks_base-0352af015fa313a1be3deda6956fa4bcd8f50e66.tar.bz2 |
Merge branch 'gingerbread' of git://android.git.kernel.org/platform/frameworks/base into 233-merge
Conflicts:
api/current.xml
core/java/android/content/pm/PackageParser.java
core/java/android/net/ConnectivityManager.java
core/java/android/widget/TextView.java
core/java/com/android/internal/os/BatteryStatsImpl.java
core/res/res/drawable-mdpi/btn_check_off.png
core/res/res/drawable-mdpi/btn_check_off_disable.png
core/res/res/drawable-mdpi/btn_check_off_disable_focused.png
core/res/res/drawable-mdpi/btn_check_off_pressed.png
core/res/res/drawable-mdpi/btn_check_off_selected.png
core/res/res/drawable-mdpi/btn_check_on.png
core/res/res/drawable-mdpi/btn_check_on_disable.png
core/res/res/drawable-mdpi/btn_check_on_disable_focused.png
core/res/res/drawable-mdpi/btn_check_on_pressed.png
core/res/res/drawable-mdpi/btn_check_on_selected.png
core/res/res/values-ca/strings.xml
core/res/res/values-de/strings.xml
core/res/res/values/config.xml
include/media/AudioSystem.h
include/media/mediarecorder.h
media/java/android/media/MediaRecorder.java
media/libmedia/AudioSystem.cpp
media/libstagefright/StagefrightMediaScanner.cpp
media/libstagefright/rtsp/ARTSPConnection.cpp
media/libstagefright/rtsp/ASessionDescription.cpp
media/libstagefright/rtsp/MyHandler.h
policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
policy/src/com/android/internal/policy/impl/LockScreen.java
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java
services/audioflinger/AudioPolicyManagerBase.cpp
services/java/com/android/server/PackageManagerService.java
services/java/com/android/server/am/ActivityManagerService.java
test-runner/src/android/test/mock/MockPackageManager.java
voip/java/android/net/sip/SipProfile.java
voip/java/com/android/server/sip/SipService.java
wifi/java/android/net/wifi/WifiStateTracker.java
Change-Id: Ia65d02a66c6206b5f4ed95c3a64e3f28a03e7329
Diffstat (limited to 'tools')
-rw-r--r-- | tools/aapt/Command.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 661ecb1..739763e 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -904,10 +904,10 @@ int doDump(Bundle* bundle) error.string()); goto bail; } - } else if (tag == "uses-gl-texture") { + } else if (tag == "supports-gl-texture") { String8 name = getAttribute(tree, NAME_ATTR, &error); if (name != "" && error == "") { - printf("uses-gl-texture:'%s'\n", name.string()); + printf("supports-gl-texture:'%s'\n", name.string()); } else { fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n", error.string()); |