Remove in-tree messy apps, and switch to TrebleApp
Conflicts:
Picker/src/me/phh/treble/overlaypicker/Starter.java
Qualcomm/QtiAudio/Android.mk
overlay.mk
Change-Id: Ie50cdf0e7394d378c10b5f8a07301aa22fc281fd
diff --git a/Picker/Android.mk b/Picker/Android.mk
deleted file mode 100644
index b2cdbf4..0000000
--- a/Picker/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PACKAGE_NAME := HardwareOverlayPicker
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-include $(BUILD_PACKAGE)
diff --git a/Picker/AndroidManifest.xml b/Picker/AndroidManifest.xml
deleted file mode 100644
index 342dae6..0000000
--- a/Picker/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="me.phh.treble.overlaypicker"
- android:sharedUserId="android.uid.system">
-
- <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES" />
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <application
- android:label="@string/app_label">
-
- <receiver android:name=".Starter">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED"/>
- </intent-filter>
- </receiver>
- </application>
-
-</manifest>
diff --git a/Picker/res/values/strings.xml b/Picker/res/values/strings.xml
deleted file mode 100644
index 1bd9b00..0000000
--- a/Picker/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_label">Hardware Overlay Picker</string>
-</resources>
diff --git a/Picker/src/me/phh/treble/overlaypicker/Starter.java b/Picker/src/me/phh/treble/overlaypicker/Starter.java
deleted file mode 100644
index a738cac..0000000
--- a/Picker/src/me/phh/treble/overlaypicker/Starter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package me.phh.treble.overlaypicker;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemProperties;
-import android.util.Log;
-
-public class Starter extends BroadcastReceiver {
- private final static String TAG = "OverlayPicker";
- private IOverlayManager om;
-
- private String platform = SystemProperties.get("ro.board.platform");
- private String vendorFp = SystemProperties.get("ro.vendor.build.fingerprint");
- private String productBoard = SystemProperties.get("ro.product.board");
-
- private void setOverlayEnabled(String o, boolean enabled) {
- try {
- om.setEnabled(o, true, 0);
- } catch(RemoteException e) {
- Log.d(TAG, "Failed to set overlay", e);
- }
- }
- private void handleHtc(Context ctxt) {
- //HTC U11+
- if(vendorFp == null) return;
-
- if(vendorFp.contains("htc_ocm"))
- setOverlayEnabled("me.phh.treble.overlay.navbar", true);
- }
-
- private void handleNightmode(Context ctxt) {
- if("msm8998".equals(platform)) {
- Log.d("OverlayPicker", "Enabling nightmode");
- setOverlayEnabled("me.phh.treble.overlay.nightmode", true);
- }
- }
-
- private void handleEssentialPh1(Context ctxt) {
- if("Mata".equals(productBoard))
- setOverlayEnabled("me.phh.treble.overlay.essential_ph1", true);
- }
-
- private void handleSamsung(Context ctxt) {
- if(vendorFp == null) return;
-
- if(vendorFp.contains("starlte") ||
- vendorFp.contains("star2lte") ||
- vendorFp.contains("starqlte") ||
- vendorFp.contains("star2qlte")) {
- setOverlayEnabled("me.phh.treble.overlay.samsung.s9.systemui", true);
- }
-
- }
-
- private void enableLte(Context ctxt) {
- //TODO: List here all non-LTE platforms
- if(!"mt6580".equals(platform))
- setOverlayEnabled("me.phh.treble.overlay.telephony.lte", true);
- }
-
- @Override
- public void onReceive(Context ctxt, Intent intent) {
- om = IOverlayManager.Stub.asInterface(
- ServiceManager.getService(Context.OVERLAY_SERVICE));
-
- handleHtc(ctxt);
- handleNightmode(ctxt);
- handleEssentialPh1(ctxt);
- enableLte(ctxt);
- handleSamsung(ctxt);
-
- setOverlayEnabled("me.phh.treble.overlay.systemui.falselocks", true);
- }
-}
diff --git a/Qualcomm/QtiAudio/Android.mk b/Qualcomm/QtiAudio/Android.mk
deleted file mode 100644
index baae8c3..0000000
--- a/Qualcomm/QtiAudio/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- vendor.qti.hardware.radio.am-V1.0-java \
- vendor.qti.qcril.am-V1.0-java
-
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PACKAGE_NAME := QtiAudio
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_PACKAGE)
diff --git a/Qualcomm/QtiAudio/AndroidManifest.xml b/Qualcomm/QtiAudio/AndroidManifest.xml
deleted file mode 100644
index 8ab6812..0000000
--- a/Qualcomm/QtiAudio/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="me.phh.qti.audio"
- android:sharedUserId="android.uid.system"
- android:persistent="true">
-
- <application
- android:label="@string/app_label">
-
- <receiver android:name=".Starter">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED"/>
- </intent-filter>
- </receiver>
- <service android:name=".Service" />
- </application>
-</manifest>
diff --git a/Qualcomm/QtiAudio/res/values/strings.xml b/Qualcomm/QtiAudio/res/values/strings.xml
deleted file mode 100644
index 1ced373..0000000
--- a/Qualcomm/QtiAudio/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_label">Qualcomm audio</string>
-</resources>
diff --git a/Qualcomm/QtiAudio/src/me/phh/qti/audio/Service.java b/Qualcomm/QtiAudio/src/me/phh/qti/audio/Service.java
deleted file mode 100644
index 5c69742..0000000
--- a/Qualcomm/QtiAudio/src/me/phh/qti/audio/Service.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package me.phh.qti.audio;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-import android.media.AudioManager;
-import android.media.AudioSystem;
-import android.os.IBinder;
-import android.os.UEventObserver;
-import android.os.SystemProperties;
-
-public class Service extends android.app.Service {
- AudioManager audioManager;
- @Override public void onCreate() {
- String fp = SystemProperties.get("ro.vendor.build.fingerprint", "nothing");
- audioManager = getSystemService(AudioManager.class);
-
- new java.lang.Thread() {
- @Override
- public void run() {
- android.util.Log.d("PHH", "Hello");
- try {
- vendor.qti.hardware.radio.am.V1_0.IQcRilAudio service;
- service = vendor.qti.hardware.radio.am.V1_0.IQcRilAudio.getService("slot1");
- service.setCallback(cb);
- } catch(Exception e) {}
- try {
- vendor.qti.hardware.radio.am.V1_0.IQcRilAudio service;
- service = vendor.qti.hardware.radio.am.V1_0.IQcRilAudio.getService("slot2");
- service.setCallback(cb);
- } catch(Exception e) {}
- try {
- vendor.qti.qcril.am.V1_0.IQcRilAudio service;
- service = vendor.qti.qcril.am.V1_0.IQcRilAudio.getService("slot1");
- service.setCallback(cb2);
- } catch(Exception e) {}
- try {
- vendor.qti.qcril.am.V1_0.IQcRilAudio service;
- service = vendor.qti.qcril.am.V1_0.IQcRilAudio.getService("slot2");
- service.setCallback(cb2);
- } catch(Exception e) {}
- if(fp.contains("OnePlus6")) {
- try {
- (new UEventObserver() {
- @Override
- public void onUEvent(UEventObserver.UEvent event) {
- try {
- android.util.Log.v("PHH", "USB UEVENT: " + event.toString());
- String state = event.get("STATE");
-
- boolean ringing = state.contains("USB=0");
- boolean silent = state.contains("(null)=0");
- boolean vibrate = state.contains("USB_HOST=0");
- android.util.Log.v("PHH", "Got ringing = " + ringing + ", silent = " + silent + ", vibrate = " + vibrate);
- if(ringing && !silent && !vibrate)
- audioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
- if(silent && !ringing && !vibrate)
- audioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
- if(vibrate && !silent && !ringing)
- audioManager.setRingerMode(AudioManager.RINGER_MODE_VIBRATE);
- } catch(Exception e) {
- android.util.Log.d("PHH", "Failed parsing uevent", e);
- }
-
- }
- }).startObserving("DEVPATH=/devices/platform/soc/soc:tri_state_key");
- } catch(Exception e) {
- android.util.Log.d("PHH", "Failed setting UEventObserver", e);
- }
- }
-
- }
- }.start();
- }
-
- vendor.qti.hardware.radio.am.V1_0.IQcRilAudioCallback cb = new vendor.qti.hardware.radio.am.V1_0.IQcRilAudioCallback.Stub() {
- @Override
- public String getParameters(String parameter) {
- android.util.Log.d("PHH", "Got getParameters " + parameter);
- try {
- return AudioSystem.getParameters(parameter);
- } catch(Exception e) {
- android.util.Log.d("PHH", "Failed getting parameters");
- }
- return "";
- }
-
- @Override
- public int setParameters(String parameters) {
- android.util.Log.d("PHH", "Got setParameters " + parameters);
- try {
- AudioSystem.setParameters(parameters);
- } catch(Exception e) {
- android.util.Log.d("PHH", "Failed setting parameters");
- }
- return 0;
- }
- };
-
- vendor.qti.qcril.am.V1_0.IQcRilAudioCallback cb2 = new vendor.qti.qcril.am.V1_0.IQcRilAudioCallback.Stub() {
- @Override
- public String getParameters(String parameter) {
- android.util.Log.d("PHH", "Got getParameters " + parameter);
- try {
- return AudioSystem.getParameters(parameter);
- } catch(Exception e) {
- android.util.Log.d("PHH", "Failed getting parameters");
- }
- return "";
- }
-
- @Override
- public int setParameters(String parameters) {
- android.util.Log.d("PHH", "Got setParameters " + parameters);
- try {
- AudioSystem.setParameters(parameters);
- } catch(Exception e) {
- android.util.Log.d("PHH", "Failed setting parameters");
- }
- return 0;
- }
- };
-
- @Override
- public IBinder onBind(Intent intent) {
- return null;
- }
-}
diff --git a/Qualcomm/QtiAudio/src/me/phh/qti/audio/Starter.java b/Qualcomm/QtiAudio/src/me/phh/qti/audio/Starter.java
deleted file mode 100644
index 2700ec6..0000000
--- a/Qualcomm/QtiAudio/src/me/phh/qti/audio/Starter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package me.phh.qti.audio;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class Starter extends BroadcastReceiver {
-
- @Override
- public void onReceive(Context ctxt, Intent intent) {
- ctxt.startService(new Intent(ctxt, Service.class));
- }
-}
diff --git a/TrebleApp/Android.mk b/TrebleApp/Android.mk
new file mode 100644
index 0000000..5acae71
--- /dev/null
+++ b/TrebleApp/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := TrebleApp
+LOCAL_SRC_FILES := app.apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+
+include $(BUILD_PREBUILT)
diff --git a/TrebleApp/app.apk b/TrebleApp/app.apk
new file mode 100644
index 0000000..20e0803
--- /dev/null
+++ b/TrebleApp/app.apk
Binary files differ
diff --git a/overlay.mk b/overlay.mk
index 92a4c97..85797d8 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -27,11 +27,10 @@
treble-overlay-xiaomi-mia2lite \
treble-overlay-xiaomi-mipad4 \
treble-overlay-xiaomi-pocof1 \
- HardwareOverlayPicker \
- QtiAudio \
Touchscreen \
- android.hidl.base@1.0 \
- android.hidl.manager@1.0
+ android.hidl.base@1.0 \
+ android.hidl.manager@1.0 \
+ TrebleApp \
# Huawei Camera
PRODUCT_COPY_FILES += \