aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuutaW <17158086+Trumeet@users.noreply.github.com>2019-03-24 14:34:48 -0700
committerYuutaW <17158086+Trumeet@users.noreply.github.com>2019-03-24 14:35:11 -0700
commitcaa98a88541ccd6ddc79f36b92e12fe313111a75 (patch)
treeba729d4a03cf54d28dd3860b8b571fbd1ecd3400
parentb84d3eebd4d42188f2f5c67356a53e19093418ff (diff)
downloadSysUIController-caa98a88541ccd6ddc79f36b92e12fe313111a75.tar
SysUIController-caa98a88541ccd6ddc79f36b92e12fe313111a75.tar.gz
SysUIController-caa98a88541ccd6ddc79f36b92e12fe313111a75.tar.bz2
SysUIController-caa98a88541ccd6ddc79f36b92e12fe313111a75.zip
chore: update dependencies & remove hidden api module
Signed-off-by: YuutaW <17158086+Trumeet@users.noreply.github.com>
-rw-r--r--app/build.gradle22
-rw-r--r--app/src/main/java/moe/yuuta/sysuicontroller/auto_start/AutoStartWorker.java9
-rw-r--r--app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java2
-rw-r--r--build.gradle4
-rw-r--r--hiddenapi/.gitignore1
-rw-r--r--hiddenapi/build.gradle8
-rw-r--r--hiddenapi/src/main/java/android/app/StatusBarManager.java147
-rw-r--r--hiddenapi/src/main/java/com/android/internal/statusbar/IStatusBarService.java5
-rw-r--r--settings.gradle2
9 files changed, 20 insertions, 180 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 10b84fe..84cae29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,22 +31,22 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'com.google.firebase:firebase-core:16.0.5'
+ implementation 'com.google.firebase:firebase-core:16.0.8'
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.1.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
- implementation 'eu.chainfire:librootjava:1.0.0'
+ androidTestImplementation 'androidx.test:runner:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+ implementation 'eu.chainfire:librootjava:1.3.0'
implementation 'eu.chainfire:libsuperuser:1.0.0.+'
- implementation 'eu.chainfire:librootjavadaemon:1.0.0'
+ implementation 'eu.chainfire:librootjavadaemon:1.3.0'
implementation 'moe.shizuku.preference:preference:3.0.0'
implementation 'moe.shizuku.preference:preference-dialog-android:3.0.0'
implementation 'moe.shizuku.preference:preference-simplemenu:3.0.0'
- def nav_version = "1.0.0-alpha07"
+ def nav_version = "1.0.0"
implementation "android.arch.navigation:navigation-fragment:$nav_version"
implementation "android.arch.navigation:navigation-ui:$nav_version"
- implementation 'com.crashlytics.sdk.android:crashlytics:2.9.6'
- implementation "android.arch.work:work-runtime:1.0.0-alpha11"
- implementation 'com.google.android.gms:play-services-oss-licenses:16.0.1'
- implementation 'com.google.firebase:firebase-perf:16.2.0'
- compileOnly project(':hiddenapi')
+ implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+ implementation "android.arch.work:work-runtime:1.0.0"
+ implementation 'com.google.android.gms:play-services-oss-licenses:16.0.2'
+ implementation 'com.google.firebase:firebase-perf:16.2.4'
+ // compileOnly project(':hiddenapi')
}
diff --git a/app/src/main/java/moe/yuuta/sysuicontroller/auto_start/AutoStartWorker.java b/app/src/main/java/moe/yuuta/sysuicontroller/auto_start/AutoStartWorker.java
index 650eeb3..2ae465b 100644
--- a/app/src/main/java/moe/yuuta/sysuicontroller/auto_start/AutoStartWorker.java
+++ b/app/src/main/java/moe/yuuta/sysuicontroller/auto_start/AutoStartWorker.java
@@ -5,13 +5,14 @@ import android.content.SharedPreferences;
import android.os.RemoteException;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.NonNull;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
import eu.chainfire.librootjava.RootIPCReceiver;
import eu.chainfire.librootjavadaemon.RootDaemon;
import eu.chainfire.libsuperuser.Shell;
@@ -71,6 +72,6 @@ public class AutoStartWorker extends Worker {
mReceiver.release();
shell.kill(); // Kill the process, will make it idle and it won't kill the forked process
shell.close();
- return Result.SUCCESS;
+ return Result.success();
}
}
diff --git a/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java b/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java
index 7b71817..cd9205b 100644
--- a/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java
+++ b/app/src/main/java/moe/yuuta/sysuicontroller/core/ControllerService.java
@@ -60,7 +60,7 @@ public class ControllerService extends IStatusController.Stub {
@SuppressLint("PrivateApi") Method mGetService = StatusBarManager.class.getDeclaredMethod("getService");
mGetService.setAccessible(true);
mService = (IStatusBarService) mGetService.invoke(mManager);
- RootDaemon.daemonize(BuildConfig.APPLICATION_ID, CODE_SERVICE);
+ RootDaemon.daemonize(BuildConfig.APPLICATION_ID, CODE_SERVICE, false, null);
RootJava.restoreOriginalLdLibraryPath();
RootDaemon.register(BuildConfig.APPLICATION_ID, this, CODE_SERVICE);
Log.i(TAG, "Started at " + new Date().toString());
diff --git a/build.gradle b/build.gradle
index a08c4e9..cbc4901 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,9 +10,9 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0-alpha03'
- classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-alpha07"
+ classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"
classpath 'com.google.gms:google-services:4.2.0'
- classpath 'io.fabric.tools:gradle:1.26.1'
+ classpath 'io.fabric.tools:gradle:1.27.0'
classpath 'com.google.android.gms:oss-licenses-plugin:0.9.4'
classpath 'com.google.firebase:firebase-plugins:1.1.5'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/hiddenapi/.gitignore b/hiddenapi/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/hiddenapi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/hiddenapi/build.gradle b/hiddenapi/build.gradle
deleted file mode 100644
index 82292e2..0000000
--- a/hiddenapi/build.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-apply plugin: 'java-library'
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-}
-
-sourceCompatibility = "8"
-targetCompatibility = "8"
diff --git a/hiddenapi/src/main/java/android/app/StatusBarManager.java b/hiddenapi/src/main/java/android/app/StatusBarManager.java
deleted file mode 100644
index 691a12e..0000000
--- a/hiddenapi/src/main/java/android/app/StatusBarManager.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2007 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.
- */
-
-package android.app;
-
-import com.android.internal.statusbar.IStatusBarService;
-
-/**
- * Allows an app to control the status bar.
- *
- * @hide
- */
-public class StatusBarManager {
-
- public static int DISABLE_EXPAND;
- public static int DISABLE_NOTIFICATION_ICONS;
- public static int DISABLE_NOTIFICATION_ALERTS;
- @Deprecated
- public static int DISABLE_NOTIFICATION_TICKER;
- public static int DISABLE_SYSTEM_INFO;
- public static int DISABLE_HOME;
- public static int DISABLE_RECENT;
- public static int DISABLE_BACK;
- public static int DISABLE_CLOCK;
- public static int DISABLE_SEARCH;
-
- @Deprecated
- public static int DISABLE_NAVIGATION;
-
- public static int DISABLE_NONE = 0x00000000;
-
- public static int DISABLE_MASK = DISABLE_EXPAND | DISABLE_NOTIFICATION_ICONS
- | DISABLE_NOTIFICATION_ALERTS | DISABLE_NOTIFICATION_TICKER
- | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK
- | DISABLE_SEARCH;
-
- /**
- * Flag to disable quick settings.
- *
- * Setting this flag disables quick settings completely, but does not disable expanding the
- * notification shade.
- */
- public static int DISABLE2_QUICK_SETTINGS = 1;
- public static int DISABLE2_SYSTEM_ICONS = 1 << 1;
- public static int DISABLE2_NOTIFICATION_SHADE = 1 << 2;
- public static int DISABLE2_GLOBAL_ACTIONS = 1 << 3;
- public static int DISABLE2_ROTATE_SUGGESTIONS = 1 << 4;
-
- public static int DISABLE2_NONE = 0x00000000;
-
- public static int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS
- | DISABLE2_NOTIFICATION_SHADE | DISABLE2_GLOBAL_ACTIONS | DISABLE2_ROTATE_SUGGESTIONS;
-
- public static int NAVIGATION_HINT_BACK_ALT;
- public static int NAVIGATION_HINT_IME_SHOWN;
-
- public static int WINDOW_STATUS_BAR;
- public static int WINDOW_NAVIGATION_BAR;
-
- public static int WINDOW_STATE_SHOWING;
- public static int WINDOW_STATE_HIDING;
- public static int WINDOW_STATE_HIDDEN;
-
- public static int CAMERA_LAUNCH_SOURCE_WIGGLE;
- public static int CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP;
- public static int CAMERA_LAUNCH_SOURCE_LIFT_TRIGGER;
-
- private synchronized IStatusBarService getService() {
- throw new RuntimeException("Stub!");
- }
-
- /**
- * Disable some features in the status bar. Pass the bitwise-or of the DISABLE_* flags.
- * To re-enable everything, pass {@link #DISABLE_NONE}.
- */
- public void disable(int what) {
- throw new RuntimeException("Stub!");
- }
-
- /**
- * Disable additional status bar features. Pass the bitwise-or of the DISABLE2_* flags.
- * To re-enable everything, pass {@link #DISABLE_NONE}.
- *
- * Warning: Only pass DISABLE2_* flags into this function, do not use DISABLE_* flags.
- */
- public void disable2(int what) {
- throw new RuntimeException("Stub!");
- }
-
- /**
- * Expand the notifications panel.
- */
- public void expandNotificationsPanel() {
- throw new RuntimeException("Stub!");
- }
-
- /**
- * Collapse the notifications and settings panels.
- */
- public void collapsePanels() {
- throw new RuntimeException("Stub!");
- }
-
- /**
- * Expand the settings panel.
- */
- public void expandSettingsPanel() {
- expandSettingsPanel(null);
- }
-
- /**
- * Expand the settings panel and open a subPanel, pass null to just open the settings panel.
- */
- public void expandSettingsPanel(String subPanel) {
- throw new RuntimeException("Stub!");
- }
-
- public void setIcon(String slot, int iconId, int iconLevel, String contentDescription) {
- throw new RuntimeException("Stub!");
- }
-
- public void removeIcon(String slot) {
- throw new RuntimeException("Stub!");
- }
-
- public void setIconVisibility(String slot, boolean visible) {
- throw new RuntimeException("Stub!");
- }
-
- /** @hide */
- public static String windowStateToString(int state) {
- throw new RuntimeException("Stub!");
- }
-}
diff --git a/hiddenapi/src/main/java/com/android/internal/statusbar/IStatusBarService.java b/hiddenapi/src/main/java/com/android/internal/statusbar/IStatusBarService.java
deleted file mode 100644
index 01e66a3..0000000
--- a/hiddenapi/src/main/java/com/android/internal/statusbar/IStatusBarService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.internal.statusbar;
-
-public interface IStatusBarService {
- void setIcon(String slot, String packageName, int iconId, int iconLevel, String contentDescription);
-}
diff --git a/settings.gradle b/settings.gradle
index 9fee630..9d495b3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':hiddenapi'
+include ':app' \ No newline at end of file