Hi all,
This patches are the changes that I made for android frameworks. The
kernel git web can be found
on http://panicking.kicks-ass.org/repository.html android-testing branch
You can repo sync to koolu and patches with these
Good work. I send these patches to increase the people works for free in
android-freerunner project.
I will create a public repository for all the framework like the git-web
for the kernel
Michael
This patch change the path for the new kernel
Signed-off-by: Michael Trimarchi <[email protected]>
---
diff --git a/power/power.c b/power/power.c
index 8b50737..359de84 100644
--- a/power/power.c
+++ b/power/power.c
@@ -27,13 +27,13 @@ enum {
};
const char * const PATHS[] = {
- "/sys/android_power/acquire_partial_wake_lock",
- "/sys/android_power/acquire_full_wake_lock",
- "/sys/android_power/release_wake_lock",
- "/sys/android_power/request_state"
+ "/sys/power/wake_lock",
+ "/sys/power/wake_full_lock",
+ "/sys/power/wake_unlock",
+ "/sys/power/state"
};
-const char * const AUTO_OFF_TIMEOUT_DEV = "/sys/android_power/auto_off_timeout";
+const char * const AUTO_OFF_TIMEOUT_DEV = "/sys/power/auto_off_timeout";
const char * const LCD_BACKLIGHT = "/sys/class/leds/lcd-backlight";
const char * const BUTTON_BACKLIGHT = "/sys/class/leds/button-backlight";
@@ -233,9 +233,9 @@ set_screen_state(int on)
char buf[32];
int len;
if(on)
- len = sprintf(buf, "wake");
+ len = sprintf(buf, "on");
else
- len = sprintf(buf, "standby");
+ len = sprintf(buf, "mem");
len = write(g_fds[REQUEST_STATE], buf, len);
if(len < 0) {
LOGE("Failed setting last user activity: g_error=%d\n", g_error);
Change the paths for the ril library for the new kernel
Signed-off-by: Michael Trimarchi <[email protected]>
----
diff --git a/libril/ril.cpp b/libril/ril.cpp
index f9c03b3..ed70b73 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -57,9 +57,9 @@ namespace android {
#define ANDROID_WAKE_LOCK_NAME "radio-interface"
-#define ANDROID_PARTIAL_WAKE_LOCK_PATH "/sys/android_power/acquire_partial_wake_lock"
-#define ANDROID_FULL_WAKE_LOCK_PATH "/sys/android_power/acquire_full_wake_lock"
-#define ANDROID_WAKE_UNLOCK_PATH "/sys/android_power/release_wake_lock"
+#define ANDROID_PARTIAL_WAKE_LOCK_PATH "/sys/power/wake_lock"
+#define ANDROID_FULL_WAKE_LOCK_PATH "/sys/power/wake_full_lock"
+#define ANDROID_WAKE_UNLOCK_PATH "/sys/power/wake_unlock"
#define PROPERTY_RIL_IMPL "gsm.version.ril-impl"
Change the paths for the new kernel and increase the MAX_PROCESS.
Signed-off-by: Michael Trimarchi <[email protected]>
---
diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
index 90f6287..fac3a83 100644
--- a/libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
+++ b/libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
@@ -49,8 +49,8 @@
// ----------------------------------------------------------------------------
namespace android {
-static char const * const kSleepFileName = "/sys/android_power/wait_for_fb_sleep";
-static char const * const kWakeFileName = "/sys/android_power/wait_for_fb_wake";
+static char const * const kSleepFileName = "/sys/power/wait_for_fb_sleep";
+static char const * const kWakeFileName = "/sys/power/wait_for_fb_wake";
// This dir exists if the framebuffer console is present, either built into
// the kernel or loaded as a module.
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 41c3a2a..f704e94 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -161,7 +161,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// This is the maximum number of application processes we would like
// to have running. Due to the asynchronous nature of things, we can
// temporarily go beyond this limit.
- static final int MAX_PROCESSES = 2;
+ static final int MAX_PROCESSES = 10;
// Set to false to leave processes running indefinitely, relying on
// the kernel killing them as resources are required.
Add call buttons to the android Phone application.
Signed-off-by: Marco Trevisan <[email protected]>
Signed-off-by: Trimarchi Michael <[email protected]>
---
diff --git a/res/layout/call_card.xml b/res/layout/call_card.xml
index ded981d..70b46e1 100644
--- a/res/layout/call_card.xml
+++ b/res/layout/call_card.xml
@@ -81,6 +81,39 @@
android:layout_height="1dip"
android:layout_weight="10" />
+ <LinearLayout
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="6dip"
+ >
+ <ImageButton android:id="@+id/callAcceptButton"
+ android:src="@drawable/picture_dialing"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ <ImageButton android:id="@+id/callRejectButton"
+ android:src="@drawable/picture_end"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+ </LinearLayout>
+
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1dip"
+ android:layout_weight="10" />
+
+
<!-- "Lower title" and elapsed time counter, used only in the
"call in progress" state. -->
<LinearLayout android:id="@+id/lowerTitleViewGroup"
diff --git a/src/com/android/phone/CallCard.java b/src/com/android/phone/CallCard.java
index 2f79762..c90dc78 100644
--- a/src/com/android/phone/CallCard.java
+++ b/src/com/android/phone/CallCard.java
@@ -39,6 +39,8 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
+import android.widget.Button;
+import android.widget.ImageButton;
/**
* "Call card" UI element: the in-call screen contains a tiled layout of call
@@ -46,8 +48,8 @@ import android.widget.TextView;
* a call on hold, or an incoming call.)
*/
public class CallCard extends FrameLayout
- implements CallTime.OnTickListener, CallerInfoAsyncQuery.OnQueryCompleteListener,
- ContactsAsyncHelper.OnImageLoadCompleteListener{
+ implements Button.OnClickListener, CallTime.OnTickListener, CallerInfoAsyncQuery.OnQueryCompleteListener,
+ ContactsAsyncHelper.OnImageLoadCompleteListener {
private static final String LOG_TAG = "PHONE/CallCard";
private static final boolean DBG = false;
private static final boolean PROFILE = true;
@@ -74,6 +76,10 @@ public class CallCard extends FrameLayout
private TextView mPhoneNumber;
private TextView mLabel;
+ // Accept and Reject buttons:
+ private ImageButton mCallAcceptButton;
+ private ImageButton mCallRejectButton;
+
// "Other call" info area
private TextView mOtherCallOngoingName;
private TextView mOtherCallOngoingStatus;
@@ -88,7 +94,6 @@ public class CallCard extends FrameLayout
private CallTime mCallTime;
private SlidingCardManager mSlidingCardManager; // May be null if the
// SlidingCardManager is disabled
-
// Track the state for the photo.
private ContactsAsyncHelper.ImageTracker mPhotoTracker;
@@ -177,6 +182,17 @@ public class CallCard extends FrameLayout
mPhoneNumber = (TextView) findViewById(R.id.phoneNumber);
mLabel = (TextView) findViewById(R.id.label);
+ // Accept and Reject buttons
+ mCallAcceptButton = (ImageButton) findViewById(R.id.callAcceptButton);
+ mCallAcceptButton.setEnabled(true);
+ mCallAcceptButton.setClickable(true);
+
+ mCallRejectButton = (ImageButton) findViewById(R.id.callRejectButton);
+ mCallRejectButton.setEnabled(true);
+ mCallRejectButton.setClickable(true);
+ mCallAcceptButton.setOnClickListener(this);
+ mCallRejectButton.setOnClickListener(this);
+
// "Other call" info area
mOtherCallOngoingName = (TextView) findViewById(R.id.otherCallOngoingName);
mOtherCallOngoingStatus = (TextView) findViewById(R.id.otherCallOngoingStatus);
@@ -187,6 +203,21 @@ public class CallCard extends FrameLayout
mMenuButtonHint = (TextView) findViewById(R.id.menuButtonHint);
}
+ public void onClick(View button) {
+ if (!button.isEnabled())
+ return;
+ Phone phone = PhoneApp.getInstance().phone;
+ switch (button.getId()) {
+ case R.id.callAcceptButton:
+ PhoneUtils.answerCall(phone);
+ break;
+ case R.id.callRejectButton:
+ PhoneUtils.hangup(phone);
+ break;
+ }
+ }
+
+
void updateState(Phone phone) {
if (DBG) log("updateState(" + phone + ")...");
@@ -498,6 +529,12 @@ public class CallCard extends FrameLayout
mLowerTitleViewGroup.setVisibility(View.INVISIBLE);
}
+ if (state == Call.State.INCOMING) {
+ mCallAcceptButton.setVisibility(View.VISIBLE);
+ } else {
+ mCallAcceptButton.setVisibility(View.GONE);
+ }
+
// Draw the onscreen "elapsed time" indication EXCEPT if we're in
// the "Call ended" state. (In that case, don't touch the
// mElapsedTime widget, so we continue to see the elapsed time of
@@ -1058,7 +1095,12 @@ public class CallCard extends FrameLayout
*/
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
- // if (DBG) log("CALLCARD: dispatchTouchEvent(): ev = " + ev);
+ if (DBG) log("CALLCARD: dispatchTouchEvent(): ev = " + ev);
+
+ if (mCallRejectButton.onTouchEvent(ev) == true ||
+ mCallAcceptButton.onTouchEvent(ev) == true)
+ return super.dispatchTouchEvent(ev);
+
if (mSlidingCardManager != null) mSlidingCardManager.handleCallCardTouchEvent(ev);
// We *never* let touch events get thru to the UI inside the
Change the alsa configuration file for the new kernel. Update the
paths for the new kernel and fix the gps power on part.
Signed-off-by: Michael Trimarchi <[email protected]>
---
diff --git a/etc/asound.conf b/etc/asound.conf
index 0beec0e..f28f45d 100644
--- a/etc/asound.conf
+++ b/etc/asound.conf
@@ -100,25 +100,11 @@ pcm.AndroidPlayback {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value false }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value true }
- { name 'Right Mixer Bypass Playback Swi' value false }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value true }
- { name 'Left Mixer Bypass Playback Swit' value false }
{ name 'DAPM Stereo Out Switch' value true }
{ name 'DAPM GSM Line Out Switch' value false }
{ name 'DAPM GSM Line In Switch' value false }
@@ -208,25 +194,11 @@ pcm.AndroidPlayback_Speaker_normal {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value false }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value true }
- { name 'Right Mixer Bypass Playback Swi' value false }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value true }
- { name 'Left Mixer Bypass Playback Swit' value false }
{ name 'DAPM Stereo Out Switch' value true }
{ name 'DAPM GSM Line Out Switch' value false }
{ name 'DAPM GSM Line In Switch' value false }
@@ -316,25 +288,11 @@ pcm.AndroidPlayback_Speaker {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value false }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value true }
- { name 'Right Mixer Bypass Playback Swi' value false }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value true }
- { name 'Left Mixer Bypass Playback Swit' value false }
{ name 'DAPM Stereo Out Switch' value true }
{ name 'DAPM GSM Line Out Switch' value false }
{ name 'DAPM GSM Line In Switch' value false }
@@ -427,25 +385,11 @@ pcm.AndroidPlayback_Headset {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value false }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value true }
- { name 'Right Mixer Bypass Playback Swi' value false }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value true }
- { name 'Left Mixer Bypass Playback Swit' value false }
{ name 'DAPM Stereo Out Switch' value true }
{ name 'DAPM GSM Line Out Switch' value false }
{ name 'DAPM GSM Line In Switch' value false }
@@ -537,25 +481,11 @@ pcm.AndroidPlayback_Speaker_incall {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value true }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value false }
- { name 'Right Mixer Bypass Playback Swi' value true }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value false }
- { name 'Left Mixer Bypass Playback Swit' value true }
{ name 'DAPM Stereo Out Switch' value false }
{ name 'DAPM GSM Line Out Switch' value true }
{ name 'DAPM GSM Line In Switch' value true }
@@ -647,25 +577,11 @@ pcm.AndroidPlayback_Headset_incall {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value true }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value false }
- { name 'Right Mixer Bypass Playback Swi' value true }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value false }
- { name 'Left Mixer Bypass Playback Swit' value true }
{ name 'DAPM Stereo Out Switch' value true }
{ name 'DAPM GSM Line Out Switch' value true }
{ name 'DAPM GSM Line In Switch' value true }
@@ -693,7 +609,7 @@ pcm.AndroidPlayback_Earpiece_incall {
{ name 'PCM Volume' value [ 0 0 ] }
{ name 'ADC Capture Volume' value [ 0 0 ] }
{ name 'Headphone Playback Volume' value [ 0 0 ] }
- { name 'Speaker Playback Volume' value [ 97 97 ] }
+ { name 'Speaker Playback Volume' value [ 115 115 ] }
{ name 'Mono Playback Volume' value 103 }
{ name 'Bypass Playback Volume' value [ 7 7 ] }
{ name 'Sidetone Playback Volume' value [ 0 0 ] }
@@ -757,25 +673,11 @@ pcm.AndroidPlayback_Earpiece_incall {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value Stereo }
{ name 'Capture Left Mixer' value Stereo }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value true }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value false }
- { name 'Right Mixer Bypass Playback Swi' value true }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value false }
- { name 'Left Mixer Bypass Playback Swit' value true }
{ name 'DAPM Stereo Out Switch' value false }
{ name 'DAPM GSM Line Out Switch' value true }
{ name 'DAPM GSM Line In Switch' value true }
@@ -875,25 +777,11 @@ pcm.AndroidRecord_Microphone {
{ name 'Capture Left Mux' value PGA }
{ name 'Capture Right Mixer' value 'Analogue Mix Left' }
{ name 'Capture Left Mixer' value 'Analogue Mix Left' }
- { name 'Playback Mixer Voice Capture Sw' value false }
- { name 'Playback Mixer Left Capture Swi' value false }
- { name 'Playback Mixer Right Capture Sw' value false }
{ name 'Out4 Mux' value VREF }
{ name 'Out3 Mux' value VREF }
{ name 'Mono 2 Mux' value 'Inverted Mono 1' }
{ name 'Mono Mixer Left Playback Switch' value false }
- { name 'Mono Mixer Right Playback Switc' value false }
- { name 'Mono Mixer Voice Playback Switc' value false }
- { name 'Mono Mixer Sidetone Playback Sw' value false }
- { name 'Mono Mixer Bypass Playback Swit' value false }
- { name 'Right Mixer Voice Playback Swit' value false }
- { name 'Right Mixer Sidetone Playback S' value false }
- { name 'Right Mixer Right Playback Swit' value false }
- { name 'Right Mixer Bypass Playback Swi' value false }
- { name 'Left Mixer Voice Playback Switc' value false }
- { name 'Left Mixer Sidetone Playback Sw' value false }
{ name 'Left Mixer Left Playback Switch' value false }
- { name 'Left Mixer Bypass Playback Swit' value false }
{ name 'DAPM Stereo Out Switch' value false }
{ name 'DAPM GSM Line Out Switch' value true }
{ name 'DAPM GSM Line In Switch' value true }
diff --git a/init.rc b/init.rc
index 15ec7a9..3a5eefd 100644
--- a/init.rc
+++ b/init.rc
@@ -43,7 +43,7 @@ loglevel 3
chmod 0771 /data
# Same reason as /data above
- mount yaffs2 m...@cache /cache nosuid nodev
+ # mount yaffs2 m...@cache /cache nosuid nodev
chown system cache /cache
chmod 0770 /cache
@@ -53,6 +53,7 @@ loglevel 3
# create basic filesystem structure
mkdir /data/misc 01771 system misc
+ mkdir /data/misc/wifi 0770 wifi wifi
mkdir /data/misc/hcid 0770 bluetooth bluetooth
mkdir /data/local 0771 shell shell
mkdir /data/local/tmp 0771 shell shell
@@ -60,9 +61,10 @@ loglevel 3
mkdir /data/app-private 0771 system system
mkdir /data/app 0771 system system
mkdir /data/property 0700 root root
+ mkdir /data/ppp 0771 radio system
- mkdir /data/misc/wifi 0770 wifi wifi
mkdir /data/system/wpa_supplicant 0770 wifi wifi
+ mkdir /data/misc/wifi/sockets 0770 wifi wifi
mkdir /data/misc/dhcp 0770 dhcp dhcp
chown dhcp dhcp /data/misc/dhcp
@@ -82,10 +84,11 @@ loglevel 3
chmod 0770 /cache/lost+found
# Turn on GSM
- write /sys/bus/platform/devices/neo1973-pm-gsm.0/power_on 1
+ write /sys/class/i2c-adapter/i2c-0/0-0073/neo1973-pm-gsm.0/power_on 1
- # Turn off GPS
- write /sys/bus/platform/devices/neo1973-pm-gps.0/pwron 0
+ # Turn on GPS
+ write /sys/bus/platform/devices/neo1973-pm-gps.0/power_on 0
+ write /sys/bus/platform/devices/neo1973-pm-gps.0/power_on 1
# Use LEDs with a timer trigger
write /sys/class/leds/gta02-aux:red/trigger timer
@@ -96,8 +99,8 @@ loglevel 3
write /sys/bus/platform/devices/neo1973-pm-gsm.0/power_on 1
# Set scaling of accelerometers
- write /sys/devices/platform/spi_s3c24xx_gpio.1/spi0.0/full_scale 2.3
- write /sys/devices/platform/spi_s3c24xx_gpio.1/spi0.1/full_scale 2.3
+ write /sys/class/i2c-adapter/i2c-0/0-0073/lis302dl.1/full_scale 2.3
+ write /sys/class/i2c-adapter/i2c-0/0-0073/lis302dl.2/full_scale 2.3
on boot
# basic network init
@@ -142,11 +145,14 @@ on boot
#setprop net.dns1 192.168.0.200
# Permissions for System Server and daemons.
- chown radio system /sys/android_power/state
- chown radio system /sys/android_power/request_state
- chown radio system /sys/android_power/acquire_full_wake_lock
- chown radio system /sys/android_power/acquire_partial_wake_lock
- chown radio system /sys/android_power/release_wake_lock
+ chown radio system /sys/power/state
+ chown radio system /sys/power/wake_full_lock
+ chown radio system /sys/power/wake_lock
+ chown radio system /sys/power/wake_unlock
+ chmod 660 /sys/power/state
+ chmod 660 /sys/power/wake_full_lock
+ chmod 660 /sys/power/wake_lock
+ chmod 660 /sys/power/wake_unlock
chown system system /sys/class/backlight/gta02-bl/brightness
chown system system /sys/class/leds/gta02-aux:red/brightness
chown system system /sys/class/leds/gta02-aux:red/delay_on
@@ -171,10 +177,11 @@ on boot
# Open up access to GPS interface
chmod 666 /dev/s3c2410_serial1
- chmod 666 /sys/bus/platform/devices/neo1973-pm-gps.0/pwron
+ chmod 666 /sys/bus/platform/devices/neo1973-pm-gps.0/power_on
# Open up access to bluetooth interface
- chmod 666 /sys/bus/platform/devices/neo1973-pm-bt.0/power_on
+ chmod 666 /sys/class/rfkill/rfkill1/state
+ # Open up access to wireless rfkill
chmod 666 /sys/class/rfkill/rfkill0/state
# Define TCP buffer sizes for various networks
@@ -233,7 +240,9 @@ service ril-daemon /system/bin/rild
service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server
socket zygote stream 666
- onrestart write /sys/android_power/request_state wake
+ user root
+ group system
+ onrestart write /sys/power/state on
service media /system/bin/mediaserver
user media
diff --git a/system.prop b/system.prop
index 2e858fa..852bbbd 100644
--- a/system.prop
+++ b/system.prop
@@ -12,6 +12,7 @@ bluetooth.power_on=/sys/bus/platform/devices/neo1973-pm-bt.0/power_on
# GPS Interface
ro.kernel.android.gps=s3c2410_serial1
+gps.power_on=/sys/bus/platform/devices/neo1973-pm-gps.0/power_on
# GPRS Interface
ro.radio.use-ppp=yes