Format for the list of changes shows the origin commit reference followed by the file name. 33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java 33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java 133776-p9 core/java/android/app/IntentService.java 127013-p9 core/java/android/appwidget/AppWidgetHost.java 27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java 60765-p9 core/java/android/content/SyncResult.java 43920-p9 core/java/android/content/pm/ActivityInfo.java 43920-p9 core/java/android/content/pm/ApplicationInfo.java 43920-p9 core/java/android/content/pm/InstrumentationInfo.java 43920-p9 core/java/android/content/pm/PackageInfo.java 44103-p9 core/java/android/content/pm/PackageItemInfo.java 68960-p9 core/java/android/content/pm/PackageStats.java 43920-p9 core/java/android/content/pm/ResolveInfo.java 43920-p9 core/java/android/content/pm/ServiceInfo.java 60641-p9 core/java/android/content/res/Configuration.java 60734-p9 core/java/android/content/res/TypedArray.java 137672-p9 core/java/android/inputmethodservice/ExtractButton.java 123112-p9 core/java/android/inputmethodservice/ExtractEditText.java 119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java 112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java 115078-p9 core/java/android/os/BatteryStats.java 124790-p9 core/java/android/text/style/UpdateAppearance.java 45083-p9 core/java/android/view/RawInputEvent.java 101491-p9 core/java/android/view/inputmethod/EditorInfo.java 114701-p9 core/java/android/view/inputmethod/ExtractedText.java 123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java 119291-p9 core/java/com/android/internal/os/HandlerCaller.java 129279-p9 core/java/com/android/internal/os/PkgUsageStats.java 114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java 114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java 84364-p9 opengl/java/android/opengl/EGLLogWrapper.java 11355-p9 opengl/tools/glgen/src/CFunc.java 11355-p9 opengl/tools/glgen/src/CType.java 11355-p9 opengl/tools/glgen/src/CodeEmitter.java 11355-p9 opengl/tools/glgen/src/GenerateGL.java 11355-p9 opengl/tools/glgen/src/JFunc.java 11355-p9 opengl/tools/glgen/src/JType.java 11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java 11355-p9 opengl/tools/glgen/src/ParameterChecker.java 57236-p9 services/java/com/android/server/status/AnimatedImageView.java 66754-p9 services/java/com/android/server/status/CloseDragHandle.java 57188-p9 services/java/com/android/server/status/DateView.java 46928-p9 services/java/com/android/server/status/ExpandedView.java 70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java 45968-p9 services/java/com/android/server/status/IconData.java 57470-p9 services/java/com/android/server/status/IconMerger.java 82719-p9 services/java/com/android/server/status/LatestItemView.java 45968-p9 services/java/com/android/server/status/NotificationData.java 66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java 57458-p9 services/java/com/android/server/status/NotificationViewList.java 45968-p9 services/java/com/android/server/status/StatusBarException.java 45968-p9 services/java/com/android/server/status/StatusBarIcon.java 46130-p9 services/java/com/android/server/status/StatusBarNotification.java 45968-p9 services/java/com/android/server/status/StatusBarView.java 46199-p9 services/java/com/android/server/status/Ticker.java 62286-p9 services/java/com/android/server/status/TickerView.java 57188-p9 services/java/com/android/server/status/TrackingView.java 86041-p9 telephony/java/android/telephony/PhoneStateListener.java 87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java 136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java 34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java 55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java 127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java 129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java 25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java 46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java 77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java9788976b14core/java/android/accounts/AuthenticatorDescription.java5333288354core/java/android/app/UiModeManager.java93e7e22ec9core/java/android/app/FullBackupAgent.java328c0e7986core/java/android/content/CursorEntityIterator.java307da1a46bcore/java/android/content/SyncQueue.java307da1a46bcore/java/android/content/SyncOperation.javaeb034652c2core/java/android/content/pm/LabeledIntent.java49237345d8core/java/android/content/pm/FeatureInfo.javaa2b6c3775ecore/java/android/content/pm/PackageInfoLite.java3ecd5f4375core/java/android/content/pm/RegisteredServicesCacheListener.java5ebbb4a6b3core/java/android/content/pm/XmlSerializerAndParser.javac4516a7b62core/java/android/database/sqlite/SQLiteTransactionListener.java9bbc21a773core/java/com/android/internal/backup/LocalTransport.java21f1bd17b2core/java/com/android/internal/content/PackageMonitor.java4c62fc0e1ecore/java/com/android/internal/view/BaseSurfaceHolder.java4c62fc0e1ecore/java/com/android/internal/view/BaseIWindow.javae540833fdfcore/java/com/android/internal/os/SamplingProfilerIntegration.java192ab90388core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java1619367ab8media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java27f8002e59opengl/tools/glgen/stubs/gles11/glGetString.java560814f6b1opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java560814f6b1opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java560814f6b1opengl/tools/glgen/stubs/gles11/glShaderSource.java1c4907ee77opengl/tools/glgen/src/GenerateGLES.java1c4907ee77opengl/tools/glgen/src/Jsr239CodeEmitter.java1c4907ee77opengl/tools/glgen/src/GLESCodeEmitter.java69e21f5f6eopengl/tests/gldual/src/com/android/gldual/TriangleRenderer.javac028be4f3bpackages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java7c6efa13f1tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java7c6efa13f1tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java7c6efa13f1tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.javadf8a3f31d8tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.javacfaef699e1tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.javacfaef699e1tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.javacfaef699e1tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java Copyright header moved to top in following file: core/tests/coretests/src/android/widget/ListViewTest.java Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
170 lines
4.5 KiB
Java
170 lines
4.5 KiB
Java
/*
|
|
* Copyright (C) 2006 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
public class JFunc {
|
|
|
|
String className = "com.google.android.gles_jni.GL11Impl";
|
|
|
|
CFunc cfunc;
|
|
JType ftype;
|
|
String fname;
|
|
|
|
List<String> argNames = new ArrayList<String>();
|
|
List<JType> argTypes = new ArrayList<JType>();
|
|
List<Integer> argCIndices = new ArrayList<Integer>();
|
|
|
|
boolean hasBufferArg = false;
|
|
boolean hasTypedBufferArg = false;
|
|
ArrayList<String> bufferArgNames = new ArrayList<String>();
|
|
|
|
public JFunc(CFunc cfunc) {
|
|
this.cfunc = cfunc;
|
|
}
|
|
|
|
public CFunc getCFunc() {
|
|
return cfunc;
|
|
}
|
|
|
|
public void setName(String fname) {
|
|
this.fname = fname;
|
|
}
|
|
|
|
public String getName() {
|
|
return fname;
|
|
}
|
|
|
|
public void setType(JType ftype) {
|
|
this.ftype = ftype;
|
|
}
|
|
|
|
public JType getType() {
|
|
return ftype;
|
|
}
|
|
|
|
public void setClassName(String className) {
|
|
this.className = className;
|
|
}
|
|
|
|
public String getClassName() {
|
|
return className;
|
|
}
|
|
|
|
public boolean hasBufferArg() {
|
|
return hasBufferArg;
|
|
}
|
|
|
|
public boolean hasTypedBufferArg() {
|
|
return hasTypedBufferArg;
|
|
}
|
|
|
|
public String getBufferArgName(int index) {
|
|
return bufferArgNames.get(index);
|
|
}
|
|
|
|
public void addArgument(String argName, JType argType, int cindex) {
|
|
argNames.add(argName);
|
|
argTypes.add(argType);
|
|
argCIndices.add(new Integer(cindex));
|
|
|
|
if (argType.isBuffer()) {
|
|
hasBufferArg = true;
|
|
bufferArgNames.add(argName);
|
|
}
|
|
if (argType.isTypedBuffer()) {
|
|
hasTypedBufferArg = true;
|
|
bufferArgNames.add(argName);
|
|
}
|
|
}
|
|
|
|
public int getNumArgs() {
|
|
return argNames.size();
|
|
}
|
|
|
|
public int getArgIndex(String name) {
|
|
int len = argNames.size();
|
|
for (int i = 0; i < len; i++) {
|
|
if (name.equals(argNames.get(i))) {
|
|
return i;
|
|
}
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
public String getArgName(int index) {
|
|
return argNames.get(index);
|
|
}
|
|
|
|
public JType getArgType(int index) {
|
|
return argTypes.get(index);
|
|
}
|
|
|
|
public int getArgCIndex(int index) {
|
|
return argCIndices.get(index).intValue();
|
|
}
|
|
|
|
public static JFunc convert(CFunc cfunc, boolean useArray) {
|
|
try {
|
|
JFunc jfunc = new JFunc(cfunc);
|
|
jfunc.setName(cfunc.getName());
|
|
jfunc.setType(JType.convert(cfunc.getType(), false));
|
|
|
|
int numArgs = cfunc.getNumArgs();
|
|
int numOffsets = 0;
|
|
for (int i = 0; i < numArgs; i++) {
|
|
CType cArgType = cfunc.getArgType(i);
|
|
if (cArgType.isTypedPointer() && useArray) {
|
|
++numOffsets;
|
|
}
|
|
}
|
|
|
|
for (int i = 0; i < numArgs; i++) {
|
|
String cArgName = cfunc.getArgName(i);
|
|
CType cArgType = cfunc.getArgType(i);
|
|
|
|
jfunc.addArgument(cArgName, JType.convert(cArgType, useArray), i);
|
|
if (cArgType.isTypedPointer() && useArray) {
|
|
if (numOffsets > 1) {
|
|
jfunc.addArgument(cArgName + "Offset", new JType("int"), i);
|
|
} else {
|
|
jfunc.addArgument("offset", new JType("int"), i);
|
|
}
|
|
}
|
|
}
|
|
|
|
return jfunc;
|
|
} catch (RuntimeException e) {
|
|
System.err.println("Failed to convert function " + cfunc);
|
|
throw e;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
String s = "Function " + fname + " returns " + ftype + ": ";
|
|
for (int i = 0; i < argNames.size(); i++) {
|
|
if (i > 0) {
|
|
s += ", ";
|
|
}
|
|
s += argTypes.get(i) + " " + argNames.get(i);
|
|
}
|
|
return s;
|
|
}
|
|
|
|
}
|