Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@christiantroy
christiantroy committed Jun 21, 2012
1 parent 5e1fa21 commit 2fa4bb8
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 104 deletions.
33 changes: 11 additions & 22 deletions api/current.txt
View file
Expand Up @@ -5531,6 +5531,7 @@ package android.content {
field public static final java.lang.String CATEGORY_HE_DESK_DOCK = "android.intent.category.HE_DESK_DOCK";
field public static final java.lang.String CATEGORY_HOME = "android.intent.category.HOME";
field public static final java.lang.String CATEGORY_INFO = "android.intent.category.INFO";
field public static final java.lang.String CATEGORY_KB_DOCK = "android.intent.category.KB_DOCK";
field public static final java.lang.String CATEGORY_LAUNCHER = "android.intent.category.LAUNCHER";
field public static final java.lang.String CATEGORY_LE_DESK_DOCK = "android.intent.category.LE_DESK_DOCK";
field public static final java.lang.String CATEGORY_MONKEY = "android.intent.category.MONKEY";
Expand All @@ -5540,7 +5541,6 @@ package android.content {
field public static final java.lang.String CATEGORY_SELECTED_ALTERNATIVE = "android.intent.category.SELECTED_ALTERNATIVE";
field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";
field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";
field public static final java.lang.String CATEGORY_TF101_KB_DOCK = "android.intent.category.TF101_KB_DOCK";
field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";
field public static final android.os.Parcelable.Creator CREATOR;
field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
Expand All @@ -5557,8 +5557,8 @@ package android.content {
field public static final int EXTRA_DOCK_STATE_CAR = 2; // 0x2
field public static final int EXTRA_DOCK_STATE_DESK = 1; // 0x1
field public static final int EXTRA_DOCK_STATE_HE_DESK = 4; // 0x4
field public static final int EXTRA_DOCK_STATE_KB = 10; // 0xa
field public static final int EXTRA_DOCK_STATE_LE_DESK = 3; // 0x3
field public static final int EXTRA_DOCK_STATE_TF101_KB = 10; // 0xa
field public static final int EXTRA_DOCK_STATE_UNDOCKED = 0; // 0x0
field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";
Expand Down Expand Up @@ -6255,6 +6255,8 @@ package android.content.pm {
field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";
field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";
field public static final java.lang.String FEATURE_HALL_SENSOR = "asus.hardware.hall_sensor";
field public static final java.lang.String FEATURE_KB_DOCK = "asus.hardware.dock";
field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";
field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";
field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
Expand All @@ -6274,8 +6276,6 @@ package android.content.pm {
field public static final java.lang.String FEATURE_TELEPHONY = "android.hardware.telephony";
field public static final java.lang.String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
field public static final java.lang.String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
field public static final java.lang.String FEATURE_TF101_HALL_SENSOR = "asus.hardware.hall_sensor";
field public static final java.lang.String FEATURE_TF101_KB_DOCK = "asus.hardware.dock";
field public static final java.lang.String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";
Expand Down Expand Up @@ -6654,6 +6654,7 @@ package android.content.res {
method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;
method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
method public final void updateStringCache();
}

public static class Resources.NotFoundException extends java.lang.RuntimeException {
Expand Down Expand Up @@ -10950,7 +10951,7 @@ package android.media {
public static abstract interface MediaPlayer.OnInfoListener {
method public abstract boolean onInfo(android.media.MediaPlayer, int, int);
}

public static abstract interface MediaPlayer.OnParse3dFileListener {
method public abstract int onParse3dFile(int);
}
Expand All @@ -10966,7 +10967,7 @@ package android.media {
public static abstract interface MediaPlayer.OnVideoSizeChangedListener {
method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
}

public static class MediaPlayer.SubInfo {
ctor public MediaPlayer.SubInfo(byte[], java.lang.String, int);
field public java.lang.String charset;
Expand Down Expand Up @@ -17735,6 +17736,7 @@ package android.provider {
field public static final java.lang.String MODE_RINGER = "mode_ringer";
field public static final java.lang.String MODE_RINGER_STREAMS_AFFECTED = "mode_ringer_streams_affected";
field public static final java.lang.String MUTE_STREAMS_AFFECTED = "mute_streams_affected";
field public static final java.lang.String NAVIGATION_BAR_WIDGETS = "navigation_bar_widgets";
field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
field public static final java.lang.String NEXT_ALARM_FORMATTED = "next_alarm_formatted";
field public static final java.lang.String NOTIFICATION_SOUND = "notification_sound";
Expand Down Expand Up @@ -22049,11 +22051,10 @@ package android.view {
method public deprecated int getWidth();
field public static final int DEFAULT_DISPLAY = 0; // 0x0
}

public class DisplayManager {
ctor public DisplayManager();
method public int closeDisplay(int);
method public int getDisplayBacklightMode();
method public int getDisplayCount();
method public int getDisplayHeight(int);
method public int getDisplayHotPlugStatus(int);
Expand All @@ -22067,7 +22068,6 @@ package android.view {
method public int getMaxHdmiMode();
method public int getMaxWidthDisplay();
method public int openDisplay(int);
method public int setDisplayBacklightMode(int);
method public int setDisplayMaster(int);
method public int setDisplayMode(int);
method public int setDisplayOutputType(int, int, int);
Expand Down Expand Up @@ -22461,7 +22461,6 @@ package android.view {
field public static final int KEYCODE_B = 30; // 0x1e
field public static final int KEYCODE_BACK = 4; // 0x4
field public static final int KEYCODE_BACKSLASH = 73; // 0x49
field public static final int KEYCODE_BLUETOOTH = 221; // 0xdd
field public static final int KEYCODE_BOOKMARK = 174; // 0xae
field public static final int KEYCODE_BREAK = 121; // 0x79
field public static final int KEYCODE_BRIGHTNESS_AUTO = 216; // 0xd8
Expand Down Expand Up @@ -22505,7 +22504,6 @@ package android.view {
field public static final int KEYCODE_CAMERA = 27; // 0x1b
field public static final int KEYCODE_CAPS_LOCK = 115; // 0x73
field public static final int KEYCODE_CAPTIONS = 175; // 0xaf
field public static final int KEYCODE_CAPTURE = 226; // 0xe2
field public static final int KEYCODE_CHANNEL_DOWN = 167; // 0xa7
field public static final int KEYCODE_CHANNEL_UP = 166; // 0xa6
field public static final int KEYCODE_CLEAR = 28; // 0x1c
Expand All @@ -22522,14 +22520,11 @@ package android.view {
field public static final int KEYCODE_DPAD_UP = 19; // 0x13
field public static final int KEYCODE_DVR = 173; // 0xad
field public static final int KEYCODE_E = 33; // 0x21
field public static final int KEYCODE_EISU = 212; // 0xd4
field public static final int KEYCODE_ENDCALL = 6; // 0x6
field public static final int KEYCODE_ENTER = 66; // 0x42
field public static final int KEYCODE_ENVELOPE = 65; // 0x41
field public static final int KEYCODE_EQUALS = 70; // 0x46
field public static final int KEYCODE_ESCAPE = 111; // 0x6f
field public static final int KEYCODE_EUROPE_1 = 217; // 0xd9
field public static final int KEYCODE_EUROPE_2 = 218; // 0xda
field public static final int KEYCODE_EXPLORER = 64; // 0x40
field public static final int KEYCODE_F = 34; // 0x22
field public static final int KEYCODE_F1 = 131; // 0x83
Expand All @@ -22552,10 +22547,7 @@ package android.view {
field public static final int KEYCODE_GRAVE = 68; // 0x44
field public static final int KEYCODE_GUIDE = 172; // 0xac
field public static final int KEYCODE_H = 36; // 0x24
field public static final int KEYCODE_HANKAKU_ZENKAKU = 211; // 0xd3
field public static final int KEYCODE_HEADSETHOOK = 79; // 0x4f
field public static final int KEYCODE_HENKAN = 214; // 0xd6
field public static final int KEYCODE_HIRAGANA_KATAKANA = 215; // 0xd7
field public static final int KEYCODE_HOME = 3; // 0x3
field public static final int KEYCODE_I = 37; // 0x25
field public static final int KEYCODE_INFO = 165; // 0xa5
Expand Down Expand Up @@ -22584,7 +22576,6 @@ package android.view {
field public static final int KEYCODE_MINUS = 69; // 0x45
field public static final int KEYCODE_MOVE_END = 123; // 0x7b
field public static final int KEYCODE_MOVE_HOME = 122; // 0x7a
field public static final int KEYCODE_MUHENKAN = 213; // 0xd5
field public static final int KEYCODE_MUSIC = 209; // 0xd1
field public static final int KEYCODE_MUTE = 91; // 0x5b
field public static final int KEYCODE_N = 42; // 0x2a
Expand Down Expand Up @@ -22636,7 +22627,6 @@ package android.view {
field public static final int KEYCODE_SHIFT_LEFT = 59; // 0x3b
field public static final int KEYCODE_SHIFT_RIGHT = 60; // 0x3c
field public static final int KEYCODE_SLASH = 76; // 0x4c
field public static final int KEYCODE_SLEEP = 219; // 0xdb
field public static final int KEYCODE_SOFT_LEFT = 1; // 0x1
field public static final int KEYCODE_SOFT_RIGHT = 2; // 0x2
field public static final int KEYCODE_SPACE = 62; // 0x3e
Expand All @@ -22649,7 +22639,7 @@ package android.view {
field public static final int KEYCODE_T = 48; // 0x30
field public static final int KEYCODE_TAB = 61; // 0x3d
field public static final int KEYCODE_TOGGLE_BT = 212; // 0xd4
field public static final int KEYCODE_TOUCHPAD = 213; // 0xd5
field public static final int KEYCODE_TOGGLE_TOUCHPAD = 213; // 0xd5
field public static final int KEYCODE_TOGGLE_WIFI = 211; // 0xd3
field public static final int KEYCODE_TV = 170; // 0xaa
field public static final int KEYCODE_TV_INPUT = 178; // 0xb2
Expand All @@ -22662,10 +22652,8 @@ package android.view {
field public static final int KEYCODE_VOLUME_UP = 24; // 0x18
field public static final int KEYCODE_W = 51; // 0x33
field public static final int KEYCODE_WINDOW = 171; // 0xab
field public static final int KEYCODE_WIRELESS = 220; // 0xdc
field public static final int KEYCODE_X = 52; // 0x34
field public static final int KEYCODE_Y = 53; // 0x35
field public static final int KEYCODE_YEN = 216; // 0xd8
field public static final int KEYCODE_Z = 54; // 0x36
field public static final int KEYCODE_ZOOM_IN = 168; // 0xa8
field public static final int KEYCODE_ZOOM_OUT = 169; // 0xa9
Expand Down Expand Up @@ -22920,6 +22908,7 @@ package android.view {
method public static android.view.MotionEvent obtainNoHistory(android.view.MotionEvent);
method public final void offsetLocation(float, float);
method public final void recycle();
method public final void scale(float, float);
method public final void setAction(int);
method public final void setEdgeFlags(int);
method public final void setLocation(float, float);
Expand Down
26 changes: 0 additions & 26 deletions core/java/android/view/DisplayManager.java
View file
Expand Up @@ -246,7 +246,6 @@ public int setDisplayMode(int mode)
try
{
Log.d(TAG,"setDisplayMode");
setDisplayBacklightMode(1);
return mService.setDisplayMode(mode);
}
catch (RemoteException ex)
Expand Down Expand Up @@ -311,19 +310,6 @@ public int closeDisplay(int mDisplay)
return -1;
}
}

public int setDisplayBacklightMode(int mode)
{
try
{
Log.d(TAG,"11111111111111111111111111111111111111111111111111111111111111111111111111111111111");
return mService.setDisplayBacklightMode(mode);
}
catch (RemoteException ex)
{
return -1;
}
}

public int setDisplayMaster(int mDisplay)
{
Expand Down Expand Up @@ -382,17 +368,5 @@ public int getMaxHdmiMode()
return -1;
}
}
public int getDisplayBacklightMode()
{
try
{
// get display backlight mode
return mService.getDisplayBacklightMode();
}
catch (RemoteException ex)
{
return -1;
}
}
}

2 changes: 0 additions & 2 deletions core/java/android/view/IDisplayManager.aidl
View file
Expand Up @@ -49,6 +49,4 @@ interface IDisplayManager
int getDisplayMaster();
int getMaxWidthDisplay();
int getMaxHdmiMode();
int setDisplayBacklightMode(int mode);
int getDisplayBacklightMode();
}
8 changes: 8 additions & 0 deletions include/camera/Camera.h
View file
Expand Up @@ -25,6 +25,14 @@
#include <camera/ICameraRecordingProxyListener.h>

namespace android {

#define MASTER_SCREEN 0
#define SLAVE_SCREEN 1

#define PROP_CAMERA_KEY "media.camera.screen"
#define PROP_MASTER_SCREEN "master"
#define PROP_SLAVE_SCREEN "slave"
#define PROP_SCREEN_DEFAULT_VALUE PROP_MASTER_SCREEN

struct CameraInfo {
/**
Expand Down
2 changes: 0 additions & 2 deletions include/ui/DisplayDispatcher.h
View file
Expand Up @@ -50,7 +50,6 @@
#define DISPLAY_CMD_GETDISPLAYMODE 11
#define DISPLAY_CMD_GETDISPCOUNT 12
#define DISPLAY_CMD_SETDISPMODE 13
#define DISPLAY_CMD_SETBACKLIGHTMODE 14
namespace android
{
/* 同显时的帧管理线程 */
Expand Down Expand Up @@ -101,7 +100,6 @@ namespace android
int getDisplayCount();
int getMaxWidthDisplay();
int getMaxHdmiMode();
int setDisplayBacklightMode(int mode);

bool mDisplayOpen0;
bool mDisplayOpen1;
Expand Down
13 changes: 1 addition & 12 deletions libs/ui/DisplayDispatcher.cpp
View file
Expand Up @@ -418,15 +418,7 @@ namespace android

return -1;
}
int DisplayDispatcher::setDisplayBacklightMode(int mode)
{
if(mDevice)
{
return mDevice->setdisplaybacklightmode(mDevice,mode);
}

return -1;
}

int DisplayDispatcher::setDispProp(int cmd,int param0,int param1,int param2)
{
switch(cmd)
Expand Down Expand Up @@ -472,9 +464,6 @@ namespace android

case DISPLAY_CMD_SETDISPMODE:
return setDisplayMode(param0);

case DISPLAY_CMD_SETBACKLIGHTMODE:
return setDisplayBacklightMode(param0);

default:
LOGE("Display Cmd not Support!\n");
Expand Down
2 changes: 1 addition & 1 deletion media/java/android/media/MediaFile.java
View file
Expand Up @@ -281,7 +281,7 @@ public static boolean isAudioFileType(int fileType) {
return ((fileType >= FIRST_AUDIO_FILE_TYPE &&
fileType <= LAST_AUDIO_FILE_TYPE) ||
(fileType >= FIRST_MIDI_FILE_TYPE &&
fileType <= LAST_MIDI_FILE_TYPE ||
fileType <= LAST_MIDI_FILE_TYPE) ||
fileType == FILE_TYPE_CEDARA);
}

Expand Down
17 changes: 2 additions & 15 deletions services/java/com/android/server/DisplayManagerService.java
View file
Expand Up @@ -162,7 +162,6 @@ public class DisplayManagerService extends IDisplayManager.Stub
private int mDisplayFormat1;
private static DisplayThread sThread;
private static boolean sThreadStarted = false;
private int mBacklightMode;

private native void nativeInit();
private native int nativeGetDisplayCount();
Expand All @@ -185,7 +184,6 @@ public class DisplayManagerService extends IDisplayManager.Stub
private native int nativeGetMaxWidthDisplay();
private native int nativeGetMaxHdmiMode();
private native int nativeSetDisplayParameter(int mDisplay,int para0,int para1);
private native int nativeSetDisplayBacklihgtMode(int mode);

private final void sendHdmiIntent()
{
Expand Down Expand Up @@ -369,8 +367,8 @@ public DisplayManagerService(Context context,PowerManagerService pm)
}
}
mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService(Context.WINDOW_SERVICE));
boolean enable = Settings.System.getInt(mContext.getContentResolver(),Settings.System.SMART_BRIGHTNESS_ENABLE,0) != 0 ? true : false;
setDisplayBacklightMode(enable?1:0);
//boolean enable = Settings.System.getInt(mContext.getContentResolver(),Settings.System.SMART_BRIGHTNESS_ENABLE,0) != 0 ? true : false;
//setDisplayBacklightMode(enable?1:0);
Log.d(TAG,"getWindowManager Starting.......!");
}

Expand Down Expand Up @@ -493,17 +491,6 @@ public int getDisplayHotPlugStatus(int mDisplay)
{
return nativeGetDisplayHotPlug(mDisplay);
}

public int setDisplayBacklightMode(int mode)
{
mBacklightMode = mode;
return nativeSetDisplayBacklihgtMode(mode);
}

public int getDisplayBacklightMode()
{
return mBacklightMode;
}

public int openDisplay(int mDisplay)
{
Expand Down
9 changes: 0 additions & 9 deletions services/jni/com_android_server_DisplayManagerService.cpp
View file
Expand Up @@ -692,14 +692,6 @@ namespace android
return (jint)gNativeDisplayManager->getDisplayParameter(displayno,DISPLAY_OUTPUT_HOTPLUG);
}

static jint SetDisplayBacklihgtMode_native(JNIEnv *env, jobject clazz,int mode)
{

return SurfaceComposerClient::setDisplayProp(DISPLAY_CMD_SETBACKLIGHTMODE,mode,0,0);


}


static JNINativeMethod method_table[] = {
{ "nativeInit", "()V", (void*)init_native },
Expand All @@ -723,7 +715,6 @@ static JNINativeMethod method_table[] = {
{ "nativeGetDisplayPixelFormat", "(I)I", (void*)getDisplayOutputPixelFormat_native },
{ "nativeGetDisplayOpen", "(I)I", (void*)getDisplayOutputOpen_native },
{ "nativeGetDisplayHotPlug", "(I)I", (void*)getDisplayOutputHotPlug_native },
{ "nativeSetDisplayBacklihgtMode", "(I)I", (void*)SetDisplayBacklihgtMode_native },

};

Expand Down

0 comments on commit 2fa4bb8

Please sign in to comment.