Skip to content

Commit ff04fa7

Browse files
koushkoush
committed
Updates for new Widgets
1 parent 4483aaa commit ff04fa7

File tree

8 files changed

+48
-35
lines changed

8 files changed

+48
-35
lines changed

‎Superuser/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
43
package="com.koushikdutta.superuser"
54
android:versionCode="1030"
65
android:versionName="1.0.3.0" >
76

8-
<uses-sdk
9-
tools:node="replace" />
10-
117
<permission
128
android:name="android.permission.REQUEST_SUPERUSER"
139
android:protectionLevel="signature" />

‎Superuser/Superuser-Superuser.iml‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.Superuser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -10,9 +10,10 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
1819
</configuration>
@@ -27,37 +28,58 @@
2728
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
2829
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
2930
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3032
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3133
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3234
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3538
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3639
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
3741
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
3942
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4043
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4144
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4245
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
4448
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
4649
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
4750
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
4851
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5054
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5457
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
55-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
58+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
59+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
60+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
61+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
62+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
5677
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
5779
</content>
5880
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
5981
<orderEntry type="sourceFolder" forTests="false" />
60-
<orderEntry type="library" exported="" name="support-annotations-21.0.0-rc1" level="project" />
82+
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
6183
<orderEntry type="module" module-name="Widgets-Widgets" exported="" />
6284
</component>
6385
</module>

‎Superuser/jni/su/daemon.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,9 @@ int run_daemon() {
444444
int previous_umask = umask(027);
445445
mkdir(REQUESTOR_DAEMON_PATH, 0777);
446446

447+
memset(sun.sun_path, 0, sizeof(sun.sun_path));
448+
memcpy(sun.sun_path, "\0" "SUPERUSER", strlen("SUPERUSER") + 1);
449+
447450
if (bind(fd, (struct sockaddr*)&sun, sizeof(sun)) < 0) {
448451
PLOGE("daemon bind");
449452
goto err;
@@ -551,6 +554,9 @@ int connect_daemon(int argc, char *argv[], int ppid) {
551554
sun.sun_family = AF_LOCAL;
552555
sprintf(sun.sun_path, "%s/server", REQUESTOR_DAEMON_PATH);
553556

557+
memset(sun.sun_path, 0, sizeof(sun.sun_path));
558+
memcpy(sun.sun_path, "\0" "SUPERUSER", strlen("SUPERUSER") + 1);
559+
554560
if (0 != connect(socketfd, (struct sockaddr*)&sun, sizeof(sun))) {
555561
PLOGE("connect");
556562
exit(-1);

‎Superuser/jni/su/su.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,13 @@ static int from_init(struct su_initiator *from) {
179179
/* If this isn't app_process, use the real path instead of argv[0] */
180180
snprintf(path, sizeof(path), "/proc/%u/exe", from->pid);
181181
len = readlink(path, exe, sizeof(exe));
182-
if (len >= 0) {
183-
exe[len] = '\0';
184-
if (strcmp(exe, "/system/bin/app_process")) {
185-
argv0 = exe;
186-
}
182+
if (len < 0) {
183+
PLOGE("Getting exe path");
184+
return -1;
185+
}
186+
exe[len] = '\0';
187+
if (strcmp(exe, "/system/bin/app_process")) {
188+
argv0 = exe;
187189
}
188190

189191
strncpy(from->bin, argv0, sizeof(from->bin));

‎Superuser/res/layout/log_item.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
android:layout_width="fill_parent"
44
android:layout_height="wrap_content"
55
android:orientation="horizontal"
6-
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
7-
android:paddingRight="?attr/listPreferredItemPaddingRight"
6+
android:paddingLeft="?attr/listPreferredItemPaddingLeft_"
7+
android:paddingRight="?attr/listPreferredItemPaddingRight_"
88
android:paddingBottom="@dimen/log_item_padding"
99
android:paddingTop="@dimen/log_item_padding" >
1010

‎Superuser/res/values-v14/dimens.xml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Superuser/res/values-v16/styles.xml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Superuser/res/values/styles.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
</style>
3636

3737
<style name="SuperuserLight" parent="@style/AppTheme">
38+
<item name="colorPrimary">#4CAF50</item>
39+
<item name="colorPrimaryDark">#4CAF50</item>
40+
<item name="colorAccent">#F44336</item>
41+
3842
<item name="bottomButtonBar">@color/background_dark</item>
3943
<item name="bottomButtonBarText">?android:attr/textColorPrimaryInverse</item>
4044

0 commit comments

Comments
 (0)