diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-08-11 00:50:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 00:50:56 -0700 |
commit | 7b6d0d99b6904b511996267efae215fe9cb5e98f (patch) | |
tree | 85c1f63b5ba66ec77d5c9ecd5a2b44229ed67699 /include/android_runtime | |
parent | ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109 (diff) | |
parent | 679ac09a5c22175354f3a04b28456b323839530e (diff) | |
download | frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.zip frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.tar.gz frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.tar.bz2 |
am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'
* commit '679ac09a5c22175354f3a04b28456b323839530e':
More native work.
Diffstat (limited to 'include/android_runtime')
-rw-r--r-- | include/android_runtime/android_content_res_Configuration.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/include/android_runtime/android_content_res_Configuration.h b/include/android_runtime/android_content_res_Configuration.h new file mode 100644 index 0000000..2f5a982 --- /dev/null +++ b/include/android_runtime/android_content_res_Configuration.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2010 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. + */ + +#ifndef _ANDROID_CONTENT_RES_CONFIGURATION_H +#define _ANDROID_CONTENT_RES_CONFIGURATION_H + +#include <utils/ResourceTypes.h> +#include <android/configuration.h> + +#include "jni.h" + +struct AConfiguration : android::ResTable_config { +}; + +namespace android { + +extern void android_Configuration_getFromJava( + JNIEnv* env, jobject clazz, struct AConfiguration* out); + +} // namespace android + + +#endif // _ANDROID_CONTENT_RES_CONFIGURATION_H |