From b06c31754a69b66c3f24ac5a05240796fda10421 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:29:29 +0000
Subject: [PATCH 01/41] Revert "OMS: handle target or overlay package disabled"

This reverts commit 9bffddf47a9cfe124cf2b31a807144a64b3c61aa.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 core/java/android/content/om/OverlayInfo.java         | 11 -----------
 .../server/om/hosttest/InstallOverlayTests.java       | 10 ----------
 .../android/server/om/OverlayManagerServiceImpl.java  |  9 ---------
 3 files changed, 30 deletions(-)

diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java
index 9f7abf679d5..edacbb0bb2b 100644
--- a/core/java/android/content/om/OverlayInfo.java
+++ b/core/java/android/content/om/OverlayInfo.java
@@ -41,7 +41,6 @@ public final class OverlayInfo implements Parcelable {
             STATE_ENABLED_STATIC,
             STATE_TARGET_UPGRADING,
             STATE_OVERLAY_UPGRADING,
-            STATE_OVERLAY_NOT_AVAILABLE,
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface State {}
@@ -98,13 +97,6 @@ public final class OverlayInfo implements Parcelable {
      */
     public static final int STATE_ENABLED_STATIC = 6;
 
-    /**
-     * The overlay package is currently disabled by the package manager. For
-     * all intents and purposes, outside the package manager, it is like the
-     * overlay package simply was not installed.
-     */
-    public static final int STATE_OVERLAY_NOT_AVAILABLE = 7;
-
     /**
      * Overlay category: theme.
      * <p>
@@ -215,7 +207,6 @@ private void ensureValidState() {
             case STATE_ENABLED_STATIC:
             case STATE_TARGET_UPGRADING:
             case STATE_OVERLAY_UPGRADING:
-            case STATE_OVERLAY_NOT_AVAILABLE:
                 break;
             default:
                 throw new IllegalArgumentException("State " + state + " is not a valid state");
@@ -294,8 +285,6 @@ public static String stateToString(@State int state) {
                 return "STATE_TARGET_UPGRADING";
             case STATE_OVERLAY_UPGRADING:
                 return "STATE_OVERLAY_UPGRADING";
-            case STATE_OVERLAY_NOT_AVAILABLE:
-                return "STATE_OVERLAY_NOT_AVAILABLE";
             default:
                 return "<unknown state>";
         }
diff --git a/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java b/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
index 9b1f95ce2a6..6d5276f2423 100644
--- a/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
+++ b/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
@@ -94,16 +94,6 @@ public void installPlatformSignedOverlay() throws Exception {
         assertTrue(overlayManagerContainsPackage(SIG_OVERLAY_PACKAGE_NAME));
     }
 
-    @Test
-    public void installAndDisableOverlay() throws Exception {
-        final String pkgName = "com.android.server.om.hosttest.app_overlay";
-        installPackage("OverlayHostTests_AppOverlayV1.apk");
-        assertTrue(overlayManagerContainsPackage(pkgName));
-        assertFalse(overlayManagerContainsPackage("--- " + pkgName));
-        setPackageEnabled(pkgName, false);
-        assertTrue(overlayManagerContainsPackage("--- " + pkgName));
-    }
-
     @Test
     public void installPlatformSignedAppOverlayAndUpdate() throws Exception {
         assertTrue(runDeviceTests(DEVICE_TEST_PKG, DEVICE_TEST_CLS, "expectAppResource"));
diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
index 380ba5cd0dc..4103e3421dd 100644
--- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
+++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
@@ -21,7 +21,6 @@
 import static android.content.om.OverlayInfo.STATE_ENABLED_STATIC;
 import static android.content.om.OverlayInfo.STATE_MISSING_TARGET;
 import static android.content.om.OverlayInfo.STATE_NO_IDMAP;
-import static android.content.om.OverlayInfo.STATE_OVERLAY_NOT_AVAILABLE;
 import static android.content.om.OverlayInfo.STATE_OVERLAY_UPGRADING;
 import static android.content.om.OverlayInfo.STATE_TARGET_UPGRADING;
 
@@ -685,14 +684,6 @@ private boolean updateState(@NonNull final String targetPackageName,
             return STATE_MISSING_TARGET;
         }
 
-        if (!targetPackage.applicationInfo.enabled) {
-            return STATE_MISSING_TARGET;
-        }
-
-        if (!overlayPackage.applicationInfo.enabled) {
-            return STATE_OVERLAY_NOT_AVAILABLE;
-        }
-
         if (!mIdmapManager.idmapExists(overlayPackage, userId)) {
             return STATE_NO_IDMAP;
         }

From 9bb3934d52f9b09018805eabbc6229b96ceb0b44 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:32:22 +0000
Subject: [PATCH 02/41] Revert "OMS: try harder not to update assets if nothing
 changed"

This reverts commit d2ec68f9cf8e9a186af1348b893a8d456f20d0d7.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../java/com/android/server/om/OverlayManagerServiceImpl.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
index 4103e3421dd..112059daf95 100644
--- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
+++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
@@ -313,9 +313,7 @@ private boolean updateAllOverlaysForTarget(@NonNull final String targetPackageNa
         }
 
         // check for enabled framework overlays
-        if (!"android".equals(targetPackageName)) {
-            modified = modified || !getEnabledOverlayPackageNames("android", userId).isEmpty();
-        }
+        modified = modified || !getEnabledOverlayPackageNames("android", userId).isEmpty();
 
         return modified;
     }

From 382b162f7bf4acb419a1b59d7b3013ca3b61a16a Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:32:48 +0000
Subject: [PATCH 03/41] Revert "SubstratumService: Rewrite installation method
 for Pie InstallSession API"

This reverts commit 1e5a05601740bef697b84c2ef2eca436bd40997f.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../substratum/ISubstratumHelperService.aidl  |  1 -
 .../helper/SubstratumHelperService.java       | 88 -------------------
 .../server/substratum/SubstratumService.java  | 80 +++++++++++++----
 3 files changed, 65 insertions(+), 104 deletions(-)

diff --git a/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl b/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
index 48dc20b5c5f..d64e2f8c110 100644
--- a/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
+++ b/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
@@ -21,5 +21,4 @@ oneway interface ISubstratumHelperService {
     void applyBootAnimation();
     void applyShutdownAnimation();
     void applyProfile(in String name);
-    void installOverlay(in List<String> paths);
 }
diff --git a/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java b/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
index 1f31abe9f7c..09bb31d545b 100644
--- a/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
+++ b/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
@@ -17,14 +17,7 @@
 
 import android.app.Service;
 import android.content.Intent;
-import android.content.IIntentReceiver;
-import android.content.IIntentSender;
-import android.content.IntentSender;
-import android.content.pm.PackageInstaller;
-import android.content.pm.PackageInstaller.Session;
-import android.content.pm.PackageInstaller.SessionParams;
 import android.os.Binder;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.FileUtils;
 import android.os.IBinder;
@@ -35,14 +28,6 @@
 import com.android.internal.substratum.ISubstratumHelperService;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
 
 public class SubstratumHelperService extends Service {
     private static final String TAG = "SubstratumHelperService";
@@ -123,51 +108,6 @@ public void applyProfile(String name) {
             }
         }
 
-        @Override
-        public void installOverlay(List<String> paths) {
-            if (!isAuthorized(Binder.getCallingUid())) return;
-            LocalIntentReceiver receiver = new LocalIntentReceiver();
-            for (String path : paths) {
-                //Settings.Global.putInt(mContext.getContentResolver(),
-                //        Settings.Global.PACKAGE_VERIFIER_ENABLE, 0);
-                File apkFile = new File(path);
-                try {
-                    //PackageParser.PackageLite pkg = PackageParser.parsePackageLite(apkFile, 0);
-                    PackageInstaller installer = getPackageManager().getPackageInstaller();
-                    SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
-                    int sessionId = installer.createSession(params);
-                    try (PackageInstaller.Session session = installer.openSession(sessionId)) {
-                        try (InputStream in = new FileInputStream(apkFile);
-                            OutputStream apkStream = session.openWrite(
-                                    "base.apk", 0, apkFile.length())) {
-                            byte[] buffer = new byte[32 * 1024];
-                            long size = apkFile.length();
-                            while (size > 0) {
-                                long toRead = (buffer.length < size) ? buffer.length : size;
-                                int didRead = in.read(buffer, 0, (int) toRead);
-                                apkStream.write(buffer, 0, didRead);
-                                size -= didRead;
-                            }
-                        }
-                        session.commit(receiver.getIntentSender());
-                    }
-                } catch (IOException e) {
-                    Log.e(TAG, "Install failed", e);
-                    continue;
-                }
-
-                Intent result = receiver.getResult();
-                int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
-                        PackageInstaller.STATUS_FAILURE);
-                if (status == PackageInstaller.STATUS_SUCCESS) {
-                String installedPackageName = result.getStringExtra(
-                        PackageInstaller.EXTRA_PACKAGE_NAME);
-                } else {
-                    // ¯\_(ツ)_/¯
-                }
-            }
-        }
-
         private boolean isAuthorized(int uid) {
             return Process.SYSTEM_UID == uid;
         }
@@ -197,32 +137,4 @@ private boolean copyDir(File src, File dst) {
     public IBinder onBind(Intent intent) {
         return mISubstratumHelperService.asBinder();
     }
-
-    private static class LocalIntentReceiver {
-        private final SynchronousQueue<Intent> mResult = new SynchronousQueue<>();
-
-        private IIntentSender.Stub mLocalSender = new IIntentSender.Stub() {
-            @Override
-            public void send(int code, Intent intent, String resolvedType, IBinder whitelistToken,
-                    IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) {
-                try {
-                    mResult.offer(intent, 5, TimeUnit.SECONDS);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        };
-
-        public IntentSender getIntentSender() {
-            return new IntentSender((IIntentSender) mLocalSender);
-        }
-
-        public Intent getResult() {
-            try {
-                return mResult.take();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
 }
diff --git a/services/core/java/com/android/server/substratum/SubstratumService.java b/services/core/java/com/android/server/substratum/SubstratumService.java
index 5c5634bbf57..c8b1214097e 100644
--- a/services/core/java/com/android/server/substratum/SubstratumService.java
+++ b/services/core/java/com/android/server/substratum/SubstratumService.java
@@ -76,7 +76,7 @@ public final class SubstratumService extends SystemService {
 
     private static final String TAG = "SubstratumService";
     private static final String SUBSTRATUM_PACKAGE = "projekt.substratum";
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private static final Signature SUBSTRATUM_SIGNATURE = new Signature(""
             + "308202eb308201d3a003020102020411c02f2f300d06092a864886f70d01010b050030263124302206"
@@ -214,15 +214,7 @@ private void waitForHelperConnection() {
             Intent intent = new Intent("projekt.substratum.helper.SubstratumHelperService");
             intent.setPackage("projekt.substratum.helper");
             mContext.bindServiceAsUser(intent, mHelperConnection,
-                    Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT_BACKGROUND, UserHandle.SYSTEM);
-            int retryCount = 1;
-            while (mHelperService == null && retryCount <= 30) {
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException ignored) {
-                }
-                retryCount++;
-            }
+                    Context.BIND_AUTO_CREATE, UserHandle.SYSTEM);
         }
     }
 
@@ -274,14 +266,72 @@ private void checkCallerAuthorization(int uid) {
         public void installOverlay(List<String> paths) {
             checkCallerAuthorization(Binder.getCallingUid());
             final long ident = Binder.clearCallingIdentity();
+            final int packageVerifierEnable = Settings.Global.getInt(
+                    mContext.getContentResolver(),
+                    Settings.Global.PACKAGE_VERIFIER_ENABLE, 1);
             try {
                 synchronized (mLock) {
-                    waitForHelperConnection();
-                    mHelperService.installOverlay(paths);
+                    PackageInstallObserver installObserver = new PackageInstallObserver();
+                    PackageDeleteObserver deleteObserver = new PackageDeleteObserver();
+                    for (String path : paths) {
+                        mInstalledPackageName = null;
+                        log("Installer - installing package from path \'" + path + "\'");
+                        mIsWaiting = true;
+                        Settings.Global.putInt(mContext.getContentResolver(),
+                                Settings.Global.PACKAGE_VERIFIER_ENABLE, 0);
+                        try {
+                            mPm.installExistingPackageAsUser(
+                                    mInstalledPackageName,
+                                    UserHandle.USER_SYSTEM,
+                                    PackageManager.INSTALL_REPLACE_EXISTING,
+                                    PackageManager.INSTALL_REASON_UNKNOWN);
+
+                            while (mIsWaiting) {
+                                try {
+                                    Thread.sleep(1);
+                                } catch (InterruptedException e) {
+                                    // Someone interrupted my sleep, ugh!
+                                }
+                            }
+                        } catch (RemoteException e) {
+                            logE("There is an exception when trying to install " + path, e);
+                            continue;
+                        }
+
+                        if (mInstalledPackageName != null) {
+                            try {
+                                PackageInfo pi = mPm.getPackageInfo(mInstalledPackageName,
+                                        0, UserHandle.USER_SYSTEM);
+                                if ((pi.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0 ||
+                                        pi.overlayTarget == null) {
+                                    mIsWaiting = true;
+                                    int versionCode = mPm.getPackageInfo(
+                                            mInstalledPackageName, 0, UserHandle.USER_SYSTEM)
+                                            .versionCode;
+                                    mPm.deletePackageAsUser(
+                                            mInstalledPackageName,
+                                            versionCode,
+                                            deleteObserver,
+                                            0,
+                                            UserHandle.USER_SYSTEM);
+
+                                    while (mIsWaiting) {
+                                        try {
+                                            Thread.sleep(1);
+                                        } catch (InterruptedException e) {
+                                            // Someone interrupted my sleep, ugh!
+                                        }
+                                    }
+                                }
+                            } catch (RemoteException e) {
+                                // Probably won't happen but we need to keep quiet here
+                            }
+                        }
+                    }
                 }
-            } catch (RemoteException ignored) {
-                // ¯\_(ツ)_/¯
             } finally {
+                Settings.Global.putInt(mContext.getContentResolver(),
+                        Settings.Global.PACKAGE_VERIFIER_ENABLE, packageVerifierEnable);
                 Binder.restoreCallingIdentity(ident);
             }
         }
@@ -1035,7 +1085,7 @@ private void logE(String msg) {
     private void updateSettings() {
         synchronized (mLock) {
             mSigOverride = Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                    Settings.Secure.FORCE_AUTHORIZE_SUBSTRATUM_PACKAGES, 1,
+                    Settings.Secure.FORCE_AUTHORIZE_SUBSTRATUM_PACKAGES, 0,
                     UserHandle.USER_CURRENT) == 1;
         }
     }

From cc1d664ced827667fd65513823ad7fb6e3857746 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:33:19 +0000
Subject: [PATCH 04/41] Revert "Unbreak public api by hiding substratum
 interfaces"

This reverts commit 0985d217f7a1ed37242f5e380c0bd43c607eba57.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 core/java/android/content/substratum/ISubstratumService.aidl     | 1 -
 .../android/internal/substratum/ISubstratumHelperService.aidl    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/core/java/android/content/substratum/ISubstratumService.aidl b/core/java/android/content/substratum/ISubstratumService.aidl
index 13bd2113e9c..04b65262a32 100644
--- a/core/java/android/content/substratum/ISubstratumService.aidl
+++ b/core/java/android/content/substratum/ISubstratumService.aidl
@@ -16,7 +16,6 @@
 
 package android.content.substratum;
 
-/** {@hide} */
 interface ISubstratumService {
 
     /**
diff --git a/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl b/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
index d64e2f8c110..7d6ac0aa176 100644
--- a/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
+++ b/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
@@ -16,7 +16,6 @@
 
 package com.android.internal.substratum;
 
-/** {@hide} */
 oneway interface ISubstratumHelperService {
     void applyBootAnimation();
     void applyShutdownAnimation();

From e2363fbbbab239bca63fcab032d42b19ed133366 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:33:46 +0000
Subject: [PATCH 05/41] Revert "Pie OMS: allow non-system overlays from
 Substratum"

This reverts commit a96bc59e627445d9013b9f3cdc92cb5bc3ffe4c3.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../java/com/android/server/SystemConfig.java | 16 -----------
 data/etc/Android.mk                           | 10 +------
 data/etc/substratum-sysconfig.xml             | 22 ---------------
 .../server/pm/PackageManagerService.java      | 28 ++++++-------------
 4 files changed, 10 insertions(+), 66 deletions(-)
 delete mode 100644 data/etc/substratum-sysconfig.xml

diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index f6450b6ef86..c5be8e4a3ab 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -142,9 +142,6 @@ public static final class PermissionEntry {
     // Package names that are exempted from private API blacklisting
     final ArraySet<String> mHiddenApiPackageWhitelist = new ArraySet<>();
 
-    // These are the packages that are whitelisted to be the signature check for a theme system
-    final ArraySet<String> mThemeSystemSignatureWhitelistedApps = new ArraySet<>();
-
     // The list of carrier applications which should be disabled until used.
     // This function suppresses update notifications for these pre-installed apps.
     // In SubscriptionInfoUpdater, the listed applications are disabled until used when all of the
@@ -247,10 +244,6 @@ public ArraySet<ComponentName> getBackupTransportWhitelist() {
         return mBackupTransportWhitelist;
     }
 
-    public ArraySet<String> getThemeSystemSignatureWhitelistedApps() {
-        return mThemeSystemSignatureWhitelistedApps;
-    }
-
     public ArraySet<String> getDisabledUntilUsedPreinstalledCarrierApps() {
         return mDisabledUntilUsedPreinstalledCarrierApps;
     }
@@ -633,15 +626,6 @@ private void readPermissionsFromXml(File permFile, int permissionFlag) {
                         }
                     }
                     XmlUtils.skipCurrentTag(parser);
-                } else if ("theme-system-signature-whitelisted-app".equals(name) && allowAppConfigs) {
-                    String pkgname = parser.getAttributeValue(null, "package");
-                    if (pkgname == null) {
-                        Slog.w(TAG, "<theme-system-signature-whitelisted-app> without package in " + permFile
-                                + " at " + parser.getPositionDescription());
-                    } else {
-                        mThemeSystemSignatureWhitelistedApps.add(pkgname);
-                    }
-                    XmlUtils.skipCurrentTag(parser);
                 } else if ("disabled-until-used-preinstalled-carrier-associated-app".equals(name)
                         && allowAppConfigs) {
                     String pkgname = parser.getAttributeValue(null, "package");
diff --git a/data/etc/Android.mk b/data/etc/Android.mk
index f9ddefe178b..0bb34f8aa7a 100644
--- a/data/etc/Android.mk
+++ b/data/etc/Android.mk
@@ -55,12 +55,4 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-########################
-include $(CLEAR_VARS)
-LOCAL_MODULE := substratum-sysconfig.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
+include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/data/etc/substratum-sysconfig.xml b/data/etc/substratum-sysconfig.xml
deleted file mode 100644
index 1d6a161b000..00000000000
--- a/data/etc/substratum-sysconfig.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<config>
-
-    <!-- These are the packages that are white-listed to be a signature check for a theme system -->
-    <theme-system-signature-whitelisted-app package="projekt.substratum.signature" />
-
-</config>
\ No newline at end of file
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 015f5d48cef..e772504ad9d 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -11403,26 +11403,16 @@ private void assertPackageIsValid(PackageParser.Package pkg, final @ParseFlags i
                     }
 
                     // The only case where we allow installation of a non-system overlay is when
-                    // its signature is signed with a whitelisted OEM theme system certificate.
-                    ArraySet<String> wlSigApps =
-                            SystemConfig.getInstance().getThemeSystemSignatureWhitelistedApps();
-                    boolean sigAllowed = false;
-                    for (String pkgName : wlSigApps) {
-                        PackageSetting platformPkgSetting = mSettings.getPackageLPr(pkgName);
-                        sigAllowed = (platformPkgSetting.signatures.mSigningDetails
-                                != PackageParser.SigningDetails.UNKNOWN)
-                                && (compareSignatures(
-                                        platformPkgSetting.signatures.mSigningDetails.signatures,
-                                        pkg.mSigningDetails.signatures)
-                                                == PackageManager.SIGNATURE_MATCH);
-                        if (sigAllowed) {
-                            break;
-                        }
-                    }
-
-                    if (!sigAllowed) {
+                    // its signature is signed with the platform certificate.
+                    PackageSetting platformPkgSetting = mSettings.getPackageLPr("android");
+                    if ((platformPkgSetting.signatures.mSigningDetails
+                            != PackageParser.SigningDetails.UNKNOWN)
+                            && (compareSignatures(
+                                    platformPkgSetting.signatures.mSigningDetails.signatures,
+                                    pkg.mSigningDetails.signatures)
+                                            != PackageManager.SIGNATURE_MATCH)) {
                         throw new PackageManagerException("Overlay " + pkg.packageName +
-                                " must be signed with a whitelisted OEM theme system certificate.");
+                                " must be signed with the platform certificate.");
                     }
                 }
             }

From 3677332da06c0f52e202279eb4a6b96e3d795a4b Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:34:33 +0000
Subject: [PATCH 06/41] Revert "SubstratumService: Refactor & cleanup according
 to AOSP conventions"

This reverts commit 78f5ec499449774c257c17f8fd71cc207d9becbe.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 data/etc/Android.mk                           | 13 ++++++++---
 data/etc/projekt.substratum.theme.xml         | 23 +++++++++++++++++++
 ...theme-feature.xml => substratum_theme.xml} |  4 ++--
 .../Android.mk                                |  8 ++++---
 .../AndroidManifest.xml                       | 12 +++++-----
 .../service}/SubstratumHelperService.java     |  4 ++--
 .../server/substratum/SubstratumService.java  |  4 ++--
 7 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 data/etc/projekt.substratum.theme.xml
 rename data/etc/{substratum-theme-feature.xml => substratum_theme.xml} (96%)
 rename packages/{SubstratumHelperService => SubstratumService}/Android.mk (87%)
 rename packages/{SubstratumHelperService => SubstratumService}/AndroidManifest.xml (80%)
 rename packages/{SubstratumHelperService/src/projekt/substratum/helper => SubstratumService/src/android/substratum/service}/SubstratumHelperService.java (98%)

diff --git a/data/etc/Android.mk b/data/etc/Android.mk
index 0bb34f8aa7a..f94ec844d8e 100644
--- a/data/etc/Android.mk
+++ b/data/etc/Android.mk
@@ -48,11 +48,18 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
-########################
 include $(CLEAR_VARS)
-LOCAL_MODULE := substratum-theme-feature.xml
+LOCAL_MODULE := projekt.substratum.theme.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := substratum_theme.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
\ No newline at end of file
+include $(BUILD_PREBUILT)
diff --git a/data/etc/projekt.substratum.theme.xml b/data/etc/projekt.substratum.theme.xml
new file mode 100644
index 00000000000..eb14a3d4e1c
--- /dev/null
+++ b/data/etc/projekt.substratum.theme.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2018 Project Substratum
+
+    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.
+-->
+
+<permissions>
+    <privapp-permissions package="android.substratum.service">
+        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
+    </privapp-permissions>
+
+</permissions>
diff --git a/data/etc/substratum-theme-feature.xml b/data/etc/substratum_theme.xml
similarity index 96%
rename from data/etc/substratum-theme-feature.xml
rename to data/etc/substratum_theme.xml
index b7d97fcd586..8ac5a9af302 100644
--- a/data/etc/substratum-theme-feature.xml
+++ b/data/etc/substratum_theme.xml
@@ -15,11 +15,11 @@
     limitations under the License.
 -->
 
-<config>
+<permissions>
     <!-- Limitation permission to block out themes from being visible on stock
          AOSP, or non-OMS devices. -->
 
     <!-- This is an alias for projekt.substratum.theme -->
     <feature name="projekt.substratum.theme" />
 
-</config>
+</permissions>
diff --git a/packages/SubstratumHelperService/Android.mk b/packages/SubstratumService/Android.mk
similarity index 87%
rename from packages/SubstratumHelperService/Android.mk
rename to packages/SubstratumService/Android.mk
index 78908d9312d..28eeaf1acc1 100644
--- a/packages/SubstratumHelperService/Android.mk
+++ b/packages/SubstratumService/Android.mk
@@ -22,11 +22,13 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_REQUIRED_MODULES := \
-      substratum-theme-feature.xml
+      projekt.substratum.theme.xml \
+      substratum_theme.xml
 
-LOCAL_PACKAGE_NAME := SubstratumHelperService
+LOCAL_PACKAGE_NAME := SubstratumService
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 
-include $(BUILD_PACKAGE)
\ No newline at end of file
+include $(BUILD_PACKAGE)
+
diff --git a/packages/SubstratumHelperService/AndroidManifest.xml b/packages/SubstratumService/AndroidManifest.xml
similarity index 80%
rename from packages/SubstratumHelperService/AndroidManifest.xml
rename to packages/SubstratumService/AndroidManifest.xml
index d28dbc68c2f..4a78d555d39 100644
--- a/packages/SubstratumHelperService/AndroidManifest.xml
+++ b/packages/SubstratumService/AndroidManifest.xml
@@ -19,26 +19,26 @@
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="projekt.substratum.helper"
+    package="android.substratum.service"
     android:sharedUserId="android.uid.system"
     android:versionCode="2"
     android:versionName="two" >
 
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
     <uses-feature name="projekt.substratum.theme" required="true"/>
 
     <application
         android:allowBackup="false"
-        android:label="Substratum Helper Service">
+        android:label="Substratum Service">
 
-        <service android:name="projekt.substratum.helper.SubstratumHelperService"
+        <service android:name="android.substratum.service.SubstratumHelperService"
                  android:enabled="true"
                  android:exported="true">
             <intent-filter>
-                <action android:name="projekt.substratum.helper.SubstratumHelperService" />
+                <action android:name="android.substratum.service.SubstratumHelperService" />
             </intent-filter>
         </service>
 
diff --git a/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java b/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
similarity index 98%
rename from packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
rename to packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
index 09bb31d545b..fe0b5542164 100644
--- a/packages/SubstratumHelperService/src/projekt/substratum/helper/SubstratumHelperService.java
+++ b/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package projekt.substratum.helper;
+package android.substratum.service;
 
 import android.app.Service;
 import android.content.Intent;
@@ -30,7 +30,7 @@
 import java.io.File;
 
 public class SubstratumHelperService extends Service {
-    private static final String TAG = "SubstratumHelperService";
+    private static final String TAG = "SubstratumService";
 
     private final File EXTERNAL_CACHE_DIR =
             new File(Environment.getExternalStorageDirectory(), ".substratum");
diff --git a/services/core/java/com/android/server/substratum/SubstratumService.java b/services/core/java/com/android/server/substratum/SubstratumService.java
index c8b1214097e..5d3e1c61a26 100644
--- a/services/core/java/com/android/server/substratum/SubstratumService.java
+++ b/services/core/java/com/android/server/substratum/SubstratumService.java
@@ -211,8 +211,8 @@ public void onSwitchUser(final int newUserId) {
 
     private void waitForHelperConnection() {
         if (mHelperService == null) {
-            Intent intent = new Intent("projekt.substratum.helper.SubstratumHelperService");
-            intent.setPackage("projekt.substratum.helper");
+            Intent intent = new Intent("android.substratum.service.SubstratumHelperService");
+            intent.setPackage("android.substratum.service");
             mContext.bindServiceAsUser(intent, mHelperConnection,
                     Context.BIND_AUTO_CREATE, UserHandle.SYSTEM);
         }

From 996c90051a36fbf3f027f538f3aceda3a4d602ae Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:34:59 +0000
Subject: [PATCH 07/41] Revert "base: modify/define custom overlay management"

This reverts commit 005ac3b41c1994464af639eed01701a9fa68620d.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../substratum/ISubstratumService.aidl        | 25 -------------------
 core/jni/fd_utils.cpp                         |  4 +--
 libs/androidfw/AssetManager.cpp               |  3 +--
 .../include/androidfw/AssetManager.h          |  1 -
 .../SubstratumService/AndroidManifest.xml     |  1 -
 .../server/om/OverlayManagerService.java      |  2 ++
 .../server/pm/PackageManagerService.java      | 12 ---------
 .../server/substratum/SubstratumService.java  | 21 +---------------
 8 files changed, 5 insertions(+), 64 deletions(-)

diff --git a/core/java/android/content/substratum/ISubstratumService.aidl b/core/java/android/content/substratum/ISubstratumService.aidl
index 04b65262a32..da71ba326db 100644
--- a/core/java/android/content/substratum/ISubstratumService.aidl
+++ b/core/java/android/content/substratum/ISubstratumService.aidl
@@ -140,30 +140,5 @@ interface ISubstratumService {
      *         requested user, an empty map is returned.
      */
     Map getAllOverlays(in int uid);
-
-    /**
-     * Request that an overlay package be enabled or disabled when possible to
-     * do so.
-     *
-     * It is always possible to disable an overlay, but due to technical and
-     * security reasons it may not always be possible to enable an overlay. An
-     * example of the latter is when the related target package is not
-     * installed. If the technical obstacle is later overcome, the overlay is
-     * automatically enabled at that point in time.
-     *
-     * An enabled overlay is a part of target package's resources, i.e. it will
-     * be part of any lookups performed via {@link android.content.res.Resources}
-     * and {@link android.content.res.AssetManager}. A disabled overlay will no
-     * longer affect the resources of the target package. If the target is
-     * currently running, its outdated resources will be replaced by new ones.
-     * This happens the same way as when an application enters or exits split
-     * window mode.
-     *
-     * @param packageName The name of the overlay package.
-     * @param enable true to enable the overlay, false to disable it.
-     * @param userId The user for which to change the overlay.
-     * @return true if the system successfully registered the request, false otherwise.
-     */
-    boolean setEnabled(in String packageName, in boolean enable, in int userId);
 }
 
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index ec07daa4c8c..c5904e0e9e5 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -87,15 +87,13 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
   static const char* kOverlaySubdir = "/system/vendor/overlay-subdir/";
   static const char* kSystemProductOverlayDir = "/system/product/overlay/";
   static const char* kProductOverlayDir = "/product/overlay";
-  static const char* kThemeOverlayDir = "/data/system/theme";
   static const char* kApkSuffix = ".apk";
 
   if ((android::base::StartsWith(path, kOverlayDir)
        || android::base::StartsWith(path, kOverlaySubdir)
        || android::base::StartsWith(path, kVendorOverlayDir)
        || android::base::StartsWith(path, kSystemProductOverlayDir)
-       || android::base::StartsWith(path, kProductOverlayDir)
-       || android::base::StartsWith(path, kThemeOverlayDir))
+       || android::base::StartsWith(path, kProductOverlayDir))
       && android::base::EndsWith(path, kApkSuffix)
       && path.find("/../") == std::string::npos) {
     return true;
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index 061e6c2a038..fc625bbaf72 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -73,9 +73,8 @@ static volatile int32_t gCount = 0;
 const char* AssetManager::RESOURCES_FILENAME = "resources.arsc";
 const char* AssetManager::IDMAP_BIN = "/system/bin/idmap";
 const char* AssetManager::OVERLAY_DIR = "/vendor/overlay";
-const char* AssetManager::THEME_OVERLAY_DIR = "/data/system/theme";
 const char* AssetManager::PRODUCT_OVERLAY_DIR = "/product/overlay";
-const char* AssetManager::OVERLAY_THEME_DIR_PROPERTY = "../../data/system/theme";
+const char* AssetManager::OVERLAY_THEME_DIR_PROPERTY = "ro.boot.vendor.overlay.theme";
 const char* AssetManager::TARGET_PACKAGE_NAME = "android";
 const char* AssetManager::TARGET_APK_PATH = "/system/framework/framework-res.apk";
 const char* AssetManager::IDMAP_DIR = "/data/resource-cache";
diff --git a/libs/androidfw/include/androidfw/AssetManager.h b/libs/androidfw/include/androidfw/AssetManager.h
index 115ae0b735c..08da7319de8 100644
--- a/libs/androidfw/include/androidfw/AssetManager.h
+++ b/libs/androidfw/include/androidfw/AssetManager.h
@@ -60,7 +60,6 @@ class AssetManager : public AAssetManager {
     static const char* RESOURCES_FILENAME;
     static const char* IDMAP_BIN;
     static const char* OVERLAY_DIR;
-    static const char* THEME_OVERLAY_DIR;
     static const char* PRODUCT_OVERLAY_DIR;
     /*
      * If OVERLAY_THEME_DIR_PROPERTY is set, search for runtime resource overlay
diff --git a/packages/SubstratumService/AndroidManifest.xml b/packages/SubstratumService/AndroidManifest.xml
index 4a78d555d39..06341d2d0fc 100644
--- a/packages/SubstratumService/AndroidManifest.xml
+++ b/packages/SubstratumService/AndroidManifest.xml
@@ -26,7 +26,6 @@
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
     <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
     <uses-feature name="projekt.substratum.theme" required="true"/>
 
diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index 0a82f9349ba..c7387018900 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -539,6 +539,7 @@ public OverlayInfo getOverlayInfo(@Nullable final String packageName,
         @Override
         public boolean setEnabled(@Nullable final String packageName, final boolean enable,
                 int userId) throws RemoteException {
+            enforceChangeOverlayPackagesPermission("setEnabled");
             userId = handleIncomingUser(userId, "setEnabled");
             if (packageName == null) {
                 return false;
@@ -557,6 +558,7 @@ public boolean setEnabled(@Nullable final String packageName, final boolean enab
         @Override
         public boolean setEnabledExclusive(@Nullable final String packageName, final boolean enable,
                 int userId) throws RemoteException {
+            enforceChangeOverlayPackagesPermission("setEnabled");
             userId = handleIncomingUser(userId, "setEnabled");
             if (packageName == null || !enable) {
                 return false;
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index e772504ad9d..95ad9c44724 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -476,7 +476,6 @@ public class PackageManagerService extends IPackageManager.Stub
     static final int SCAN_AS_OEM = 1<<19;
     static final int SCAN_AS_VENDOR = 1<<20;
     static final int SCAN_AS_PRODUCT = 1<<21;
-    static final int SCAN_AS_THEME = 1<<22;
 
     @IntDef(flag = true, prefix = { "SCAN_" }, value = {
             SCAN_NO_DEX,
@@ -585,8 +584,6 @@ public class PackageManagerService extends IPackageManager.Stub
 
     private static final String PRODUCT_OVERLAY_DIR = "/product/overlay";
 
-    private static final String THEME_OVERLAY_DIR = "/data/system/theme";
-
     /** Canonical intent used to identify what counts as a "web browser" app */
     private static final Intent sBrowserIntent;
     static {
@@ -2656,15 +2653,6 @@ public void onDefaultRuntimePermissionsGranted(int userId) {
                     | SCAN_AS_SYSTEM
                     | SCAN_AS_PRODUCT,
                     0);
-            scanDirTracedLI(new File(THEME_OVERLAY_DIR),
-                    mDefParseFlags
-                    | PackageParser.PARSE_IS_SYSTEM_DIR,
-                    scanFlags
-                    | SCAN_AS_SYSTEM
-                    | SCAN_AS_PRODUCT
-                    | SCAN_AS_THEME,
-                    0);
-
 
             mParallelPackageParserCallback.findStaticOverlayPackages();
 
diff --git a/services/core/java/com/android/server/substratum/SubstratumService.java b/services/core/java/com/android/server/substratum/SubstratumService.java
index 5d3e1c61a26..22444d86b4c 100644
--- a/services/core/java/com/android/server/substratum/SubstratumService.java
+++ b/services/core/java/com/android/server/substratum/SubstratumService.java
@@ -70,7 +70,6 @@
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import static android.os.Binder.getCallingUid;
 
 public final class SubstratumService extends SystemService {
 
@@ -634,25 +633,7 @@ public Map getAllOverlays(int uid) {
                 return null;
             }
         }
-
-        @Override
-        public boolean setEnabled(final String packageName, final boolean enable,
-                int userId) throws RemoteException {
-            userId = Binder.getCallingUid();
-            if (packageName == null) {
-                return false;
-            }
-            log("setEnabled - File name = \'" + packageName + "\'");
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                synchronized (mLock) {
-                    return mOm.setEnabled(packageName, enable, UserHandle.USER_SYSTEM);
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-   };
+    };
 
     private Context getAppContext(String packageName) {
         Context ctx = null;

From 3a5de748f76d97943ab131cbac9daaaef349e062 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:35:24 +0000
Subject: [PATCH 08/41] Revert "SubstratumService: unify permissions"

This reverts commit 6228e45cf18558e9c246ca9a011528df03ae8379.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 data/etc/Android.mk                           |  8 ------
 data/etc/projekt.substratum.theme.xml         |  8 +++---
 data/etc/substratum_theme.xml                 | 25 -------------------
 packages/SubstratumService/Android.mk         |  5 +---
 .../SubstratumService/AndroidManifest.xml     |  1 -
 5 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 data/etc/substratum_theme.xml

diff --git a/data/etc/Android.mk b/data/etc/Android.mk
index f94ec844d8e..89c10d92620 100644
--- a/data/etc/Android.mk
+++ b/data/etc/Android.mk
@@ -55,11 +55,3 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := substratum_theme.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
diff --git a/data/etc/projekt.substratum.theme.xml b/data/etc/projekt.substratum.theme.xml
index eb14a3d4e1c..8ac5a9af302 100644
--- a/data/etc/projekt.substratum.theme.xml
+++ b/data/etc/projekt.substratum.theme.xml
@@ -16,8 +16,10 @@
 -->
 
 <permissions>
-    <privapp-permissions package="android.substratum.service">
-        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-    </privapp-permissions>
+    <!-- Limitation permission to block out themes from being visible on stock
+         AOSP, or non-OMS devices. -->
+
+    <!-- This is an alias for projekt.substratum.theme -->
+    <feature name="projekt.substratum.theme" />
 
 </permissions>
diff --git a/data/etc/substratum_theme.xml b/data/etc/substratum_theme.xml
deleted file mode 100644
index 8ac5a9af302..00000000000
--- a/data/etc/substratum_theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018 Project Substratum
-
-    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.
--->
-
-<permissions>
-    <!-- Limitation permission to block out themes from being visible on stock
-         AOSP, or non-OMS devices. -->
-
-    <!-- This is an alias for projekt.substratum.theme -->
-    <feature name="projekt.substratum.theme" />
-
-</permissions>
diff --git a/packages/SubstratumService/Android.mk b/packages/SubstratumService/Android.mk
index 28eeaf1acc1..2271a46566f 100644
--- a/packages/SubstratumService/Android.mk
+++ b/packages/SubstratumService/Android.mk
@@ -21,10 +21,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_REQUIRED_MODULES := \
-      projekt.substratum.theme.xml \
-      substratum_theme.xml
-
+LOCAL_REQUIRED_MODULES := projekt.substratum.theme.xml
 LOCAL_PACKAGE_NAME := SubstratumService
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
diff --git a/packages/SubstratumService/AndroidManifest.xml b/packages/SubstratumService/AndroidManifest.xml
index 06341d2d0fc..b2baf58d7f1 100644
--- a/packages/SubstratumService/AndroidManifest.xml
+++ b/packages/SubstratumService/AndroidManifest.xml
@@ -27,7 +27,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-    <uses-feature name="projekt.substratum.theme" required="true"/>
 
     <application
         android:allowBackup="false"

From e42d00212a12477c15e8a0b01a5b3fe051898ab4 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:35:54 +0000
Subject: [PATCH 09/41] Revert "SubstratumService: allow
 CHANGE_OVERLAY_PACKAGES permission"

This reverts commit db915695cfecce5dd99a832aeda174f28fc34996.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SubstratumService/AndroidManifest.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/SubstratumService/AndroidManifest.xml b/packages/SubstratumService/AndroidManifest.xml
index b2baf58d7f1..d899e1d2168 100644
--- a/packages/SubstratumService/AndroidManifest.xml
+++ b/packages/SubstratumService/AndroidManifest.xml
@@ -21,12 +21,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.substratum.service"
     android:sharedUserId="android.uid.system"
-    android:versionCode="2"
-    android:versionName="two" >
+    android:versionCode="1"
+    android:versionName="one" >
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
 
     <application
         android:allowBackup="false"

From 0cfd2359af014d8705f2e6e24419b44448c12655 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:38:38 +0000
Subject: [PATCH 10/41] Revert "base: Introduce SubstratumService"

This reverts commit 5251d7b6b3e003f7fd23b683d947de14dcfc4d82.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 Android.bp                                    |    2 -
 .../substratum/ISubstratumService.aidl        |  144 ---
 core/java/android/provider/Settings.java      |    7 -
 .../substratum/ISubstratumHelperService.aidl  |   23 -
 core/res/AndroidManifest.xml                  |    3 -
 data/etc/Android.mk                           |    8 -
 data/etc/projekt.substratum.theme.xml         |   25 -
 .../applications/ApplicationsState.java       |    1 +
 packages/SubstratumService/Android.mk         |   31 -
 .../SubstratumService/AndroidManifest.xml     |   44 -
 .../service/SubstratumHelperService.java      |  140 --
 packages/SystemUI/AndroidManifest.xml         |   10 -
 .../systemui/SoundRefreshReceiver.java        |   34 -
 .../systemui/SysuiRestartReceiver.java        |    9 +-
 .../keyguard/KeyguardViewMediator.java        |   18 -
 .../android/server/substratum/SoundUtils.java |  229 ----
 .../server/substratum/SubstratumService.java  | 1132 -----------------
 .../java/com/android/server/SystemServer.java |    6 -
 18 files changed, 2 insertions(+), 1864 deletions(-)
 delete mode 100644 core/java/android/content/substratum/ISubstratumService.aidl
 delete mode 100644 core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
 delete mode 100644 data/etc/projekt.substratum.theme.xml
 delete mode 100644 packages/SubstratumService/Android.mk
 delete mode 100644 packages/SubstratumService/AndroidManifest.xml
 delete mode 100644 packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
 delete mode 100644 packages/SystemUI/src/com/android/systemui/SoundRefreshReceiver.java
 delete mode 100644 services/core/java/com/android/server/substratum/SoundUtils.java
 delete mode 100644 services/core/java/com/android/server/substratum/SubstratumService.java

diff --git a/Android.bp b/Android.bp
index 07c80efc891..f3e0428585c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -146,7 +146,6 @@ java_library {
         "core/java/android/content/pm/dex/IArtManager.aidl",
         "core/java/android/content/pm/dex/ISnapshotRuntimeProfileCallback.aidl",
         "core/java/android/content/pm/permission/IRuntimePermissionPresenter.aidl",
-        "core/java/android/content/substratum/ISubstratumService.aidl",
         "core/java/android/database/IContentObserver.aidl",
         ":libcamera_client_aidl",
         ":libcamera_client_framework_aidl",
@@ -394,7 +393,6 @@ java_library {
         "core/java/com/android/internal/os/IShellCallback.aidl",
         "core/java/com/android/internal/statusbar/IStatusBar.aidl",
         "core/java/com/android/internal/statusbar/IStatusBarService.aidl",
-        "core/java/com/android/internal/substratum/ISubstratumHelperService.aidl",
         "core/java/com/android/internal/textservice/ISpellCheckerService.aidl",
         "core/java/com/android/internal/textservice/ISpellCheckerServiceCallback.aidl",
         "core/java/com/android/internal/textservice/ISpellCheckerSession.aidl",
diff --git a/core/java/android/content/substratum/ISubstratumService.aidl b/core/java/android/content/substratum/ISubstratumService.aidl
deleted file mode 100644
index da71ba326db..00000000000
--- a/core/java/android/content/substratum/ISubstratumService.aidl
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2018 Projekt Substratum
- *
- * 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.content.substratum;
-
-interface ISubstratumService {
-
-    /**
-     * Install a list of specified overlay packages
-     *
-     * @param paths Filled in with a list of path names for packages to be installed from.
-     */
-    void installOverlay(in List<String> paths);
-
-    /**
-     * Uninstall a list of specified overlay packages
-     *
-     * @param packages  Filled in with a list of path names for packages to be installed from.
-     * @param restartUi Flag to automatically restart the SystemUI.
-     */
-    void uninstallOverlay(in List<String> packages, boolean restartUi);
-
-    /**
-     * Switch the state of specified overlay packages
-     *
-     * @param packages  Filled in with a list of package names to be switched.
-     * @param enable    Whether to enable the specified overlays.
-     * @param restartUi Flag to automatically restart the SystemUI.
-     */
-    void switchOverlay(in List<String> packages, boolean enable, boolean restartUi);
-
-    /**
-     * Change the priority of a specified list of overlays
-     *
-     * @param packages  Filled in with a list of package names to be reordered.
-     * @param restartUi Flag to automatically restart the SystemUI.
-     */
-    void setPriority(in List<String> packages, boolean restartUi);
-
-    /**
-     * Restart SystemUI
-     */
-    void restartSystemUI();
-
-    /**
-     * Copy Method
-     *
-     * @param source        Path of the source file.
-     * @param destination   Path of the source file to be copied to.
-     */
-    void copy(String source, String destination);
-
-    /**
-     * Move Method
-     *
-     * @param source        Path of the source file.
-     * @param destination   Path of the source file to be moved to.
-     */
-    void move(String source, String destination);
-
-    /**
-     * Create Directory Method
-     *
-     * @param destination   Path of the created destination folder.
-     */
-    void mkdir(String destination);
-
-    /**
-     * Delete Directory Method
-     *
-     * @param destination   Path of the directory to be deleted.
-     * @param withParent    Flag to automatically delete the folder encompassing the folder.
-     */
-    void deleteDirectory(String directory, boolean withParent);
-
-    /**
-     * Apply a specified bootanimation
-     *
-     * @param name  Path to extract the bootanimation archive from.
-     */
-    void applyBootanimation(String name);
-
-    /**
-     * Apply a specified font pack
-     *
-     * @param name  Path to extract the font archive from.
-     */
-    void applyFonts(String pid, String fileName);
-
-    /**
-     * Apply a specified sound pack
-     *
-     * @param name  Path to extract the sounds archive from.
-     */
-    void applySounds(String pid, String fileName);
-
-    /**
-     * Profile Applicator
-     *
-     * @param enable     Filled in with a list of package names to be enabled.
-     * @param disable    Filled in with a list of package names to be disabled.
-     * @param name       Name of the profile to be applied.
-     * @param restartUi  Flag to automatically restart the SystemUI.
-     */
-    void applyProfile(in List<String> enable, in List<String> disable, String name,
-            boolean restartUi);
-
-    /**
-     * Apply a specified shutdownanimation
-     *
-     * @param name  Path to extract the shutdown archive from.
-     *              Use null to clear applied custom shutdown
-     */
-    void applyShutdownAnimation(String name);
-
-    /**
-     * Returns information about all installed overlay packages for the
-     * specified user. If there are no installed overlay packages for this user,
-     * an empty map is returned (i.e. null is never returned). The returned map is a
-     * mapping of target package names to lists of overlays. Each list for a
-     * given target package is sorted in priority order, with the overlay with
-     * the highest priority at the end of the list.
-     *
-     * @param uid The user to get the OverlayInfos for.
-     * @return A Map<String, List<OverlayInfo>> with target package names
-     *         mapped to lists of overlays; if no overlays exist for the
-     *         requested user, an empty map is returned.
-     */
-    Map getAllOverlays(in int uid);
-}
-
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a37b7dea8e2..05bc6beca60 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10610,13 +10610,6 @@ public boolean validate(@Nullable String value) {
          */
         public static final String AMBIENT_VISUALIZER_ENABLED = "ambient_visualizer";
 
-        /**
-         * Force authorize Substratum (or equivalent) frontend calling packages by ThemeInterfacer
-         * The value is boolean (1 or 0).
-         * @hide
-         */
-        public static final String FORCE_AUTHORIZE_SUBSTRATUM_PACKAGES = "force_authorize_substratum_packages";
-
 	    /**
          * Hide lockscreen shortcuts on secure lock screens
          *
diff --git a/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl b/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
deleted file mode 100644
index 7d6ac0aa176..00000000000
--- a/core/java/com/android/internal/substratum/ISubstratumHelperService.aidl
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2018 Projekt Substratum
- *
- * 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 com.android.internal.substratum;
-
-oneway interface ISubstratumHelperService {
-    void applyBootAnimation();
-    void applyShutdownAnimation();
-    void applyProfile(in String name);
-}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index fc968f848cb..420fffbb712 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -608,9 +608,6 @@
     <!-- For IdleController -->
     <protected-broadcast android:name="android.intent.action.DOCK_IDLE" />
     <protected-broadcast android:name="android.intent.action.DOCK_ACTIVE" />
-    <protected-broadcast android:name="projekt.substratum.APP_CRASHED" />
-    <protected-broadcast android:name="com.android.systemui.action.RESTART_THEME" />
-    <protected-broadcast android:name="com.android.systemui.action.REFRESH_SOUND" />
 
     <!-- Used for long press power torch feature - automatic turn off on timeout -->
     <protected-broadcast android:name="com.android.server.policy.PhoneWindowManager.ACTION_TORCH_OFF" />
diff --git a/data/etc/Android.mk b/data/etc/Android.mk
index 89c10d92620..936ad22d4fc 100644
--- a/data/etc/Android.mk
+++ b/data/etc/Android.mk
@@ -47,11 +47,3 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := projekt.substratum.theme.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
diff --git a/data/etc/projekt.substratum.theme.xml b/data/etc/projekt.substratum.theme.xml
deleted file mode 100644
index 8ac5a9af302..00000000000
--- a/data/etc/projekt.substratum.theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018 Project Substratum
-
-    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.
--->
-
-<permissions>
-    <!-- Limitation permission to block out themes from being visible on stock
-         AOSP, or non-OMS devices. -->
-
-    <!-- This is an alias for projekt.substratum.theme -->
-    <feature name="projekt.substratum.theme" />
-
-</permissions>
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 9c94a574742..78d17dbe1de 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -1631,6 +1631,7 @@ public boolean filterApp(AppEntry entry) {
             return false;
         }
     };
+
     public static final AppFilter FILTER_DISABLED = new AppFilter() {
         @Override
         public void init() {
diff --git a/packages/SubstratumService/Android.mk b/packages/SubstratumService/Android.mk
deleted file mode 100644
index 2271a46566f..00000000000
--- a/packages/SubstratumService/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2018 Projekt Substratum
-#
-# 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_REQUIRED_MODULES := projekt.substratum.theme.xml
-LOCAL_PACKAGE_NAME := SubstratumService
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-include $(BUILD_PACKAGE)
-
diff --git a/packages/SubstratumService/AndroidManifest.xml b/packages/SubstratumService/AndroidManifest.xml
deleted file mode 100644
index d899e1d2168..00000000000
--- a/packages/SubstratumService/AndroidManifest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (c) 2018 Projekt Substratum
- *
- * 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.
- */
--->
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.substratum.service"
-    android:sharedUserId="android.uid.system"
-    android:versionCode="1"
-    android:versionName="one" >
-
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <application
-        android:allowBackup="false"
-        android:label="Substratum Service">
-
-        <service android:name="android.substratum.service.SubstratumHelperService"
-                 android:enabled="true"
-                 android:exported="true">
-            <intent-filter>
-                <action android:name="android.substratum.service.SubstratumHelperService" />
-            </intent-filter>
-        </service>
-
-    </application>
-
-</manifest>
diff --git a/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java b/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
deleted file mode 100644
index fe0b5542164..00000000000
--- a/packages/SubstratumService/src/android/substratum/service/SubstratumHelperService.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2018 Projekt Substratum
- *
- * 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.substratum.service;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.Environment;
-import android.os.FileUtils;
-import android.os.IBinder;
-import android.os.Process;
-import android.os.SELinux;
-import android.util.Log;
-
-import com.android.internal.substratum.ISubstratumHelperService;
-
-import java.io.File;
-
-public class SubstratumHelperService extends Service {
-    private static final String TAG = "SubstratumService";
-
-    private final File EXTERNAL_CACHE_DIR =
-            new File(Environment.getExternalStorageDirectory(), ".substratum");
-    private final File SYSTEM_THEME_DIR = new File(Environment.getDataSystemDirectory(), "theme");
-
-    ISubstratumHelperService mISubstratumHelperService = new ISubstratumHelperService.Stub() {
-        @Override
-        public void applyBootAnimation() {
-            if (!isAuthorized(Binder.getCallingUid())) return;
-
-            File src = new File(EXTERNAL_CACHE_DIR, "bootanimation.zip");
-            File dst = new File(SYSTEM_THEME_DIR, "bootanimation.zip");
-            int perms = FileUtils.S_IRWXU | FileUtils.S_IRGRP | FileUtils.S_IROTH;
-
-            if (dst.exists()) dst.delete();
-            FileUtils.copyFile(src, dst);
-            FileUtils.setPermissions(dst, perms, -1, -1);
-            SELinux.restorecon(dst);
-            src.delete();
-        }
-
-        @Override
-        public void applyShutdownAnimation() {
-            if (!isAuthorized(Binder.getCallingUid())) return;
-
-            File src = new File(EXTERNAL_CACHE_DIR, "shutdownanimation.zip");
-            File dst = new File(SYSTEM_THEME_DIR, "shutdownanimation.zip");
-            int perms = FileUtils.S_IRWXU | FileUtils.S_IRGRP | FileUtils.S_IROTH;
-
-            if (dst.exists()) dst.delete();
-            FileUtils.copyFile(src, dst);
-            FileUtils.setPermissions(dst, perms, -1, -1);
-            SELinux.restorecon(dst);
-            src.delete();
-        }
-
-        @Override
-        public void applyProfile(String name) {
-            if (!isAuthorized(Binder.getCallingUid())) return;
-
-            FileUtils.deleteContents(SYSTEM_THEME_DIR);
-
-            File profileDir = new File(Environment.getExternalStorageDirectory().getAbsolutePath() +
-                    "/substratum/profiles/" + name + "/theme");
-            if (profileDir.exists()) {
-                File profileFonts = new File(profileDir, "fonts");
-                if (profileFonts.exists()) {
-                    File dst = new File(SYSTEM_THEME_DIR, "fonts");
-                    copyDir(profileFonts, dst);
-                }
-
-                File profileSounds = new File(profileDir, "audio");
-                if (profileSounds.exists()) {
-                    File dst = new File(SYSTEM_THEME_DIR, "audio");
-                    copyDir(profileSounds, dst);
-                }
-
-                File profileBootAnimation = new File(profileDir, "bootanimation.zip");
-                if (profileBootAnimation.exists()) {
-                    File dst = new File(SYSTEM_THEME_DIR, "bootanimation.zip");
-                    FileUtils.copyFile(profileBootAnimation, dst);
-                    int perms = FileUtils.S_IRWXU | FileUtils.S_IRGRP | FileUtils.S_IROTH;
-                    FileUtils.setPermissions(dst, perms, -1, -1);
-                }
-
-                File profileShutdownAnimation = new File(profileDir, "shutdownanimation.zip");
-                if (profileShutdownAnimation.exists()) {
-                    File dst = new File(SYSTEM_THEME_DIR, "shutdownanimation.zip");
-                    FileUtils.copyFile(profileShutdownAnimation, dst);
-                    int perms = FileUtils.S_IRWXU | FileUtils.S_IRGRP | FileUtils.S_IROTH;
-                    FileUtils.setPermissions(dst, perms, -1, -1);
-                }
-
-                SELinux.restorecon(SYSTEM_THEME_DIR);
-            }
-        }
-
-        private boolean isAuthorized(int uid) {
-            return Process.SYSTEM_UID == uid;
-        }
-
-        private boolean copyDir(File src, File dst) {
-            File[] files = src.listFiles();
-            boolean success = true;
-
-            if (files != null) {
-                for (File file : files) {
-                    File newFile = new File(dst, file.getName());
-                    if (file.isDirectory()) {
-                        success &= copyDir(file, newFile);
-                    } else {
-                        success &= FileUtils.copyFile(file, newFile);
-                    }
-                }
-            } else {
-                // not a directory
-                success = false;
-            }
-            return success;
-        }
-    };
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mISubstratumHelperService.asBinder();
-    }
-}
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 77caced598d..90ea2c1196f 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -318,16 +318,6 @@
 
                 <data android:scheme="package" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="com.android.systemui.action.RESTART_THEME" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name=".SoundRefreshReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.android.systemui.action.REFRESH_SOUND" />
-            </intent-filter>
         </receiver>
 
         <!-- started from PhoneWindowManager
diff --git a/packages/SystemUI/src/com/android/systemui/SoundRefreshReceiver.java b/packages/SystemUI/src/com/android/systemui/SoundRefreshReceiver.java
deleted file mode 100644
index 2d9a899ea63..00000000000
--- a/packages/SystemUI/src/com/android/systemui/SoundRefreshReceiver.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2018 Projekt Substratum
- *
- * 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 com.android.systemui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.systemui.SystemUIApplication;
-import com.android.systemui.keyguard.KeyguardViewMediator;
-
-public class SoundRefreshReceiver extends BroadcastReceiver {
-    public static String ACTION = "com.android.systemui.action.REFRESH_SOUND";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (ACTION.equals(intent.getAction())) {
-            ((SystemUIApplication) context.getApplicationContext())
-                    .getComponent(KeyguardViewMediator.class).refreshSounds();
-        }
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/SysuiRestartReceiver.java b/packages/SystemUI/src/com/android/systemui/SysuiRestartReceiver.java
index 75de186415a..cdeef2fbfad 100644
--- a/packages/SystemUI/src/com/android/systemui/SysuiRestartReceiver.java
+++ b/packages/SystemUI/src/com/android/systemui/SysuiRestartReceiver.java
@@ -25,19 +25,12 @@
 public class SysuiRestartReceiver extends BroadcastReceiver {
 
     public static String ACTION = "com.android.systemui.action.RESTART";
-    public static String ACTION_THEME = "com.android.systemui.action.RESTART_THEME";
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        boolean runAction = ACTION.equals(intent.getAction());
-        boolean runThemeAction = ACTION_THEME.equals(intent.getAction());
-
-        if (runAction) {
+        if (ACTION.equals(intent.getAction())) {
             String pkg = intent.getData().toString().substring(10);
             NotificationManager.from(context).cancel(pkg, SystemMessage.NOTE_PLUGIN);
-        }
-
-        if (runAction || runThemeAction) {
             Process.killProcess(Process.myPid());
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 8e8cdb46d90..f8d5cb19a3d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -2262,23 +2262,5 @@ public IKeyguardDismissCallback getCallback() {
         public CharSequence getMessage() {
             return mMessage;
         }
-   }
-
-    public void refreshSounds() {
-        ContentResolver cr = mContext.getContentResolver();
-        String soundPath = Settings.Global.getString(cr, Settings.Global.LOCK_SOUND);
-        if (soundPath != null) {
-            mLockSoundId = mLockSounds.load(soundPath, 1);
-        }
-        if (soundPath == null || mLockSoundId == 0) {
-            Log.w(TAG, "failed to load lock sound from " + soundPath);
-        }
-        soundPath = Settings.Global.getString(cr, Settings.Global.UNLOCK_SOUND);
-        if (soundPath != null) {
-            mUnlockSoundId = mLockSounds.load(soundPath, 1);
-        }
-        if (soundPath == null || mUnlockSoundId == 0) {
-            Log.w(TAG, "failed to load unlock sound from " + soundPath);
-        }
     }
 }
diff --git a/services/core/java/com/android/server/substratum/SoundUtils.java b/services/core/java/com/android/server/substratum/SoundUtils.java
deleted file mode 100644
index 4b0acbf4332..00000000000
--- a/services/core/java/com/android/server/substratum/SoundUtils.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (C) 2018 Projekt Substratum
- *
- * 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 com.android.server.substratum;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteConstraintException;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.provider.MediaStore;
-import android.provider.Settings;
-import android.util.Log;
-
-import java.io.File;
-import java.util.Arrays;
-
-public class SoundUtils {
-    private static final String TAG = "SubstratumService";
-    private static final String SYSTEM_MEDIA_PATH = "/system/media/audio";
-    private static final String SYSTEM_ALARMS_PATH =
-            SYSTEM_MEDIA_PATH + File.separator + "alarms";
-    private static final String SYSTEM_RINGTONES_PATH =
-            SYSTEM_MEDIA_PATH + File.separator + "ringtones";
-    private static final String SYSTEM_NOTIFICATIONS_PATH =
-            SYSTEM_MEDIA_PATH + File.separator + "notifications";
-    private static final String MEDIA_CONTENT_URI = "content://media/internal/audio/media";
-
-    private static void updateGlobalSettings(ContentResolver resolver, String uri, String val) {
-        Settings.Global.putStringForUser(resolver, uri, val, UserHandle.USER_SYSTEM);
-    }
-
-    public static boolean setUISounds(ContentResolver resolver, String sound_name,
-            String location) {
-        if (allowedUISound(sound_name)) {
-            updateGlobalSettings(resolver, sound_name, location);
-            return true;
-        }
-
-        return false;
-    }
-
-    public static void setDefaultUISounds(ContentResolver resolver, String sound_name,
-                                          String sound_file) {
-        updateGlobalSettings(resolver, sound_name, "/system/media/audio/ui/" + sound_file);
-    }
-
-    // This string array contains all the SystemUI acceptable sound files
-    private static Boolean allowedUISound(String targetValue) {
-        String[] allowed_themable = {
-                "lock_sound",
-                "unlock_sound"
-        };
-
-        return Arrays.asList(allowed_themable).contains(targetValue);
-    }
-
-    private static String getDefaultAudiblePath(int type) {
-        final String name;
-        final String path;
-
-        switch (type) {
-            case RingtoneManager.TYPE_ALARM:
-                name = SystemProperties.get("ro.config.alarm_alert");
-                path = name != null ? SYSTEM_ALARMS_PATH + File.separator + name : null;
-                break;
-            case RingtoneManager.TYPE_NOTIFICATION:
-                name = SystemProperties.get("ro.config.notification_sound");
-                path = name != null ? SYSTEM_NOTIFICATIONS_PATH + File.separator + name : null;
-                break;
-            case RingtoneManager.TYPE_RINGTONE:
-                name = SystemProperties.get("ro.config.ringtone");
-                path = name != null ? SYSTEM_RINGTONES_PATH + File.separator + name : null;
-                break;
-            default:
-                path = null;
-                break;
-        }
-
-        return path;
-    }
-
-    public static boolean setAudible(Context context, File ringtone, int type, String name) {
-        final String path = ringtone.getAbsolutePath();
-        final String mimeType = name.endsWith(".ogg") ? "application/ogg" : "application/mp3";
-
-        ContentValues values = new ContentValues();
-        values.put(MediaStore.MediaColumns.DATA, path);
-        values.put(MediaStore.MediaColumns.TITLE, name);
-        values.put(MediaStore.MediaColumns.MIME_TYPE, mimeType);
-        values.put(MediaStore.MediaColumns.SIZE, ringtone.length());
-        values.put(MediaStore.Audio.Media.IS_RINGTONE, type == RingtoneManager.TYPE_RINGTONE);
-        values.put(MediaStore.Audio.Media.IS_NOTIFICATION,
-                type == RingtoneManager.TYPE_NOTIFICATION);
-        values.put(MediaStore.Audio.Media.IS_ALARM, type == RingtoneManager.TYPE_ALARM);
-        values.put(MediaStore.Audio.Media.IS_MUSIC, false);
-
-        Uri uri = MediaStore.Audio.Media.getContentUriForPath(path);
-        Uri newUri = null;
-        Cursor c = context.getContentResolver().query(uri,
-                new String[]{ MediaStore.MediaColumns._ID },
-                MediaStore.MediaColumns.DATA + "='" + path + "'",
-                null, null);
-
-        if (c != null && c.getCount() > 0) {
-            c.moveToFirst();
-            String id = String.valueOf(c.getLong(0));
-            c.close();
-
-            newUri = Uri.withAppendedPath(Uri.parse(MEDIA_CONTENT_URI), id);
-            try {
-                context.getContentResolver().update(uri, values,
-                        MediaStore.MediaColumns._ID + "=" + id, null);
-            } catch (SQLiteConstraintException e) {
-                // intentionally left empty
-            }
-        }
-
-        if (newUri == null) {
-            newUri = context.getContentResolver().insert(uri, values);
-        }
-
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(context, type, newUri);
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to apply audible", e);
-            return false;
-        }
-
-        return true;
-    }
-
-    public static boolean setUIAudible(Context context, File ringtone_file, int type, String name) {
-        final String path = ringtone_file.getAbsolutePath();
-        final String path_clone = "/system/media/audio/ui/" + name + ".ogg";
-
-        ContentValues values = new ContentValues();
-        values.put(MediaStore.MediaColumns.DATA, path);
-        values.put(MediaStore.MediaColumns.TITLE, name);
-        values.put(MediaStore.MediaColumns.MIME_TYPE, "application/ogg");
-        values.put(MediaStore.MediaColumns.SIZE, ringtone_file.length());
-        values.put(MediaStore.Audio.Media.IS_RINGTONE, false);
-        values.put(MediaStore.Audio.Media.IS_NOTIFICATION, false);
-        values.put(MediaStore.Audio.Media.IS_ALARM, false);
-        values.put(MediaStore.Audio.Media.IS_MUSIC, true);
-
-        Uri uri = MediaStore.Audio.Media.getContentUriForPath(path);
-        Uri newUri = null;
-        Cursor c = context.getContentResolver().query(uri,
-                new String[]{ MediaStore.MediaColumns._ID },
-                MediaStore.MediaColumns.DATA + "='" + path_clone + "'",
-                null, null);
-
-        if (c != null && c.getCount() > 0) {
-            c.moveToFirst();
-            String id = String.valueOf(c.getLong(0));
-            c.close();
-
-            newUri = Uri.withAppendedPath(Uri.parse(MEDIA_CONTENT_URI), id);
-            try {
-                context.getContentResolver().update(uri, values,
-                        MediaStore.MediaColumns._ID + "=" + id, null);
-            } catch (SQLiteConstraintException e) {
-                // intentionally left empty
-            }
-        }
-
-        if (newUri == null) {
-            newUri = context.getContentResolver().insert(uri, values);
-        }
-
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(context, type, newUri);
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to apply ui audible", e);
-            return false;
-        }
-
-        return true;
-    }
-
-    public static boolean setDefaultAudible(Context context, int type) {
-        final String audiblePath = getDefaultAudiblePath(type);
-        if (audiblePath == null) {
-            return false;
-        }
-
-        Uri uri = MediaStore.Audio.Media.getContentUriForPath(audiblePath);
-        Cursor c = context.getContentResolver().query(uri,
-                new String[]{ MediaStore.MediaColumns._ID },
-                MediaStore.MediaColumns.DATA + "='" + audiblePath + "'",
-                null, null);
-
-        if (c != null && c.getCount() > 0) {
-            c.moveToFirst();
-            String id = String.valueOf(c.getLong(0));
-            c.close();
-
-            uri = Uri.withAppendedPath(Uri.parse(MEDIA_CONTENT_URI), id);
-        }
-
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(context, type, uri);
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to apply default audible", e);
-            return false;
-        }
-
-        return true;
-    }
-}
-
diff --git a/services/core/java/com/android/server/substratum/SubstratumService.java b/services/core/java/com/android/server/substratum/SubstratumService.java
deleted file mode 100644
index 22444d86b4c..00000000000
--- a/services/core/java/com/android/server/substratum/SubstratumService.java
+++ /dev/null
@@ -1,1132 +0,0 @@
-/*
- * Copyright (C) 2018 Projekt Development
- *
- * 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 com.android.server.substratum;
-
-import android.annotation.NonNull;
-import android.app.AppGlobals;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.om.IOverlayManager;
-import android.content.om.OverlayInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageDeleteObserver;
-import android.content.pm.IPackageInstallObserver2;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.Signature;
-import android.content.res.AssetManager;
-import android.content.ServiceConnection;
-import android.content.substratum.ISubstratumService;
-import android.database.ContentObserver;
-import android.media.AudioManager;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.FileUtils;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.SELinux;
-import android.os.ServiceManager;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.substratum.ISubstratumHelperService;
-import com.android.server.SystemService;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.Throwable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public final class SubstratumService extends SystemService {
-
-    private static final String TAG = "SubstratumService";
-    private static final String SUBSTRATUM_PACKAGE = "projekt.substratum";
-    private static final boolean DEBUG = false;
-
-    private static final Signature SUBSTRATUM_SIGNATURE = new Signature(""
-            + "308202eb308201d3a003020102020411c02f2f300d06092a864886f70d01010b050030263124302206"
-            + "03550403131b5375627374726174756d20446576656c6f706d656e74205465616d301e170d31363037"
-            + "30333032333335385a170d3431303632373032333335385a3026312430220603550403131b53756273"
-            + "74726174756d20446576656c6f706d656e74205465616d30820122300d06092a864886f70d01010105"
-            + "000382010f003082010a02820101008855626336f645a335aa5d40938f15db911556385f72f72b5f8b"
-            + "ad01339aaf82ae2d30302d3f2bba26126e8da8e76a834e9da200cdf66d1d5977c90a4e4172ce455704"
-            + "a22bbe4a01b08478673b37d23c34c8ade3ec040a704da8570d0a17fce3c7397ea63ebcde3a2a3c7c5f"
-            + "983a163e4cd5a1fc80c735808d014df54120e2e5708874739e22e5a22d50e1c454b2ae310b480825ab"
-            + "3d877f675d6ac1293222602a53080f94e4a7f0692b627905f69d4f0bb1dfd647e281cc0695e0733fa3"
-            + "efc57d88706d4426c4969aff7a177ac2d9634401913bb20a93b6efe60e790e06dad3493776c2c0878c"
-            + "e82caababa183b494120edde3d823333efd464c8aea1f51f330203010001a321301f301d0603551d0e"
-            + "04160414203ec8b075d1c9eb9d600100281c3924a831a46c300d06092a864886f70d01010b05000382"
-            + "01010042d4bd26d535ce2bf0375446615ef5bf25973f61ecf955bdb543e4b6e6b5d026fdcab09fec09"
-            + "c747fb26633c221df8e3d3d0fe39ce30ca0a31547e9ec693a0f2d83e26d231386ff45f8e4fd5c06095"
-            + "8681f9d3bd6db5e940b1e4a0b424f5c463c79c5748a14a3a38da4dd7a5499dcc14a70ba82a50be5fe0"
-            + "82890c89a27e56067d2eae952e0bcba4d6beb5359520845f1fdb7df99868786055555187ba46c69ee6"
-            + "7fa2d2c79e74a364a8b3544997dc29cc625395e2f45bf8bdb2c9d8df0d5af1a59a58ad08b32cdbec38"
-            + "19fa49201bb5b5aadeee8f2f096ac029055713b77054e8af07cd61fe97f7365d0aa92d570be98acb89"
-            + "41b8a2b0053b54f18bfde092eb");
-
-    private static final Signature SUBSTRATUM_CI_SIGNATURE = new Signature(""
-            + "308201dd30820146020101300d06092a864886f70d010105050030373116301406035504030c0d416e"
-            + "64726f69642044656275673110300e060355040a0c07416e64726f6964310b30090603550406130255"
-            + "53301e170d3137303232333036303730325a170d3437303231363036303730325a3037311630140603"
-            + "5504030c0d416e64726f69642044656275673110300e060355040a0c07416e64726f6964310b300906"
-            + "035504061302555330819f300d06092a864886f70d010101050003818d00308189028181008aa6cf56"
-            + "e3ba4d0921da3baf527529205efbe440e1f351c40603afa5e6966e6a6ef2def780c8be80d189dc6101"
-            + "935e6f8340e61dc699cfd34d50e37d69bf66fbb58619d0ebf66f22db5dbe240b6087719aa3ceb1c68f"
-            + "3fa277b8846f1326763634687cc286b0760e51d1b791689fa2d948ae5f31cb8e807e00bd1eb72788b2"
-            + "330203010001300d06092a864886f70d0101050500038181007b2b7e432bff612367fbb6fdf8ed0ad1"
-            + "a19b969e4c4ddd8837d71ae2ec0c35f52fe7c8129ccdcdc41325f0bcbc90c38a0ad6fc0c604a737209"
-            + "17d37421955c47f9104ea56ad05031b90c748b94831969a266fa7c55bc083e20899a13089402be49a5"
-            + "edc769811adc2b0496a8a066924af9eeb33f8d57d625a5fa150f7bc18e55");
-
-    private static final File SYSTEM_THEME_DIR =
-            new File(Environment.getDataSystemDirectory(), "theme");
-    private static final File SYSTEM_THEME_CACHE_DIR = new File(SYSTEM_THEME_DIR, "cache");
-    private static final File SYSTEM_THEME_FONT_DIR = new File(SYSTEM_THEME_DIR, "fonts");
-    private static final File SYSTEM_THEME_AUDIO_DIR = new File(SYSTEM_THEME_DIR, "audio");
-    private static final File SYSTEM_THEME_RINGTONE_DIR =
-            new File(SYSTEM_THEME_AUDIO_DIR, "ringtones");
-    private static final File SYSTEM_THEME_NOTIFICATION_DIR =
-            new File(SYSTEM_THEME_AUDIO_DIR, "notifications");
-    private static final File SYSTEM_THEME_ALARM_DIR = new File(SYSTEM_THEME_AUDIO_DIR, "alarms");
-    private static final File SYSTEM_THEME_UI_SOUNDS_DIR = new File(SYSTEM_THEME_AUDIO_DIR, "ui");
-    private static final File SYSTEM_THEME_BOOTANIMATION_DIR =
-            new File(SYSTEM_THEME_DIR, "bootanimation.zip");
-    private static final File SYSTEM_THEME_SHUTDOWNANIMATION_DIR =
-            new File(SYSTEM_THEME_DIR, "shutdownanimation.zip");
-
-    private static final Signature[] AUTHORIZED_SIGNATURES = new Signature[]{
-            SUBSTRATUM_SIGNATURE,
-            SUBSTRATUM_CI_SIGNATURE,
-    };
-
-    private static final List<Sound> SOUNDS = Arrays.asList(
-        new Sound(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath(), "/SoundsCache/ui/", "Effect_Tick",
-                "Effect_Tick", RingtoneManager.TYPE_RINGTONE),
-        new Sound(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath(), "/SoundsCache/ui/", "lock_sound",
-                "Lock"),
-        new Sound(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath(), "/SoundsCache/ui/", "unlock_sound",
-                "Unlock"),
-        new Sound(SYSTEM_THEME_ALARM_DIR.getAbsolutePath(), "/SoundsCache/alarms/", "alarm",
-                "alarm", RingtoneManager.TYPE_ALARM),
-        new Sound(SYSTEM_THEME_NOTIFICATION_DIR.getAbsolutePath(), "/SoundsCache/notifications/",
-                "notification", "notification", RingtoneManager.TYPE_NOTIFICATION),
-        new Sound(SYSTEM_THEME_RINGTONE_DIR.getAbsolutePath(), "/SoundsCache/ringtones/",
-                "ringtone", "ringtone", RingtoneManager.TYPE_RINGTONE)
-    );
-
-    private IOverlayManager mOm;
-    private IPackageManager mPm;
-    private boolean mIsWaiting;
-    private String mInstalledPackageName;
-
-    private Context mContext;
-    private final Object mLock = new Object();
-    private boolean mSigOverride = false;
-    private SettingsObserver mObserver = new SettingsObserver();
-
-    private ISubstratumHelperService mHelperService;
-    private final ServiceConnection mHelperConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mHelperService = ISubstratumHelperService.Stub.asInterface(service);
-            log("Helper service connected");
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mHelperService = null;
-            log("Helper service disconnected");
-        }
-    };
-
-    public SubstratumService(@NonNull final Context context) {
-        super(context);
-        mContext = context;
-    }
-
-    @Override
-    public void onBootPhase(int phase) {
-        if (phase == PHASE_SYSTEM_SERVICES_READY) {
-            if (makeDir(SYSTEM_THEME_DIR)) {
-                restoreconThemeDir();
-            }
-
-            mContext.getContentResolver().registerContentObserver(
-                    Settings.Secure.getUriFor(Settings.Secure.FORCE_AUTHORIZE_SUBSTRATUM_PACKAGES),
-                    false, mObserver);
-            updateSettings();
-
-            mOm = IOverlayManager.Stub.asInterface(ServiceManager.getService("overlay"));
-            mPm = AppGlobals.getPackageManager();
-            publishBinderService("substratum", mService);
-
-            log("published substratum service");
-        }
-    }
-
-    @Override
-    public void onStart() {
-        // Intentionally left empty
-    }
-
-    @Override
-    public void onSwitchUser(final int newUserId) {
-        // Intentionally left empty
-    }
-
-    private void waitForHelperConnection() {
-        if (mHelperService == null) {
-            Intent intent = new Intent("android.substratum.service.SubstratumHelperService");
-            intent.setPackage("android.substratum.service");
-            mContext.bindServiceAsUser(intent, mHelperConnection,
-                    Context.BIND_AUTO_CREATE, UserHandle.SYSTEM);
-        }
-    }
-
-    private boolean doSignaturesMatch(String packageName, Signature signature) {
-        if (packageName != null) {
-              try {
-                  PackageInfo pi = mPm.getPackageInfo(packageName,
-                        PackageManager.GET_SIGNATURES, UserHandle.USER_SYSTEM);
-                  if (pi.signatures != null
-                           && pi.signatures.length == 1
-                           && signature.equals(pi.signatures[0])) {
-                        return true;
-                  }
-              } catch (RemoteException ignored) {
-                  return false;
-              }
-       }
-       return false;
-    }
-
-    private void checkCallerAuthorization(int uid) {
-        String callingPackage;
-        try {
-            callingPackage = mPm.getPackagesForUid(uid)[0];
-        } catch (RemoteException ignored) {
-            throw new SecurityException("Cannot check caller authorization");
-        }
-
-        if (TextUtils.equals(callingPackage, SUBSTRATUM_PACKAGE)) {
-            for (Signature sig : AUTHORIZED_SIGNATURES) {
-                if (doSignaturesMatch(callingPackage, sig)) {
-                    return;
-                }
-            }
-        }
-
-       if (mSigOverride) {
-            log("\'" + callingPackage + "\' is not an authorized calling package, but the user " +
-                    "has explicitly allowed all calling packages, " +
-                    "validating calling package permissions...");
-            return;
-        }
-
-        throw new SecurityException("Caller is not authorized");
-    }
-
-    private final IBinder mService = new ISubstratumService.Stub() {
-        @Override
-        public void installOverlay(List<String> paths) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            final int packageVerifierEnable = Settings.Global.getInt(
-                    mContext.getContentResolver(),
-                    Settings.Global.PACKAGE_VERIFIER_ENABLE, 1);
-            try {
-                synchronized (mLock) {
-                    PackageInstallObserver installObserver = new PackageInstallObserver();
-                    PackageDeleteObserver deleteObserver = new PackageDeleteObserver();
-                    for (String path : paths) {
-                        mInstalledPackageName = null;
-                        log("Installer - installing package from path \'" + path + "\'");
-                        mIsWaiting = true;
-                        Settings.Global.putInt(mContext.getContentResolver(),
-                                Settings.Global.PACKAGE_VERIFIER_ENABLE, 0);
-                        try {
-                            mPm.installExistingPackageAsUser(
-                                    mInstalledPackageName,
-                                    UserHandle.USER_SYSTEM,
-                                    PackageManager.INSTALL_REPLACE_EXISTING,
-                                    PackageManager.INSTALL_REASON_UNKNOWN);
-
-                            while (mIsWaiting) {
-                                try {
-                                    Thread.sleep(1);
-                                } catch (InterruptedException e) {
-                                    // Someone interrupted my sleep, ugh!
-                                }
-                            }
-                        } catch (RemoteException e) {
-                            logE("There is an exception when trying to install " + path, e);
-                            continue;
-                        }
-
-                        if (mInstalledPackageName != null) {
-                            try {
-                                PackageInfo pi = mPm.getPackageInfo(mInstalledPackageName,
-                                        0, UserHandle.USER_SYSTEM);
-                                if ((pi.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0 ||
-                                        pi.overlayTarget == null) {
-                                    mIsWaiting = true;
-                                    int versionCode = mPm.getPackageInfo(
-                                            mInstalledPackageName, 0, UserHandle.USER_SYSTEM)
-                                            .versionCode;
-                                    mPm.deletePackageAsUser(
-                                            mInstalledPackageName,
-                                            versionCode,
-                                            deleteObserver,
-                                            0,
-                                            UserHandle.USER_SYSTEM);
-
-                                    while (mIsWaiting) {
-                                        try {
-                                            Thread.sleep(1);
-                                        } catch (InterruptedException e) {
-                                            // Someone interrupted my sleep, ugh!
-                                        }
-                                    }
-                                }
-                            } catch (RemoteException e) {
-                                // Probably won't happen but we need to keep quiet here
-                            }
-                        }
-                    }
-                }
-            } finally {
-                Settings.Global.putInt(mContext.getContentResolver(),
-                        Settings.Global.PACKAGE_VERIFIER_ENABLE, packageVerifierEnable);
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void uninstallOverlay(List<String> packages, boolean restartUi) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                synchronized (mLock) {
-                    PackageDeleteObserver observer = new PackageDeleteObserver();
-                    for (String p : packages) {
-                        if (isOverlayEnabled(p)) {
-                            log("Remover - disabling overlay for \'" + p + "\'...");
-                            switchOverlayState(p, false);
-                        }
-
-                        try {
-                            PackageInfo pi = mPm.getPackageInfo(p, 0, UserHandle.USER_SYSTEM);
-                            if ((pi.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) == 0 &&
-                                    pi.overlayTarget != null) {
-                                log("Remover - uninstalling \'" + p + "\'...");
-                                mIsWaiting = true;
-                                mPm.deletePackageAsUser(
-                                        p,
-                                        pi.versionCode,
-                                        observer,
-                                        0,
-                                        UserHandle.USER_SYSTEM);
-
-                                while (mIsWaiting) {
-                                    try {
-                                        Thread.sleep(1);
-                                    } catch (InterruptedException e) {
-                                        // Someone interrupted my sleep, ugh!
-                                    }
-                                }
-                            }
-                        } catch (RemoteException e) {
-                            logE("There is an exception when trying to uninstall package", e);
-                        }
-                    }
-                    if (restartUi) {
-                        restartUi();
-                    }
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void switchOverlay(List<String> packages, boolean enable, boolean restartUi) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                synchronized (mLock) {
-                    for (String p : packages) {
-                        log(enable ? "Enabling" : "Disabling" + " overlay " + p);
-                        switchOverlayState(p, enable);
-                    }
-                    if (restartUi) {
-                        restartUi();
-                    }
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void setPriority(List<String> packages, boolean restartUi) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                synchronized (mLock) {
-                    log("PriorityJob - processing priority changes...");
-                    for (int i = 0; i < packages.size() - 1; i++) {
-                        String parentName = packages.get(i);
-                        String packageName = packages.get(i + 1);
-
-                        mOm.setPriority(packageName, parentName,
-                                UserHandle.USER_SYSTEM);
-                    }
-                    if (restartUi) {
-                        restartUi();
-                    }
-                }
-            } catch (RemoteException e) {
-                logE("There is an exception when trying to adjust overlay priority", e);
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void restartSystemUI() {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                log("Restarting SystemUI...");
-                restartUi();
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void copy(String source, String destination) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                log("CopyJob - copying \'" + source + "\' to \'" + destination + "\'...");
-                File sourceFile = new File(source);
-                if (sourceFile.exists()) {
-                    if (sourceFile.isFile()) {
-                        FileUtils.copyFile(sourceFile, new File(destination));
-                    } else {
-                        copyDir(source, destination);
-                    }
-                } else {
-                    logE("CopyJob - \'" + source + "\' does not exist, aborting...");
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void move(String source, String destination) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                log("MoveJob - moving \'" + source + "\' to \'" + destination + "\'...");
-                File sourceFile = new File(source);
-                if (sourceFile.exists()) {
-                    if (sourceFile.isFile()) {
-                        FileUtils.copyFile(sourceFile, new File(destination));
-                    } else {
-                        copyDir(source, destination);
-                    }
-                    FileUtils.deleteContentsAndDir(sourceFile);
-                } else {
-                    logE("MoveJob - \'" + source + "\' does not exist, aborting...");
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void mkdir(String destination) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                log("MkdirJob - creating \'" + destination + "\'...");
-                makeDir(new File(destination));
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void deleteDirectory(String directory, boolean withParent) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                if (withParent) {
-                    FileUtils.deleteContentsAndDir(new File(directory));
-                } else {
-                    FileUtils.deleteContents(new File(directory));
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void applyBootanimation(String name) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                if (name == null) {
-                    log("Restoring system boot animation...");
-                    clearBootAnimation();
-                } else {
-                    log("Configuring themed boot animation...");
-                    copyBootAnimation(name);
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void applyFonts(String pid, String fileName) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                if (pid == null) {
-                    log("Restoring system font...");
-                    clearFonts();
-                } else {
-                    log("Configuring theme font...");
-                    copyFonts(pid, fileName);
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void applySounds(String pid, String fileName) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                if (pid == null) {
-                    log("Restoring system sounds...");
-                    clearSounds();
-                } else {
-                    log("Configuring theme sounds...");
-                    applyThemedSounds(pid, fileName);
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void applyProfile(List<String> enable, List<String> disable, String name,
-                boolean restartUi) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                log("ProfileJob - Applying profile: " + name);
-                waitForHelperConnection();
-                boolean mRestartUi = restartUi;
-
-                boolean oldFontsExists = SYSTEM_THEME_FONT_DIR.exists();
-                boolean oldSoundsExists = SYSTEM_THEME_AUDIO_DIR.exists();
-
-                mHelperService.applyProfile(name);
-
-                boolean newFontsExists = SYSTEM_THEME_FONT_DIR.exists();
-                boolean newSoundsExists = SYSTEM_THEME_AUDIO_DIR.exists();
-
-                if (oldFontsExists || newFontsExists) {
-                    refreshFonts();
-                }
-
-                if (oldSoundsExists || newSoundsExists) {
-                    refreshSounds();
-                    mRestartUi = true;
-                }
-
-                for (String overlay : disable) {
-                    switchOverlayState(overlay, false);
-                }
-
-                for (String overlay : enable) {
-                    switchOverlayState(overlay, true);
-                }
-
-                if (mRestartUi) {
-                    restartUi();
-                }
-
-                log("ProfileJob - " + name + " successfully applied.");
-            } catch (RemoteException e) {
-                logE("Failed to apply profile", e);
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public void applyShutdownAnimation(String name) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            final long ident = Binder.clearCallingIdentity();
-            try {
-                if (name == null) {
-                    log("Restoring system shutdown animation...");
-                    clearShutdownAnimation();
-                } else {
-                    log("Configuring themed shutdown animation...");
-                    copyShutdownAnimation(name);
-                }
-            } finally {
-                Binder.restoreCallingIdentity(ident);
-            }
-        }
-
-        @Override
-        public Map getAllOverlays(int uid) {
-            checkCallerAuthorization(Binder.getCallingUid());
-            try {
-                return mOm.getAllOverlays(uid);
-            } catch (RemoteException e) {
-                logE("There is an exception when trying to get all overlays", e);
-                return null;
-            }
-        }
-    };
-
-    private Context getAppContext(String packageName) {
-        Context ctx = null;
-        try {
-            ctx = mContext.createPackageContext(packageName,
-                    Context.CONTEXT_IGNORE_SECURITY);
-        } catch (NameNotFoundException e) {
-            logE("Failed to get " + packageName + " context");
-        }
-        return ctx;
-    }
-
-    private void switchOverlayState(String packageName, boolean enable) {
-        try {
-            mOm.setEnabled(packageName, enable, UserHandle.USER_SYSTEM);
-        } catch (RemoteException e) {
-            logE("There is an exception when trying to switch overlay state", e);
-        }
-    }
-
-    private boolean isOverlayEnabled(String packageName) {
-        boolean enabled = false;
-        try {
-            OverlayInfo info = mOm.getOverlayInfo(packageName, UserHandle.USER_SYSTEM);
-            if (info != null) {
-                enabled = info.isEnabled();
-            } else {
-                logE("Can't find OverlayInfo for " + packageName);
-            }
-        } catch (RemoteException e) {
-            logE("There is an exception when trying to check overlay state", e);
-        }
-        return enabled;
-    }
-
-    private void restartUi() {
-        Intent i = new Intent("com.android.systemui.action.RESTART_THEME");
-        i.setPackage("com.android.systemui");
-        mContext.sendBroadcastAsUser(i, UserHandle.SYSTEM);
-    }
-
-    private void copyBootAnimation(String fileName) {
-        try {
-            waitForHelperConnection();
-            mHelperService.applyBootAnimation();
-        } catch (RemoteException e) {
-            logE("There is an exception when trying to apply boot animation", e);
-        }
-    }
-
-    private void clearBootAnimation() {
-        if (SYSTEM_THEME_BOOTANIMATION_DIR.exists()) {
-            boolean deleted = SYSTEM_THEME_BOOTANIMATION_DIR.delete();
-            if (!deleted) {
-                logE("Could not delete themed boot animation");
-            }
-        }
-    }
-
-    private void copyShutdownAnimation(String fileName) {
-        try {
-            waitForHelperConnection();
-            mHelperService.applyShutdownAnimation();
-        } catch (RemoteException e) {
-            logE("There is an exception when trying to apply shutdown animation", e);
-        }
-    }
-
-    private void clearShutdownAnimation() {
-        if (SYSTEM_THEME_SHUTDOWNANIMATION_DIR.exists()) {
-            boolean deleted = SYSTEM_THEME_SHUTDOWNANIMATION_DIR.delete();
-            if (!deleted) {
-                logE("Could not delete themed shutdown animation");
-            }
-        }
-    }
-
-    private void copyFonts(String pid, String zipFileName) {
-        // Prepare local cache dir for font package assembly
-        log("Copy Fonts - Package ID = " + pid + " filename = " + zipFileName);
-
-        File cacheDir = new File(SYSTEM_THEME_CACHE_DIR, "FontCache");
-        if (cacheDir.exists()) {
-            FileUtils.deleteContentsAndDir(cacheDir);
-        }
-
-        boolean created = cacheDir.mkdirs();
-        if (!created) {
-            Log.e(TAG, "Could not create cache directory...");
-            logE("Could not create cache directory");
-        }
-
-        // Copy system fonts into our cache dir
-        copyDir("/system/fonts", cacheDir.getAbsolutePath());
-
-        // Append zip to filename since it is probably removed
-        // for list presentation
-        if (!zipFileName.endsWith(".zip")) {
-            zipFileName = zipFileName + ".zip";
-        }
-
-        // Copy target themed fonts zip to our cache dir
-        Context themeContext = getAppContext(pid);
-        AssetManager am = themeContext.getAssets();
-        File fontZip = new File(cacheDir, zipFileName);
-        try (InputStream inputStream = am.open("fonts/" + zipFileName)) {
-            FileUtils.copyToFile(inputStream, fontZip);
-        } catch (IOException e) {
-            logE("There is an exception when trying to copy themed fonts", e);
-        }
-
-        // Unzip new fonts and delete zip file, overwriting any system fonts
-        unzip(fontZip.getAbsolutePath(), cacheDir.getAbsolutePath());
-
-        boolean deleted = fontZip.delete();
-        if (!deleted) {
-            logE("Could not delete ZIP file");
-        }
-
-        // Check if theme zip included a fonts.xml. If not, get from existing file in /system
-        File srcConfig = new File("/system/etc/fonts.xml");
-        File dstConfig = new File(cacheDir, "fonts.xml");
-        if (!dstConfig.exists()) {
-            FileUtils.copyFile(srcConfig, dstConfig);
-        }
-
-        // Prepare system theme fonts folder and copy new fonts folder from our cache
-        FileUtils.deleteContentsAndDir(SYSTEM_THEME_FONT_DIR);
-        makeDir(SYSTEM_THEME_FONT_DIR);
-        copyDir(cacheDir.getAbsolutePath(), SYSTEM_THEME_FONT_DIR.getAbsolutePath());
-
-        // Let system know it's time for a font change
-        FileUtils.deleteContentsAndDir(cacheDir);
-        refreshFonts();
-    }
-
-    private void clearFonts() {
-        FileUtils.deleteContentsAndDir(SYSTEM_THEME_FONT_DIR);
-        refreshFonts();
-    }
-
-    private void refreshFonts() {
-        // Set permissions on font files and config xml
-        if (SYSTEM_THEME_FONT_DIR.exists()) {
-            // Set permissions
-            setPermissionsRecursive(SYSTEM_THEME_FONT_DIR,
-                    FileUtils.S_IRWXU | FileUtils.S_IRGRP | FileUtils.S_IRWXO,
-                    FileUtils.S_IRWXU | FileUtils.S_IRWXG | FileUtils.S_IROTH | FileUtils.S_IXOTH);
-            restoreconThemeDir();
-        }
-
-        // Let system know it's time for a font change
-        SystemProperties.set("sys.refresh_font", "true");
-        float fontSize = Settings.System.getFloatForUser(mContext.getContentResolver(),
-                Settings.System.FONT_SCALE, 1.0f, UserHandle.USER_CURRENT);
-        Settings.System.putFloatForUser(mContext.getContentResolver(),
-                Settings.System.FONT_SCALE, (fontSize + 0.0000001f), UserHandle.USER_CURRENT);
-        restartUi();
-    }
-
-    private void applyThemedSounds(String pid, String zipFileName) {
-        // Prepare local cache dir for font package assembly
-        log("CopySounds - Package ID = \'" + pid + "\'");
-        log("CopySounds - File name = \'" + zipFileName + "\'");
-
-        File cacheDir = new File(SYSTEM_THEME_CACHE_DIR, "SoundsCache");
-        if (cacheDir.exists()) {
-            FileUtils.deleteContentsAndDir(cacheDir);
-        }
-
-        boolean created = cacheDir.mkdirs();
-        if (!created) {
-            logE("Could not create cache directory");
-        }
-
-        // Append zip to filename since it is probably removed
-        // for list presentation
-        if (!zipFileName.endsWith(".zip")) {
-            zipFileName = zipFileName + ".zip";
-        }
-
-        // Copy target themed sounds zip to our cache dir
-        Context themeContext = getAppContext(pid);
-        AssetManager am = themeContext.getAssets();
-        File soundsZip = new File(cacheDir, zipFileName);
-        try (InputStream inputStream = am.open("audio/" + zipFileName)) {
-            FileUtils.copyToFile(inputStream, soundsZip);
-        } catch (IOException e) {
-            logE("There is an exception when trying to copy themed sounds", e);
-        }
-
-        // Unzip new sounds and delete zip file
-        unzip(soundsZip.getAbsolutePath(), cacheDir.getAbsolutePath());
-
-        boolean deleted = soundsZip.delete();
-        if (!deleted) {
-            logE("Could not delete ZIP file");
-        }
-
-        clearSounds();
-        makeDir(SYSTEM_THEME_AUDIO_DIR);
-
-        for (Sound sound : SOUNDS) {
-            File soundsCache = new File(SYSTEM_THEME_CACHE_DIR, sound.cachePath);
-
-            if (!(soundsCache.exists() && soundsCache.isDirectory())) {
-                continue;
-            }
-
-            makeDir(new File(sound.themePath));
-
-            File mp3 = new File(SYSTEM_THEME_CACHE_DIR, sound.cachePath + sound.soundPath + ".mp3");
-            File ogg = new File(SYSTEM_THEME_CACHE_DIR, sound.cachePath + sound.soundPath + ".ogg");
-            if (ogg.exists()) {
-                FileUtils.copyFile(ogg,
-                        new File(sound.themePath + File.separator + sound.soundPath + ".ogg"));
-            } else if (mp3.exists()) {
-                FileUtils.copyFile(mp3,
-                        new File(sound.themePath + File.separator + sound.soundPath + ".mp3"));
-            }
-        }
-
-        // Let system know it's time for a sound change
-        FileUtils.deleteContentsAndDir(cacheDir);
-        refreshSounds();
-    }
-
-    private void clearSounds() {
-        FileUtils.deleteContentsAndDir(SYSTEM_THEME_AUDIO_DIR);
-        refreshSounds();
-    }
-
-    private void refreshSounds() {
-        if (!SYSTEM_THEME_AUDIO_DIR.exists()) {
-            // reset to default sounds
-            SoundUtils.setDefaultAudible(mContext, RingtoneManager.TYPE_ALARM);
-            SoundUtils.setDefaultAudible(mContext, RingtoneManager.TYPE_NOTIFICATION);
-            SoundUtils.setDefaultAudible(mContext, RingtoneManager.TYPE_RINGTONE);
-            SoundUtils.setDefaultUISounds(mContext.getContentResolver(), "lock_sound", "Lock.ogg");
-            SoundUtils.setDefaultUISounds(mContext.getContentResolver(), "unlock_sound", "Unlock.ogg");
-        } else {
-            // Set permissions
-            setPermissionsRecursive(SYSTEM_THEME_AUDIO_DIR,
-                    FileUtils.S_IRWXU | FileUtils.S_IRGRP | FileUtils.S_IRWXO,
-                    FileUtils.S_IRWXU | FileUtils.S_IRWXG | FileUtils.S_IROTH | FileUtils.S_IXOTH);
-
-            for (Sound sound : SOUNDS) {
-                File themePath = new File(sound.themePath);
-
-                if (!(themePath.exists() && themePath.isDirectory())) {
-                    continue;
-                }
-
-                String metadataName;
-                switch (sound.type) {
-                    case RingtoneManager.TYPE_RINGTONE:
-                        metadataName = "Theme Ringtone";
-                        break;
-                    case RingtoneManager.TYPE_NOTIFICATION:
-                        metadataName = "Theme Notification";
-                        break;
-                    case RingtoneManager.TYPE_ALARM:
-                        metadataName = "Theme Alarm";
-                        break;
-                    default:
-                        metadataName = "Theme";
-                }
-
-                File mp3 = new File(themePath, sound.soundPath + ".mp3");
-                File ogg = new File(themePath, sound.soundPath + ".ogg");
-
-                if (ogg.exists()) {
-                    if (sound.themePath.equals(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath())
-                            && sound.type != 0) { // Effect_Tick
-                        SoundUtils.setUIAudible(mContext, ogg, sound.type, sound.soundName);
-                    } else if (sound.themePath.equals(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath())) {
-                        SoundUtils.setUISounds(mContext.getContentResolver(), sound.soundName, ogg
-                                .getAbsolutePath());
-                    } else {
-                        SoundUtils.setAudible(mContext, ogg, sound.type, metadataName);
-                    }
-                } else if (mp3.exists()) {
-                    if (sound.themePath.equals(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath())
-                            && sound.type != 0) { // Effect_Tick
-                        SoundUtils.setUIAudible(mContext, mp3, sound.type, sound.soundName);
-                    } else if (sound.themePath.equals(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath())) {
-                        SoundUtils.setUISounds(mContext.getContentResolver(), sound.soundName,
-                                mp3.getAbsolutePath());
-                    } else {
-                        SoundUtils.setAudible(mContext, mp3, sound.type, metadataName);
-                    }
-                } else {
-                    if (sound.themePath.equals(SYSTEM_THEME_UI_SOUNDS_DIR.getAbsolutePath())) {
-                        SoundUtils.setDefaultUISounds(mContext.getContentResolver(),
-                                sound.soundName, sound.soundPath + ".ogg");
-                    } else {
-                        SoundUtils.setDefaultAudible(mContext, sound.type);
-                    }
-                }
-            }
-        }
-
-        // Refresh sounds
-        Intent i = new Intent("com.android.systemui.action.REFRESH_SOUND");
-        i.setPackage("com.android.systemui");
-        mContext.sendBroadcastAsUser(i, UserHandle.SYSTEM);
-
-        final boolean soundEffectEnabled = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.SOUND_EFFECTS_ENABLED, 1) == 1;
-        if (soundEffectEnabled) {
-            AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-            am.unloadSoundEffects();
-            am.loadSoundEffects();
-        }
-    }
-
-    private void unzip(String source, String destination) {
-        try (ZipInputStream inputStream = new ZipInputStream(
-                new BufferedInputStream(new FileInputStream(source)))) {
-            ZipEntry zipEntry;
-            int count;
-            byte[] buffer = new byte[8192];
-
-            while ((zipEntry = inputStream.getNextEntry()) != null) {
-                File file = new File(destination, zipEntry.getName());
-                File dir = zipEntry.isDirectory() ? file : file.getParentFile();
-
-                if (!dir.isDirectory() && !dir.mkdirs()) {
-                    throw new FileNotFoundException("Failed to ensure directory: " +
-                            dir.getAbsolutePath());
-                }
-
-                if (zipEntry.isDirectory()) {
-                    continue;
-                }
-
-                try (FileOutputStream outputStream = new FileOutputStream(file)) {
-                    while ((count = inputStream.read(buffer)) != -1) {
-                        outputStream.write(buffer, 0, count);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            logE("There is an exception when trying to unzip", e);
-        }
-    }
-
-    private boolean makeDir(File dir) {
-
-        if (dir.exists()) {
-            return dir.isDirectory();
-        }
-
-        if (dir.mkdirs()) {
-            int permissions = FileUtils.S_IRWXU | FileUtils.S_IRWXG |
-                FileUtils.S_IRWXO;
-            SELinux.restorecon(dir);
-            return FileUtils.setPermissions(dir, permissions, -1, -1) == 0;
-        }
-
-        return false;
-    }
-
-    private boolean copyDir(String src, String dst) {
-        File[] files = new File(src).listFiles();
-        boolean success = true;
-
-        if (files != null) {
-            for (File file : files) {
-                File newFile = new File(dst + File.separator +
-                        file.getName());
-                if (file.isDirectory()) {
-                    success &= copyDir(file.getAbsolutePath(),
-                            newFile.getAbsolutePath());
-                } else {
-                    success &= FileUtils.copyFile(file, newFile);
-                }
-            }
-        } else {
-            // not a directory
-            success = false;
-        }
-        return success;
-    }
-
-    void setPermissions(File path, int permissions) {
-        FileUtils.setPermissions(path, permissions, -1, -1);
-    }
-
-    void setPermissionsRecursive(File dir, int file, int folder) {
-        if (!dir.isDirectory()) {
-            setPermissions(dir, file);
-            return;
-        }
-
-        for (File child : dir.listFiles()) {
-            if (child.isDirectory()) {
-                setPermissionsRecursive(child, file, folder);
-                setPermissions(child, folder);
-            } else {
-                setPermissions(child, file);
-            }
-        }
-
-        setPermissions(dir, folder);
-    }
-
-    private boolean restoreconThemeDir() {
-        return SELinux.restoreconRecursive(SYSTEM_THEME_DIR);
-    }
-
-    private void log(String msg) {
-        if (DEBUG) {
-            Log.e(TAG, msg);
-        }
-    }
-
-    private void logE(String msg, Throwable tr) {
-        if (tr != null) {
-            Log.e(TAG, msg, tr);
-        } else {
-            Log.e(TAG, msg);
-        }
-    }
-
-    private void logE(String msg) {
-        logE(msg, null);
-    }
-
-    private void updateSettings() {
-        synchronized (mLock) {
-            mSigOverride = Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                    Settings.Secure.FORCE_AUTHORIZE_SUBSTRATUM_PACKAGES, 0,
-                    UserHandle.USER_CURRENT) == 1;
-        }
-    }
-
-    private static class Sound {
-        String themePath;
-        String cachePath;
-        String soundName;
-        String soundPath;
-        int type;
-
-        Sound(String themePath, String cachePath, String soundName, String soundPath) {
-            this.themePath = themePath;
-            this.cachePath = cachePath;
-            this.soundName = soundName;
-            this.soundPath = soundPath;
-        }
-
-        Sound(String themePath, String cachePath, String soundName, String soundPath, int type) {
-            this.themePath = themePath;
-            this.cachePath = cachePath;
-            this.soundName = soundName;
-            this.soundPath = soundPath;
-            this.type = type;
-        }
-    }
-
-    private class SettingsObserver extends ContentObserver {
-        public SettingsObserver() {
-            super(new Handler());
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            updateSettings();
-        }
-    };
-
-    private class PackageInstallObserver extends IPackageInstallObserver2.Stub {
-        @Override
-        public void onUserActionRequired(Intent intent) throws RemoteException {
-            log("Installer - user action required callback");
-            mIsWaiting = false;
-        }
-
-        @Override
-        public void onPackageInstalled(String packageName, int returnCode,
-                                       String msg, Bundle extras) {
-            log("Installer - successfully installed \'" + packageName + "\'!");
-            mInstalledPackageName = packageName;
-            mIsWaiting = false;
-        }
-    }
-
-    private class PackageDeleteObserver extends IPackageDeleteObserver.Stub {
-        @Override
-        public void packageDeleted(String packageName, int returnCode) {
-            log("Remover - successfully removed \'" + packageName + "\'");
-            mIsWaiting = false;
-        }
-    }
-}
-
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e27bf961c2d..4f92bd65ccf 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -121,7 +121,6 @@
 import com.android.server.stats.StatsCompanionService;
 import com.android.server.statusbar.StatusBarManagerService;
 import com.android.server.storage.DeviceStorageMonitorService;
-import com.android.server.substratum.SubstratumService;
 import com.android.server.telecom.TelecomLoaderService;
 import com.android.server.textclassifier.TextClassificationManagerService;
 import com.android.server.trust.TrustManagerService;
@@ -715,11 +714,6 @@ private void startBootstrapServices() {
         OverlayManagerService overlayManagerService = new OverlayManagerService(
                 mSystemContext, installer);
         mSystemServiceManager.startService(overlayManagerService);
-
-        // Substratum system server implementation
-        traceBeginAndSlog("StartSubstratumService");
-        mSystemServiceManager.startService(new SubstratumService(mSystemContext));
-
         traceEnd();
 
         if (SystemProperties.getInt("persist.sys.displayinset.top", 0) > 0) {

From 3198cca628d947b57b45d686e7be58ce2b1a7ec0 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:39:10 +0000
Subject: [PATCH 11/41] Revert "OMS: StrictMode and files under
 /data/system/theme/"

This reverts commit 8ec16895fc284e5a7b366ee9b4453143224ff448.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 core/java/android/net/Uri.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index ac65791c6ff..bd23ae4c4ce 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -2367,8 +2367,7 @@ public Uri getCanonicalUri() {
      */
     public void checkFileUriExposed(String location) {
         if ("file".equals(getScheme())
-                && (getPath() != null) && !(getPath().startsWith("/system/") ||
-                        getPath().startsWith("/data/system/theme/"))) {
+                && (getPath() != null) && !getPath().startsWith("/system/")) {
             StrictMode.onFileUriExposed(this, location);
         }
     }

From 15cc82bc005ecfef62daa05209c04cc7ac1364ed Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:39:44 +0000
Subject: [PATCH 12/41] Revert "Hold "volume up" during boot to disable all
 overlays"

This reverts commit 0689655bf12087bb9c5daec3f9991e9e9031197b.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../server/am/ActivityManagerService.java     | 30 -------------------
 .../server/wm/WindowManagerService.java       | 22 --------------
 .../java/com/android/server/SystemServer.java |  6 ----
 3 files changed, 58 deletions(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2a03c85764e..8dee587e045 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -283,8 +283,6 @@
 import android.content.IIntentSender;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.om.IOverlayManager;
-import android.content.om.OverlayInfo;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ApplicationInfo.HiddenApiEnforcementPolicy;
@@ -15014,34 +15012,6 @@ public final void showSafeModeOverlay() {
                 Context.WINDOW_SERVICE)).addView(v, lp);
     }
 
-    public final void disableOverlays() {
-        try {
-            IOverlayManager iom = IOverlayManager.Stub.asInterface(
-                    ServiceManager.getService("overlay"));
-            if (iom == null) {
-                return;
-            }
-            Log.d(TAG, "Contacting the Overlay Manager Service for the list of enabled overlays");
-            Map<String, List<OverlayInfo>> allOverlays = iom.getAllOverlays(UserHandle.USER_SYSTEM);
-            if (allOverlays != null) {
-                Log.d(TAG, "The Overlay Manager Service provided the list of enabled overlays");
-                Set<String> set = allOverlays.keySet();
-                for (String targetPackageName : set) {
-                    for (OverlayInfo oi : allOverlays.get(targetPackageName)) {
-                        if (oi.isEnabled()) {
-                            iom.setEnabled(oi.packageName, false, UserHandle.USER_SYSTEM);
-                            Log.d(TAG, "Now disabling \'" + oi.packageName + "\'");
-                        }
-                    }
-                }
-            }
-        } catch (RemoteException re) {
-            re.printStackTrace();
-            Log.d(TAG, "RemoteException while trying to contact the Overlay Manager Service!");
-        }
-    }
-
-
     @Override
     public void noteWakeupAlarm(IIntentSender sender, WorkSource workSource, int sourceUid,
             String sourcePkg, String tag) {
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 09ee41d2974..524d7cee171 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -540,7 +540,6 @@ public void dump(FileDescriptor fd, PrintWriter pw, String[] args, boolean asPro
 
     boolean mDisplayReady;
     boolean mSafeMode;
-    boolean mDisableOverlays;
     boolean mDisplayEnabled = false;
     boolean mSystemBooted = false;
     boolean mForceDisplayEnabled = false;
@@ -4555,27 +4554,6 @@ public boolean detectSafeMode() {
         return mSafeMode;
     }
 
-    public boolean detectDisableOverlays() {
-        if (!mInputMonitor.waitForInputDevicesReady(
-                INPUT_DEVICES_READY_FOR_SAFE_MODE_DETECTION_TIMEOUT_MILLIS)) {
-            Slog.w(TAG_WM, "Devices still not ready after waiting "
-                   + INPUT_DEVICES_READY_FOR_SAFE_MODE_DETECTION_TIMEOUT_MILLIS
-                   + " milliseconds before attempting to detect safe mode.");
-        }
-
-        int volumeUpState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY,
-                KeyEvent.KEYCODE_VOLUME_UP);
-        mDisableOverlays = volumeUpState > 0;
-
-        if (mDisableOverlays) {
-            Log.i(TAG_WM, "All enabled theme overlays will now be disabled.");
-        } else {
-            Log.i(TAG_WM, "System will boot with enabled overlays intact.");
-        }
-
-        return mDisableOverlays;
-    }
-
     public void displayReady() {
         final int displayCount = mRoot.mChildren.size();
         for (int i = 0; i < displayCount; ++i) {
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 4f92bd65ccf..36a77ddad3c 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1776,12 +1776,6 @@ private void startOtherServices() {
             mActivityManagerService.showSafeModeOverlay();
         }
 
-        // Let's check whether we should disable all theme overlays
-        final boolean disableOverlays = wm.detectDisableOverlays();
-        if (disableOverlays) {
-            mActivityManagerService.disableOverlays();
-        }
-
         // Update the configuration for this context by hand, because we're going
         // to start using it before the config change done in wm.systemReady() will
         // propagate to it.

From a443014e3b8d60803924bd14a9ea8186663d2a76 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:40:09 +0000
Subject: [PATCH 13/41] Revert "ThemeSafety: Introduce App Crash Intent"

This reverts commit f9e2693e955ab6bfbfef443e41a6c63188ba2fe9.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 services/core/java/com/android/server/am/AppErrors.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index db0b5de9cea..cf3b68e6e59 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -459,14 +459,6 @@ void crashApplicationInner(ProcessRecord r, ApplicationErrorReport.CrashInfo cra
             task = data.task;
             msg.obj = data;
             mService.mUiHandler.sendMessage(msg);
-
-            // Send broadcast intent to alert Substratum
-            Intent intent = new Intent("projekt.substratum.APP_CRASHED");
-            intent.putExtra("projekt.substratum.EXTRA_PACKAGE_NAME", r.info.packageName);
-            intent.putExtra("projekt.substratum.EXTRA_CRASH_REPEATING", data.repeating);
-            intent.putExtra("projekt.substratum.EXTRA_EXCEPTION_CLASS_NAME",
-                            crashInfo.exceptionClassName);
-            mContext.sendBroadcast(intent);
         }
 
         int res = result.get();

From c4461a4bae0bfc502f76d3a014bbbec4488749f4 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:40:37 +0000
Subject: [PATCH 14/41] Revert "ApplicationsState: add filter for Substratum
 overlays [2/2]"

This reverts commit 679242ce7636e22afcf597f79918febcdbee83bb.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../applications/ApplicationsState.java         | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 78d17dbe1de..15cb9bd8fcd 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -190,11 +190,9 @@ private ApplicationsState(Application app) {
         // Only the owner can see all apps.
         mAdminRetrieveFlags = PackageManager.MATCH_ANY_USER |
                 PackageManager.MATCH_DISABLED_COMPONENTS |
-                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS |
-                PackageManager.GET_META_DATA;
+                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS;
         mRetrieveFlags = PackageManager.MATCH_DISABLED_COMPONENTS |
-                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS |
-                PackageManager.GET_META_DATA;
+                PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS;
 
         /**
          * This is a trick to prevent the foreground thread from being delayed.
@@ -1549,17 +1547,6 @@ public boolean filterApp(AppEntry entry) {
         }
     };
 
-    public static final AppFilter FILTER_SUBSTRATUM = new AppFilter() {
-        public void init() {
-        }
-
-        @Override
-        public boolean filterApp(AppEntry entry) {
-            return !((entry.info.metaData != null) &&
-                    (entry.info.metaData.getString("Substratum_Parent") != null));
-        }
-    };
-
     public static final AppFilter FILTER_WORK = new AppFilter() {
         private int mCurrentUser;
 

From 1830806b0f2b5fcb1870e2e267f18f4cf9acda68 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:41:00 +0000
Subject: [PATCH 15/41] Revert "Extras: Add dynamic theme sound effects
 support"

This reverts commit 0914a6c69ed4688456cc501b688ca44a48ed0966.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../java/com/android/server/audio/AudioService.java   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 07b46ddcf86..25c8c31d4de 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -299,7 +299,6 @@ private boolean isPlatformAutomotive() {
 
     /* Sound effect file names  */
     private static final String SOUND_EFFECTS_PATH = "/media/audio/ui/";
-    private static final String SOUND_EFFECTS_THEMED_PATH = "/data/system/theme/audio/ui/";
     private static final List<String> SOUND_EFFECT_FILES = new ArrayList<String>();
 
     /* Sound effect file name mapping sound effect id (AudioManager.FX_xxx) to
@@ -5460,15 +5459,11 @@ private void persistRingerMode(int ringerMode) {
         }
 
         private String getSoundEffectFilePath(int effectType) {
-            String filePath = SOUND_EFFECTS_THEMED_PATH +
-                SOUND_EFFECT_FILES.get(SOUND_EFFECT_FILES_MAP[effectType][0]);
+            String filePath = Environment.getProductDirectory() + SOUND_EFFECTS_PATH
+                    + SOUND_EFFECT_FILES.get(SOUND_EFFECT_FILES_MAP[effectType][0]);
             if (!new File(filePath).isFile()) {
-               filePath = Environment.getProductDirectory() + SOUND_EFFECTS_PATH
+                filePath = Environment.getRootDirectory() + SOUND_EFFECTS_PATH
                         + SOUND_EFFECT_FILES.get(SOUND_EFFECT_FILES_MAP[effectType][0]);
-                if (!new File(filePath).isFile()) {
-                    filePath = Environment.getRootDirectory() + SOUND_EFFECTS_PATH
-                            + SOUND_EFFECT_FILES.get(SOUND_EFFECT_FILES_MAP[effectType][0]);
-                }
             }
             return filePath;
         }

From 4f9e43693bed8b6591b6284d94457db0079c9a15 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 10:41:21 +0000
Subject: [PATCH 16/41] Revert "Extras: Add dynamic theme shutdown and boot
 animation support"

This reverts commit 2986abbab7866774aec1dd65805d1d1aa4426fb6.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 cmds/bootanimation/BootAnimation.cpp          |  6 ++--
 .../android/server/power/ShutdownThread.java  | 30 +------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 1e97d8ab002..ed6c25dc49c 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -70,11 +70,9 @@ static const char PRODUCT_BOOTANIMATION_FILE[] = "/product/media/bootanimation.z
 static const char SYSTEM_BOOTANIMATION_FILE[] = "/system/media/bootanimation.zip";
 static const char PRODUCT_ENCRYPTED_BOOTANIMATION_FILE[] = "/product/media/bootanimation-encrypted.zip";
 static const char SYSTEM_ENCRYPTED_BOOTANIMATION_FILE[] = "/system/media/bootanimation-encrypted.zip";
-static const char THEME_BOOTANIMATION_FILE[] = "/data/system/theme/bootanimation.zip";
 static const char OEM_SHUTDOWNANIMATION_FILE[] = "/oem/media/shutdownanimation.zip";
 static const char PRODUCT_SHUTDOWNANIMATION_FILE[] = "/product/media/shutdownanimation.zip";
 static const char SYSTEM_SHUTDOWNANIMATION_FILE[] = "/system/media/shutdownanimation.zip";
-static const char THEME_SHUTDOWNANIMATION_FILE[] = "/data/system/theme/shutdownanimation.zip";
 
 static const char SYSTEM_DATA_DIR_PATH[] = "/data/system";
 static const char SYSTEM_TIME_DIR_NAME[] = "time";
@@ -325,9 +323,9 @@ status_t BootAnimation::readyToRun() {
         }
     }
     static const char* bootFiles[] =
-        {THEME_BOOTANIMATION_FILE, PRODUCT_BOOTANIMATION_FILE, OEM_BOOTANIMATION_FILE, SYSTEM_BOOTANIMATION_FILE};
+        {PRODUCT_BOOTANIMATION_FILE, OEM_BOOTANIMATION_FILE, SYSTEM_BOOTANIMATION_FILE};
     static const char* shutdownFiles[] =
-        {THEME_SHUTDOWNANIMATION_FILE, PRODUCT_SHUTDOWNANIMATION_FILE, OEM_SHUTDOWNANIMATION_FILE, SYSTEM_SHUTDOWNANIMATION_FILE};
+        {PRODUCT_SHUTDOWNANIMATION_FILE, OEM_SHUTDOWNANIMATION_FILE, SYSTEM_SHUTDOWNANIMATION_FILE};
 
     for (const char* f : (!mShuttingDown ? bootFiles : shutdownFiles)) {
         if (access(f, R_OK) == 0) {
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index ac93540c3c7..1401cb38033 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -485,7 +485,7 @@ private static ProgressDialog showShutdownDialog(Context context) {
            break;
         }
 
-        if (!themeShutdownAnimationExists()) pd.show();
+        pd.show();
         return pd;
     }
 
@@ -589,10 +589,6 @@ public void run() {
             SystemProperties.set(SHUTDOWN_ACTION_PROPERTY, reason);
         }
 
-        if (themeShutdownAnimationExists()) {
-            startShutdownAnimation();
-        }
-
         /*
          * If we are rebooting into safe mode, write a system property
          * indicating so.
@@ -813,7 +809,6 @@ public void run() {
      */
     public static void rebootOrShutdown(final Context context, boolean reboot, String reason) {
         if (reboot) {
-            stopShutdownAnimation();
             Log.i(TAG, "Rebooting, reason: " + reason);
             PowerManagerService.lowLevelReboot(reason);
             Log.e(TAG, "Reboot failed, will attempt shutdown instead");
@@ -834,9 +829,6 @@ public static void rebootOrShutdown(final Context context, boolean reboot, Strin
             } catch (InterruptedException unused) {
             }
         }
-
-        stopShutdownAnimation();
-
         // Shutdown power
         Log.i(TAG, "Performing low-level shutdown...");
         PowerManagerService.lowLevelShutdown(reason);
@@ -929,24 +921,4 @@ public void run() {
             }
         }
     }
-
-    private static boolean themeShutdownAnimationExists() {
-        return new File("/data/system/theme/shutdownanimation.zip").exists();
-    }
-
-    private static void startShutdownAnimation() {
-        SystemProperties.set("service.bootanim.exit", "0");
-        SystemProperties.set("sys.powerctl", "animate");
-        SystemProperties.set("ctl.start", "bootanim");
-    }
-
-    private static void stopShutdownAnimation() {
-        SystemProperties.set("service.bootanim.exit", "1");
-        while (SystemProperties.get("init.svc.bootanim").equals("running")) {
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException unused) {
-            }
-        }
-    }
 }

From baa92a5c4c75e1a5ec5dc64c4ccb22db9213594b Mon Sep 17 00:00:00 2001
From: Ali B <abittin@gmail.com>
Date: Tue, 26 Feb 2019 21:49:06 +0300
Subject: [PATCH 17/41] SystemUI: update SoundTile

Make the tile active only in a state different than its
"normal" state (ring). When it's in normal state, no need
to draw any attention to it.

Change-Id: I20c20c7c2a05ebe92e887c023e792ad47ad5bbfa
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java
index 29c53adb180..62ff9ce6736 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/SoundTile.java
@@ -128,18 +128,21 @@ protected void handleUpdateState(BooleanState state, Object arg) {
                 state.label = mContext.getString(R.string.quick_settings_sound_ring);
                 state.contentDescription =  mContext.getString(
                         R.string.quick_settings_sound_ring);
+                state.state = Tile.STATE_INACTIVE;
                 break;
             case AudioManager.RINGER_MODE_VIBRATE:
                 state.icon = ResourceIcon.get(R.drawable.ic_qs_ringer_vibrate);
                 state.label = mContext.getString(R.string.quick_settings_sound_vibrate);
                 state.contentDescription =  mContext.getString(
                         R.string.quick_settings_sound_vibrate);
+                state.state = Tile.STATE_ACTIVE;
                 break;
             case AudioManager.RINGER_MODE_SILENT:
                 state.icon = ResourceIcon.get(R.drawable.ic_qs_ringer_silent);
                 state.label = mContext.getString(R.string.quick_settings_sound_dnd);
                 state.contentDescription =  mContext.getString(
                         R.string.quick_settings_sound_dnd);
+                state.state = Tile.STATE_ACTIVE;
                 break;
             default:
                 break;

From 1cd79aba35a0e92a40084158379740e82a0d49b9 Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Tue, 5 Feb 2019 13:52:03 +0100
Subject: [PATCH 18/41] base: SystemUI: tuner: keyguard battery percent on
 charging

by default battery percent display in status bar is forced
on keyguard when charging

Change-Id: Icff8177fff2934123103cdbc6a931f2c2db9bfd6
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/values/custom_strings.xml      |  3 +++
 packages/SystemUI/res/xml/lockscreen_settings.xml    |  6 ++++++
 .../statusbar/phone/KeyguardStatusBarView.java       | 12 +++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/values/custom_strings.xml b/packages/SystemUI/res/values/custom_strings.xml
index 655b51a24e0..0e64ba20468 100644
--- a/packages/SystemUI/res/values/custom_strings.xml
+++ b/packages/SystemUI/res/values/custom_strings.xml
@@ -411,4 +411,7 @@
     <!-- App Picker Tile -->
     <string name="quick_settings_apppicker">App Picker</string>
 
+    <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
+    <string name="tuner_keyguard_battery_percent_summary">Force show battery percent in status bar on charging</string>
+
 </resources>
diff --git a/packages/SystemUI/res/xml/lockscreen_settings.xml b/packages/SystemUI/res/xml/lockscreen_settings.xml
index 1e7d266cc5c..bdd98c574bf 100644
--- a/packages/SystemUI/res/xml/lockscreen_settings.xml
+++ b/packages/SystemUI/res/xml/lockscreen_settings.xml
@@ -39,4 +39,10 @@
         android:title="@string/lockscreen_unlock_right"
         sysui:defValue="true" />
 
+    <com.android.systemui.tuner.TunerSwitch
+        android:key="sysui_keyguard_battery_percent"
+        android:title="@string/tuner_keyguard_battery_percent_title"
+        android:summary="@string/tuner_keyguard_battery_percent_summary"
+        sysui:defValue="true" />
+
 </PreferenceScreen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 6722dfd9656..255929d28ea 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -65,6 +65,7 @@
 import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener;
 import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
 import com.android.systemui.statusbar.policy.UserSwitcherController;
+import com.android.systemui.tuner.TunerService;
 
 /**
  * The header group on Keyguard.
@@ -102,6 +103,11 @@ public class KeyguardStatusBarView extends RelativeLayout
     private ViewGroup mStatusIconArea;
     private int mLayoutState = LAYOUT_NONE;
 
+    private boolean mMultiSwitchEnabled;
+    
+    // tuner switch
+    private static final String KEYGUARD_SHOW_PERCENT_ON_CHARGING = "sysui_keyguard_battery_percent";
+
     /**
      * Draw this many pixels into the left/right side of the cutout to optimally use the space
      */
@@ -215,6 +221,10 @@ private void updateVisibilities() {
                 mMultiUserSwitch.setVisibility(View.GONE);
             }
         }
+
+        final boolean showPercentOnCharging = Dependency.get(TunerService.class)
+                .getValue(KEYGUARD_SHOW_PERCENT_ON_CHARGING, 1) == 1;
+
         if (mCarrierLabel != null) {
             if (mShowCarrierLabel == 1 || mShowCarrierLabel == 3) {
                 mCarrierLabel.setVisibility(mHideContents ? View.INVISIBLE : View.VISIBLE);
@@ -224,7 +234,7 @@ private void updateVisibilities() {
                 mCarrierLabel.setSelected(false);
             }
         }
-        mBatteryView.setForceShowPercent(mBatteryCharging && mShowPercentAvailable);
+        mBatteryView.setForceShowPercent(showPercentOnCharging && mBatteryCharging && mShowPercentAvailable);
     }
 
     private void updateSystemIconsLayoutParams() {

From 51192f9a6715b3b04c0810bfb108403bcf417836 Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Wed, 13 Feb 2019 00:13:13 +0100
Subject: [PATCH 19/41] base: SystemUI: tuner: keyguard show charging watt

Change-Id: I80c0f6d0551cc6ae792e4b8238ca379fef697882
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/values/custom_strings.xml    |  3 +++
 packages/SystemUI/res/xml/lockscreen_settings.xml  |  6 ++++++
 .../statusbar/KeyguardIndicationController.java    | 14 ++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/values/custom_strings.xml b/packages/SystemUI/res/values/custom_strings.xml
index 0e64ba20468..cdefe553526 100644
--- a/packages/SystemUI/res/values/custom_strings.xml
+++ b/packages/SystemUI/res/values/custom_strings.xml
@@ -414,4 +414,7 @@
     <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
     <string name="tuner_keyguard_battery_percent_summary">Force show battery percent in status bar on charging</string>
 
+    <string name="tuner_keyguard_show_watt_title">Show charging watt</string>
+    <string name="tuner_keyguard_show_watt_summary">Show charging watt value in mW</string>
+
 </resources>
diff --git a/packages/SystemUI/res/xml/lockscreen_settings.xml b/packages/SystemUI/res/xml/lockscreen_settings.xml
index bdd98c574bf..3c77965046a 100644
--- a/packages/SystemUI/res/xml/lockscreen_settings.xml
+++ b/packages/SystemUI/res/xml/lockscreen_settings.xml
@@ -45,4 +45,10 @@
         android:summary="@string/tuner_keyguard_battery_percent_summary"
         sysui:defValue="true" />
 
+    <com.android.systemui.tuner.TunerSwitch
+        android:key="sysui_keyguard_show_watt"
+        android:title="@string/tuner_keyguard_show_watt_title"
+        android:summary="@string/tuner_keyguard_show_watt_summary"
+        sysui:defValue="false" />
+
 </PreferenceScreen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 9fbab5d64f6..435f2d1bdb9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -54,6 +54,7 @@
 import com.android.systemui.statusbar.phone.LockIcon;
 import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
 import com.android.systemui.statusbar.policy.UserInfoController;
+import com.android.systemui.tuner.TunerService;
 import com.android.systemui.util.wakelock.SettableWakeLock;
 import com.android.systemui.util.wakelock.WakeLock;
 
@@ -70,7 +71,6 @@
 public class KeyguardIndicationController {
 
     private static final String TAG = "KeyguardIndication";
-    private static final boolean DEBUG_CHARGING_SPEED = false;
 
     private static final int MSG_HIDE_TRANSIENT = 1;
     private static final int MSG_CLEAR_FP_MSG = 2;
@@ -113,6 +113,9 @@ public class KeyguardIndicationController {
     private final DevicePolicyManager mDevicePolicyManager;
     private boolean mDozing;
 
+    // omni additions
+    private static final String KEYGUARD_SHOW_WATT_ON_CHARGING = "sysui_keyguard_show_watt";
+
     /**
      * Creates a new KeyguardIndicationController and registers callbacks.
      */
@@ -321,6 +324,11 @@ protected final void updateIndication(boolean animate) {
                     mTextView.switchIndication(mTransientIndication);
                 } else if (mPowerPluggedIn) {
                     String indication = computePowerIndication();
+                    final boolean showWattOnCharging = Dependency.get(TunerService.class)
+                            .getValue(KEYGUARD_SHOW_WATT_ON_CHARGING, 0) == 1;
+                    if (showWattOnCharging) {
+                        indication += ",  " + (mChargingWattage / 1000) + " mW";
+                    }
                     if (animate) {
                         animateText(mTextView, indication);
                     } else {
@@ -363,7 +371,9 @@ protected final void updateIndication(boolean animate) {
                 mTextView.setTextColor(mInitialTextColor);
             } else if (mPowerPluggedIn) {
                 String indication = computePowerIndication();
-                if (DEBUG_CHARGING_SPEED) {
+                final boolean showWattOnCharging = Dependency.get(TunerService.class)
+                        .getValue(KEYGUARD_SHOW_WATT_ON_CHARGING, 0) == 1;
+                if (showWattOnCharging) {
                     indication += ",  " + (mChargingWattage / 1000) + " mW";
                 }
                 mTextView.setTextColor(mInitialTextColor);

From b7f4366b42069756239dab13fc0c6898b3c2874e Mon Sep 17 00:00:00 2001
From: maxwen <max.weninger@gmail.com>
Date: Wed, 13 Feb 2019 15:10:00 +0100
Subject: [PATCH 20/41] base: SystemUI: keyguard battery bar in aod on charging

or always with a tuner switch

Change-Id: Iaec202d98f117b7d745e44b5302367d9a8189fea
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../res/drawable/battery_bar_view_bg.xml      |  6 ++
 .../res/drawable/battery_bar_view_fg.xml      |  6 ++
 .../res/layout/keyguard_bottom_area.xml       | 17 ++++
 .../SystemUI/res/values/custom_dimens.xml     |  1 +
 .../SystemUI/res/values/custom_strings.xml    | 10 +-
 .../SystemUI/res/xml/lockscreen_settings.xml  | 15 ++-
 .../android/systemui/omni/BatteryBarView.java | 96 +++++++++++++++++++
 .../KeyguardIndicationController.java         | 30 +++++-
 8 files changed, 174 insertions(+), 7 deletions(-)
 create mode 100644 packages/SystemUI/res/drawable/battery_bar_view_bg.xml
 create mode 100644 packages/SystemUI/res/drawable/battery_bar_view_fg.xml
 create mode 100644 packages/SystemUI/src/com/android/systemui/omni/BatteryBarView.java

diff --git a/packages/SystemUI/res/drawable/battery_bar_view_bg.xml b/packages/SystemUI/res/drawable/battery_bar_view_bg.xml
new file mode 100644
index 00000000000..22781a008f3
--- /dev/null
+++ b/packages/SystemUI/res/drawable/battery_bar_view_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="2dp" />
+    <solid android:color="#80ffffff"/>
+</shape>
diff --git a/packages/SystemUI/res/drawable/battery_bar_view_fg.xml b/packages/SystemUI/res/drawable/battery_bar_view_fg.xml
new file mode 100644
index 00000000000..6eaa7f27c75
--- /dev/null
+++ b/packages/SystemUI/res/drawable/battery_bar_view_fg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="2dp" />
+    <solid android:color="#ffffffff"/>
+</shape>
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 88137870262..93314a682b7 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -56,6 +56,23 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:visibility="gone" />
 
+        <com.android.systemui.omni.BatteryBarView
+            android:id="@+id/battery_bar_view"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/battery_bar_view_height"
+            android:background="@drawable/battery_bar_view_bg"
+            android:visibility="gone"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="5dp" >
+
+            <ImageView
+                android:id="@+id/battery_bar_view_fg"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/battery_bar_view_height"
+                android:src="@drawable/battery_bar_view_fg"/>
+        </com.android.systemui.omni.BatteryBarView>
+
         <com.android.systemui.statusbar.phone.KeyguardIndicationTextView
             android:id="@+id/keyguard_indication_text"
             android:layout_width="match_parent"
diff --git a/packages/SystemUI/res/values/custom_dimens.xml b/packages/SystemUI/res/values/custom_dimens.xml
index 25395af5443..dba9effb1b1 100644
--- a/packages/SystemUI/res/values/custom_dimens.xml
+++ b/packages/SystemUI/res/values/custom_dimens.xml
@@ -125,4 +125,5 @@
 
     <dimen name="quick_qs_drag_handle_height">20dp</dimen>
 
+    <dimen name="battery_bar_view_height">6dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/custom_strings.xml b/packages/SystemUI/res/values/custom_strings.xml
index cdefe553526..ea909ccafb9 100644
--- a/packages/SystemUI/res/values/custom_strings.xml
+++ b/packages/SystemUI/res/values/custom_strings.xml
@@ -414,7 +414,13 @@
     <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
     <string name="tuner_keyguard_battery_percent_summary">Force show battery percent in status bar on charging</string>
 
-    <string name="tuner_keyguard_show_watt_title">Show charging watt</string>
-    <string name="tuner_keyguard_show_watt_summary">Show charging watt value in mW</string>
+    <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
+    <string name="tuner_keyguard_battery_percent_summary">Always show battery percent in status bar on charging</string>
+    <string name="tuner_keyguard_show_watt_title">Show charging watts</string>
+    <string name="tuner_keyguard_show_watt_summary">Show current charging watts value in mW</string>
+    <string name="tuner_keyguard_show_battery_bar_title">Show battery bar</string>
+    <string name="tuner_keyguard_show_battery_bar_summary">Show battery bar on charging in always on display</string>
+    <string name="tuner_keyguard_show_battery_bar_always_title">Always show battery bar</string>
+    <string name="tuner_keyguard_show_battery_bar_always_summary">Always show battery bar on charging</string>
 
 </resources>
diff --git a/packages/SystemUI/res/xml/lockscreen_settings.xml b/packages/SystemUI/res/xml/lockscreen_settings.xml
index 3c77965046a..840bcd87523 100644
--- a/packages/SystemUI/res/xml/lockscreen_settings.xml
+++ b/packages/SystemUI/res/xml/lockscreen_settings.xml
@@ -49,6 +49,19 @@
         android:key="sysui_keyguard_show_watt"
         android:title="@string/tuner_keyguard_show_watt_title"
         android:summary="@string/tuner_keyguard_show_watt_summary"
-        sysui:defValue="false" />
+        sysui:defValue="true" />
+
+    <com.android.systemui.tuner.TunerSwitch
+        android:key="sysui_keyguard_show_battery_bar"
+        android:title="@string/tuner_keyguard_show_battery_bar_title"
+        android:summary="@string/tuner_keyguard_show_battery_bar_summary"
+        sysui:defValue="true" />
+
+    <com.android.systemui.tuner.TunerSwitch
+        android:key="sysui_keyguard_show_battery_bar_always"
+        android:title="@string/tuner_keyguard_show_battery_bar_always_title"
+        android:summary="@string/tuner_keyguard_show_battery_bar_always_summary"
+        android:dependency="sysui_keyguard_show_battery_bar"
+        sysui:defValue="true" />
 
 </PreferenceScreen>
diff --git a/packages/SystemUI/src/com/android/systemui/omni/BatteryBarView.java b/packages/SystemUI/src/com/android/systemui/omni/BatteryBarView.java
new file mode 100644
index 00000000000..c6d645d21f1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/omni/BatteryBarView.java
@@ -0,0 +1,96 @@
+/*
+* Copyright (C) 2019 The OmniROM Project
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+package com.android.systemui.omni;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.android.systemui.R;
+
+public class BatteryBarView extends LinearLayout {
+    private ImageView mBarForground;
+    private int mMaxWidth;
+    private int mCurrentWidth;
+    private boolean mInitDone;
+    private int mPercent;
+
+    private Runnable mBarUpdate = new Runnable() {
+        @Override
+        public void run() {
+            mCurrentWidth = (mMaxWidth / 100) * mPercent;
+            ViewGroup.LayoutParams barParams = mBarForground.getLayoutParams();
+            barParams.width = mCurrentWidth;
+            mBarForground.setLayoutParams(barParams);
+        }
+    };
+    public BatteryBarView(Context context) {
+        this(context, null);
+    }
+
+    public BatteryBarView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public BatteryBarView(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public BatteryBarView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mBarForground = findViewById(R.id.battery_bar_view_fg);
+        mInitDone = false;
+    }
+
+    public void setBatteryPercent(int percent) {
+        mPercent = percent;
+        if (mMaxWidth != 0) {
+            mInitDone = true;
+            post(mBarUpdate);
+        }
+    }
+
+    public void setBarColor(int color) {
+        GradientDrawable fg = (GradientDrawable) mBarForground.getDrawable();
+        fg.setColor(color);
+        GradientDrawable bg = (GradientDrawable) getBackground();
+        bg.setColor(color);
+        bg.setAlpha(128);
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        mMaxWidth = getWidth();
+        if (!mInitDone) {
+            mInitDone = true;
+            post(mBarUpdate);
+        }
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 435f2d1bdb9..d5c5eb1352c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -50,6 +50,7 @@
 import com.android.systemui.Dependency;
 import com.android.systemui.Interpolators;
 import com.android.systemui.R;
+import com.android.systemui.omni.BatteryBarView;
 import com.android.systemui.statusbar.phone.KeyguardIndicationTextView;
 import com.android.systemui.statusbar.phone.LockIcon;
 import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
@@ -115,6 +116,11 @@ public class KeyguardIndicationController {
 
     // omni additions
     private static final String KEYGUARD_SHOW_WATT_ON_CHARGING = "sysui_keyguard_show_watt";
+    private static final String KEYGUARD_SHOW_BATTERY_BAR = "sysui_keyguard_show_battery_bar";
+    private static final String KEYGUARD_SHOW_BATTERY_BAR_ALWAYS = "sysui_keyguard_show_battery_bar_always";
+
+    private BatteryBarView mBatteryBar;
+
 
     /**
      * Creates a new KeyguardIndicationController and registers callbacks.
@@ -154,6 +160,8 @@ public KeyguardIndicationController(Context context, ViewGroup indicationArea,
         mDevicePolicyManager = (DevicePolicyManager) context.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
 
+        mBatteryBar = indicationArea.findViewById(R.id.battery_bar_view);
+
         updateDisclosure();
     }
 
@@ -314,8 +322,16 @@ protected final void updateIndication(boolean animate) {
         }
 
         if (isReallyVisible()) {
+            final boolean showWattOnCharging = Dependency.get(TunerService.class)
+                    .getValue(KEYGUARD_SHOW_WATT_ON_CHARGING, 0) == 1;
+            final boolean showBatteryBar = Dependency.get(TunerService.class)
+                    .getValue(KEYGUARD_SHOW_BATTERY_BAR, 1) == 1;
+            final boolean showBatteryBarAlways = Dependency.get(TunerService.class)
+                    .getValue(KEYGUARD_SHOW_BATTERY_BAR_ALWAYS, 0) == 1;
+            
             // Walk down a precedence-ordered list of what indication
             // should be shown based on user or device state
+            mBatteryBar.setVisibility(View.GONE);
             if (mDozing) {
                 mTextView.setTextColor(Color.WHITE);
                 if (!TextUtils.isEmpty(mTransientIndication)) {
@@ -324,8 +340,6 @@ protected final void updateIndication(boolean animate) {
                     mTextView.switchIndication(mTransientIndication);
                 } else if (mPowerPluggedIn) {
                     String indication = computePowerIndication();
-                    final boolean showWattOnCharging = Dependency.get(TunerService.class)
-                            .getValue(KEYGUARD_SHOW_WATT_ON_CHARGING, 0) == 1;
                     if (showWattOnCharging) {
                         indication += ",  " + (mChargingWattage / 1000) + " mW";
                     }
@@ -334,6 +348,11 @@ protected final void updateIndication(boolean animate) {
                     } else {
                         mTextView.switchIndication(indication);
                     }
+                    if (showBatteryBar) {
+                        mBatteryBar.setVisibility(View.VISIBLE);
+                        mBatteryBar.setBatteryPercent(mBatteryLevel);
+                        mBatteryBar.setBarColor(Color.WHITE);
+                    }
                 } else {
                     // Use the high voltage symbol ⚡ (u26A1 unicode) but prevent the system
                     // to load its emoji colored variant with the uFE0E flag
@@ -371,8 +390,6 @@ protected final void updateIndication(boolean animate) {
                 mTextView.setTextColor(mInitialTextColor);
             } else if (mPowerPluggedIn) {
                 String indication = computePowerIndication();
-                final boolean showWattOnCharging = Dependency.get(TunerService.class)
-                        .getValue(KEYGUARD_SHOW_WATT_ON_CHARGING, 0) == 1;
                 if (showWattOnCharging) {
                     indication += ",  " + (mChargingWattage / 1000) + " mW";
                 }
@@ -382,6 +399,11 @@ protected final void updateIndication(boolean animate) {
                 } else {
                     mTextView.switchIndication(indication);
                 }
+                if (showBatteryBar && showBatteryBarAlways) {
+                    mBatteryBar.setVisibility(View.VISIBLE);
+                    mBatteryBar.setBatteryPercent(mBatteryLevel);
+                    mBatteryBar.setBarColor(mInitialTextColor);
+                }
             } else if (!TextUtils.isEmpty(trustManagedIndication)
                     && updateMonitor.getUserTrustIsManaged(userId)
                     && !updateMonitor.getUserHasTrust(userId)) {

From cd687f8d8a8dd6eac79b78e4e1fc4a720507226f Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sun, 17 Feb 2019 17:25:22 +0000
Subject: [PATCH 21/41] Tuner : Keep the additional settings disabled by
 default

Change-Id: I588e971adaa3bd3c0a7547de9c2b54304ba8f7e8
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/xml/lockscreen_settings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/xml/lockscreen_settings.xml b/packages/SystemUI/res/xml/lockscreen_settings.xml
index 840bcd87523..19d36ea5c8c 100644
--- a/packages/SystemUI/res/xml/lockscreen_settings.xml
+++ b/packages/SystemUI/res/xml/lockscreen_settings.xml
@@ -49,19 +49,19 @@
         android:key="sysui_keyguard_show_watt"
         android:title="@string/tuner_keyguard_show_watt_title"
         android:summary="@string/tuner_keyguard_show_watt_summary"
-        sysui:defValue="true" />
+        sysui:defValue="false" />
 
     <com.android.systemui.tuner.TunerSwitch
         android:key="sysui_keyguard_show_battery_bar"
         android:title="@string/tuner_keyguard_show_battery_bar_title"
         android:summary="@string/tuner_keyguard_show_battery_bar_summary"
-        sysui:defValue="true" />
+        sysui:defValue="false" />
 
     <com.android.systemui.tuner.TunerSwitch
         android:key="sysui_keyguard_show_battery_bar_always"
         android:title="@string/tuner_keyguard_show_battery_bar_always_title"
         android:summary="@string/tuner_keyguard_show_battery_bar_always_summary"
         android:dependency="sysui_keyguard_show_battery_bar"
-        sysui:defValue="true" />
+        sysui:defValue="false" />
 
 </PreferenceScreen>

From 6b0f100e2e4ab163fc3b094f23965ec1420a84f6 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 22:17:08 +0000
Subject: [PATCH 22/41] Remove duplicate string declarations

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/values/custom_strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/SystemUI/res/values/custom_strings.xml b/packages/SystemUI/res/values/custom_strings.xml
index ea909ccafb9..eb02d7a5754 100644
--- a/packages/SystemUI/res/values/custom_strings.xml
+++ b/packages/SystemUI/res/values/custom_strings.xml
@@ -411,9 +411,6 @@
     <!-- App Picker Tile -->
     <string name="quick_settings_apppicker">App Picker</string>
 
-    <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
-    <string name="tuner_keyguard_battery_percent_summary">Force show battery percent in status bar on charging</string>
-
     <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
     <string name="tuner_keyguard_battery_percent_summary">Always show battery percent in status bar on charging</string>
     <string name="tuner_keyguard_show_watt_title">Show charging watts</string>

From 58cf0a79b522f375780d0949dfc206ee4ea53ae7 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 22:17:36 +0000
Subject: [PATCH 23/41] Make SystemUI Tuner appear in Settings>System

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/AndroidManifest.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 90ea2c1196f..04bbf35d02d 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -330,7 +330,7 @@
                 android:permission="android.permission.BIND_WALLPAPER"
                 android:exported="true" />
 
-        <activity android:name=".tuner.TunerActivity"
+        <!--<activity android:name=".tuner.TunerActivity"
                   android:icon="@drawable/tuner"
                   android:theme="@style/TunerSettings"
                   android:label="@string/system_ui_tuner"
@@ -343,6 +343,22 @@
             <intent-filter android:priority="0">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
+        </activity>-->
+        <activity android:name=".tuner.TunerActivity"
+                  android:enabled="false"
+                  android:icon="@drawable/tuner"
+                  android:theme="@style/TunerSettings"
+                  android:label="@string/system_ui_tuner"
+                  android:process=":tuner"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                    android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.summary"
+                    android:resource="@string/summary_empty"/>
         </activity>
 
         <activity-alias android:name=".DemoMode"

From 094627b88c95fff4d036c9906bd207a3495c8e59 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 22 Mar 2019 22:52:06 +0000
Subject: [PATCH 24/41] Make power menu items follow accent

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 core/res/res/drawable/ic_lock_bugreport.xml              | 2 +-
 core/res/res/drawable/ic_lock_idle_alarm.xml             | 2 +-
 core/res/res/drawable/ic_lock_lockdown.xml               | 2 +-
 core/res/res/drawable/ic_lock_onthego.xml                | 2 +-
 core/res/res/drawable/ic_lock_power_off.xml              | 2 +-
 core/res/res/drawable/ic_lock_screenrecord.xml           | 2 +-
 core/res/res/drawable/ic_restart.xml                     | 2 +-
 packages/SystemUI/res/drawable/ic_lock_lock.xml          | 2 +-
 packages/SystemUI/res/drawable/ic_lock_settings.xml      | 2 +-
 packages/SystemUI/res/drawable/ic_lock_torch.xml         | 2 +-
 packages/SystemUI/res/drawable/ic_restart_advanced.xml   | 2 +-
 packages/SystemUI/res/drawable/ic_restart_bootloader.xml | 2 +-
 packages/SystemUI/res/drawable/ic_restart_hot.xml        | 2 +-
 packages/SystemUI/res/drawable/ic_restart_recovery.xml   | 2 +-
 packages/SystemUI/res/drawable/ic_restart_ui.xml         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/res/res/drawable/ic_lock_bugreport.xml b/core/res/res/drawable/ic_lock_bugreport.xml
index ebeb5320c34..3f9ed1f190d 100644
--- a/core/res/res/drawable/ic_lock_bugreport.xml
+++ b/core/res/res/drawable/ic_lock_bugreport.xml
@@ -18,7 +18,7 @@
         android:height="24.0dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="M20,10V8h-2.81c-0.45,-0.78 -1.07,-1.46 -1.82,-1.96L17,4.41L15.59,3l-2.17,2.17c-0.03,-0.01 -0.05,-0.01 -0.08,-0.01c-0.16,-0.04 -0.32,-0.06 -0.49,-0.09c-0.06,-0.01 -0.11,-0.02 -0.17,-0.03C12.46,5.02 12.23,5 12,5h0c-0.49,0 -0.97,0.07 -1.42,0.18l0.02,-0.01L8.41,3L7,4.41l1.62,1.63l0.01,0C7.88,6.54 7.26,7.22 6.81,8H4v2h2.09C6.03,10.33 6,10.66 6,11v1H4v2h2v1c0,0.34 0.04,0.67 0.09,1H4v2h2.81c1.04,1.79 2.97,3 5.19,3h0c2.22,0 4.15,-1.21 5.19,-3H20v-2h-2.09l0,0c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1l0,0H20zM16,15c0,2.21 -1.79,4 -4,4c-2.21,0 -4,-1.79 -4,-4v-4c0,-2.21 1.79,-4 4,-4h0c2.21,0 4,1.79 4,4V15z"/>
diff --git a/core/res/res/drawable/ic_lock_idle_alarm.xml b/core/res/res/drawable/ic_lock_idle_alarm.xml
index e8189bd111d..f1bc0e53d29 100644
--- a/core/res/res/drawable/ic_lock_idle_alarm.xml
+++ b/core/res/res/drawable/ic_lock_idle_alarm.xml
@@ -16,4 +16,4 @@
 
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@drawable/ic_lock_idle_alarm_alpha"
-    android:tint="?attr/colorControlNormal" />
+    android:tint="@*android:color/accent_device_default_light" />
diff --git a/core/res/res/drawable/ic_lock_lockdown.xml b/core/res/res/drawable/ic_lock_lockdown.xml
index b9685d3e7cc..73ba1086b90 100644
--- a/core/res/res/drawable/ic_lock_lockdown.xml
+++ b/core/res/res/drawable/ic_lock_lockdown.xml
@@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project
         android:height="24.0dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
 
     <path
         android:fillColor="#FF000000"
diff --git a/core/res/res/drawable/ic_lock_onthego.xml b/core/res/res/drawable/ic_lock_onthego.xml
index 74e1fd44dbc..c78cc4da176 100644
--- a/core/res/res/drawable/ic_lock_onthego.xml
+++ b/core/res/res/drawable/ic_lock_onthego.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="?attr/colorControlNormal"
+        android:fillColor="@*android:color/accent_device_default_light"
         android:pathData="M16.5,5.5A2,2 0 0,0 18.5,3.5A2,2 0 0,0 16.5,1.5A2,2 0 0,0 14.5,3.5A2,2 0 0,0 16.5,5.5M12.9,19.4L13.9,15L16,17V23H18V15.5L15.9,13.5L16.5,10.5C17.89,12.09 19.89,13 22,13V11C20.24,11.03 18.6,10.11 17.7,8.6L16.7,7C16.34,6.4 15.7,6 15,6C14.7,6 14.5,6.1 14.2,6.1L9,8.3V13H11V9.6L12.8,8.9L11.2,17L6.3,16L5.9,18L12.9,19.4M4,9A1,1 0 0,1 3,8A1,1 0 0,1 4,7H7V9H4M5,5A1,1 0 0,1 4,4A1,1 0 0,1 5,3H10V5H5M3,13A1,1 0 0,1 2,12A1,1 0 0,1 3,11H7V13H3Z" />
 </vector>
diff --git a/core/res/res/drawable/ic_lock_power_off.xml b/core/res/res/drawable/ic_lock_power_off.xml
index cf778c77654..62a5955f3a4 100644
--- a/core/res/res/drawable/ic_lock_power_off.xml
+++ b/core/res/res/drawable/ic_lock_power_off.xml
@@ -18,7 +18,7 @@
         android:height="24.0dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="M11,2h2v10h-2z"/>
diff --git a/core/res/res/drawable/ic_lock_screenrecord.xml b/core/res/res/drawable/ic_lock_screenrecord.xml
index 3435cbbddb6..86f34cf4781 100644
--- a/core/res/res/drawable/ic_lock_screenrecord.xml
+++ b/core/res/res/drawable/ic_lock_screenrecord.xml
@@ -19,7 +19,7 @@
     android:height="24dp"
     android:viewportWidth="96"
     android:viewportHeight="96"
-    android:tint="?attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
 
     <path
         android:fillColor="#FF000000"
diff --git a/core/res/res/drawable/ic_restart.xml b/core/res/res/drawable/ic_restart.xml
index 8fc285ee582..d034df341c7 100644
--- a/core/res/res/drawable/ic_restart.xml
+++ b/core/res/res/drawable/ic_restart.xml
@@ -18,7 +18,7 @@
         android:height="24.0dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="M6,13c0,-1.65 0.67,-3.15 1.76,-4.24L6.34,7.34C4.9,8.79 4,10.79 4,13c0,4.08 3.05,7.44 7,7.93v-2.02C8.17,18.43 6,15.97 6,13z"/>
diff --git a/packages/SystemUI/res/drawable/ic_lock_lock.xml b/packages/SystemUI/res/drawable/ic_lock_lock.xml
index c35edaac6dd..e45b8a03178 100644
--- a/packages/SystemUI/res/drawable/ic_lock_lock.xml
+++ b/packages/SystemUI/res/drawable/ic_lock_lock.xml
@@ -3,7 +3,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
diff --git a/packages/SystemUI/res/drawable/ic_lock_settings.xml b/packages/SystemUI/res/drawable/ic_lock_settings.xml
index 9f3be2a4558..13280ee0071 100644
--- a/packages/SystemUI/res/drawable/ic_lock_settings.xml
+++ b/packages/SystemUI/res/drawable/ic_lock_settings.xml
@@ -3,7 +3,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
diff --git a/packages/SystemUI/res/drawable/ic_lock_torch.xml b/packages/SystemUI/res/drawable/ic_lock_torch.xml
index 371df080984..dd0d240c9a3 100644
--- a/packages/SystemUI/res/drawable/ic_lock_torch.xml
+++ b/packages/SystemUI/res/drawable/ic_lock_torch.xml
@@ -19,7 +19,7 @@
     android:height="32dp"
     android:viewportWidth="48"
     android:viewportHeight="48"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
 
     <path
         android:fillColor="#FF000000"
diff --git a/packages/SystemUI/res/drawable/ic_restart_advanced.xml b/packages/SystemUI/res/drawable/ic_restart_advanced.xml
index f7193d3923f..cf8e7a67516 100644
--- a/packages/SystemUI/res/drawable/ic_restart_advanced.xml
+++ b/packages/SystemUI/res/drawable/ic_restart_advanced.xml
@@ -19,7 +19,7 @@
         android:height="24.0dp"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="m 12,4 0,-3 0.0089,5.0067283 L 12,9 12.007813,6.0078125 C 15.907812,6.0078125 19,9.1 19,13 c 0,3.9 -3.1,7 -7,7 l 0,2 c 5,0 9,-4 9,-9 0,-5 -4,-9 -9,-9 z"/>
diff --git a/packages/SystemUI/res/drawable/ic_restart_bootloader.xml b/packages/SystemUI/res/drawable/ic_restart_bootloader.xml
index 8f44419f725..9a29fa919c2 100644
--- a/packages/SystemUI/res/drawable/ic_restart_bootloader.xml
+++ b/packages/SystemUI/res/drawable/ic_restart_bootloader.xml
@@ -19,7 +19,7 @@
     android:height="24.000000dp"
     android:viewportWidth="512.000000"
     android:viewportHeight="512.000000"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
 
     <group
         android:translateY="512.000000"
diff --git a/packages/SystemUI/res/drawable/ic_restart_hot.xml b/packages/SystemUI/res/drawable/ic_restart_hot.xml
index 3513e19f690..dd7ee384a07 100644
--- a/packages/SystemUI/res/drawable/ic_restart_hot.xml
+++ b/packages/SystemUI/res/drawable/ic_restart_hot.xml
@@ -19,7 +19,7 @@
     android:height="24.000000dp"
     android:viewportWidth="512.000000"
     android:viewportHeight="512.000000"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
 
     <group
         android:translateY="512.000000"
diff --git a/packages/SystemUI/res/drawable/ic_restart_recovery.xml b/packages/SystemUI/res/drawable/ic_restart_recovery.xml
index 504641db9f6..900798c5952 100644
--- a/packages/SystemUI/res/drawable/ic_restart_recovery.xml
+++ b/packages/SystemUI/res/drawable/ic_restart_recovery.xml
@@ -19,7 +19,7 @@
     android:height="24.000000dp"
     android:viewportWidth="512.000000"
     android:viewportHeight="512.000000"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
 
     <group
         android:translateY="512.000000"
diff --git a/packages/SystemUI/res/drawable/ic_restart_ui.xml b/packages/SystemUI/res/drawable/ic_restart_ui.xml
index bc407f16c18..8fd4692fdfe 100644
--- a/packages/SystemUI/res/drawable/ic_restart_ui.xml
+++ b/packages/SystemUI/res/drawable/ic_restart_ui.xml
@@ -18,6 +18,6 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
     <path android:fillColor="#000000" android:pathData="M8,11.5A1.25,1.25 0 0,0 6.75,12.75A1.25,1.25 0 0,0 8,14A1.25,1.25 0 0,0 9.25,12.75A1.25,1.25 0 0,0 8,11.5M16,11.5A1.25,1.25 0 0,0 14.75,12.75A1.25,1.25 0 0,0 16,14A1.25,1.25 0 0,0 17.25,12.75A1.25,1.25 0 0,0 16,11.5M12,7C13.5,7 14.9,7.33 16.18,7.91L18.34,5.75C18.73,5.36 19.36,5.36 19.75,5.75C20.14,6.14 20.14,6.77 19.75,7.16L17.95,8.96C20.41,10.79 22,13.71 22,17H2C2,13.71 3.59,10.79 6.05,8.96L4.25,7.16C3.86,6.77 3.86,6.14 4.25,5.75C4.64,5.36 5.27,5.36 5.66,5.75L7.82,7.91C9.1,7.33 10.5,7 12,7Z" />
 </vector>

From 5f5499f9f156973c9167b32fe030803e7630ccd5 Mon Sep 17 00:00:00 2001
From: ElDainosor <eldainosor@gmail.com>
Date: Thu, 23 Aug 2018 01:18:35 +0000
Subject: [PATCH 25/41] base: Actually fix the padding on StatusBar

Android P gets a new QS layout that looks good
but it has some issues on smaller screens devices,
like the rounded buttons clipping with the borders
and the date not looking really good.
LineageOS suggested a fix (https://review.lineageos.org/224021)
but it's circumventing it because it adds padding
 and some people doesn't like the padding, so, instead
let's apply the 8dp spacing over the affected headers
and the small qs tile.

Change-Id: I4c01945bfb3d9f58f10cd7deb392a2d40bc50289
Signed-off-by: VenkatVishalV <venkatvishal124@gmail.com>
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../res/layout/quick_status_bar_expanded_header.xml         | 6 ++++--
 packages/SystemUI/res/values/custom_dimens.xml              | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
index 8e992385fa4..f4a9d4d974c 100644
--- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
@@ -22,8 +22,8 @@
     android:layout_width="match_parent"
     android:layout_height="@*android:dimen/quick_qs_total_height"
     android:layout_gravity="@integer/notification_panel_layout_gravity"
-    android:layout_marginStart="@dimen/quick_status_bar_margin"
-    android:layout_marginEnd="@dimen/quick_status_bar_margin"
+    android:layout_marginStart="@dimen/qs_items_padding"
+    android:layout_marginEnd="@dimen/qs_items_padding"
     android:background="@android:color/transparent"
     android:baselineAligned="false"
     android:clickable="false"
@@ -47,6 +47,8 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_below="@id/quick_qs_status_icons"
+        android:paddingLeft="@dimen/qs_items_padding"
+        android:paddingRight="@dimen/qs_items_padding"
         android:accessibilityTraversalAfter="@+id/date_time_group"
         android:accessibilityTraversalBefore="@id/expand_indicator"
         android:clipChildren="false"
diff --git a/packages/SystemUI/res/values/custom_dimens.xml b/packages/SystemUI/res/values/custom_dimens.xml
index dba9effb1b1..1c2d55eeead 100644
--- a/packages/SystemUI/res/values/custom_dimens.xml
+++ b/packages/SystemUI/res/values/custom_dimens.xml
@@ -126,4 +126,8 @@
     <dimen name="quick_qs_drag_handle_height">20dp</dimen>
 
     <dimen name="battery_bar_view_height">6dp</dimen>
+    
+    <!-- Sets a custom extra padding for the QS icons and statusbar date -->
+    <dimen name="qs_items_padding">8dp</dimen>
+
 </resources>

From 5a1fc986430a0d061c71fc8e44141265f14be910 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 23 Mar 2019 15:59:41 +0000
Subject: [PATCH 26/41] Revert "Make SystemUI Tuner appear in Settings>System"

This reverts commit 258d168ed2dd4fb20f49484380cb3c2cc70d7332.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/AndroidManifest.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 04bbf35d02d..90ea2c1196f 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -330,7 +330,7 @@
                 android:permission="android.permission.BIND_WALLPAPER"
                 android:exported="true" />
 
-        <!--<activity android:name=".tuner.TunerActivity"
+        <activity android:name=".tuner.TunerActivity"
                   android:icon="@drawable/tuner"
                   android:theme="@style/TunerSettings"
                   android:label="@string/system_ui_tuner"
@@ -343,22 +343,6 @@
             <intent-filter android:priority="0">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
-        </activity>-->
-        <activity android:name=".tuner.TunerActivity"
-                  android:enabled="false"
-                  android:icon="@drawable/tuner"
-                  android:theme="@style/TunerSettings"
-                  android:label="@string/system_ui_tuner"
-                  android:process=":tuner"
-                  android:exported="true">
-            <intent-filter>
-                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                    android:value="com.android.settings.category.ia.system" />
-            <meta-data android:name="com.android.settings.summary"
-                    android:resource="@string/summary_empty"/>
         </activity>
 
         <activity-alias android:name=".DemoMode"

From 112c46c3017be1243333fe183e68d6bba4ce30bc Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 23 Mar 2019 19:08:18 +0000
Subject: [PATCH 27/41] Remove non-existent preference from tuner

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/xml/tuner_prefs.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml
index fb2aa9192c6..c4ba2442ab2 100644
--- a/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@ -88,11 +88,6 @@
 
         <!-- secure -->
 
-        <com.android.systemui.tuner.ClockPreference
-            android:title="@string/tuner_time"
-            android:summary="%s"
-            android:entries="@array/clock_options" />
-
     </PreferenceScreen>
 
     <PreferenceScreen

From 045fee4d0b99dc73e4f7a6f81c878df32587abec Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 23 Mar 2019 20:32:12 +0000
Subject: [PATCH 28/41] Tuner : Add it to Settings>System

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 90ea2c1196f..9e2e3d38192 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -337,12 +337,12 @@
                   android:process=":tuner"
                   android:exported="true">
             <intent-filter>
-                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="0">
-                <action android:name="com.android.settings.action.SETTINGS" />
+                    <action android:name="com.android.settings.action.IA_SETTINGS" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                    android:value="com.android.settings.category.ia.system" />
+            <meta-data android:name="com.android.settings.summary"
+                    android:resource="@string/summary_empty" />
         </activity>
 
         <activity-alias android:name=".DemoMode"

From 4583d852c375a94094fa5e4c71001c7adf424573 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 13 Apr 2019 10:25:57 +0000
Subject: [PATCH 29/41] Revert "base: SystemUI: tuner: keyguard battery percent
 on charging"

This reverts commit 1c50f8b0f326c54d923a2f06dff5e5023f126633.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/values/custom_strings.xml      |  2 --
 packages/SystemUI/res/xml/lockscreen_settings.xml    |  6 ------
 .../statusbar/phone/KeyguardStatusBarView.java       | 12 +-----------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/packages/SystemUI/res/values/custom_strings.xml b/packages/SystemUI/res/values/custom_strings.xml
index eb02d7a5754..cd93a16b6d2 100644
--- a/packages/SystemUI/res/values/custom_strings.xml
+++ b/packages/SystemUI/res/values/custom_strings.xml
@@ -411,8 +411,6 @@
     <!-- App Picker Tile -->
     <string name="quick_settings_apppicker">App Picker</string>
 
-    <string name="tuner_keyguard_battery_percent_title">Show battery percent</string>
-    <string name="tuner_keyguard_battery_percent_summary">Always show battery percent in status bar on charging</string>
     <string name="tuner_keyguard_show_watt_title">Show charging watts</string>
     <string name="tuner_keyguard_show_watt_summary">Show current charging watts value in mW</string>
     <string name="tuner_keyguard_show_battery_bar_title">Show battery bar</string>
diff --git a/packages/SystemUI/res/xml/lockscreen_settings.xml b/packages/SystemUI/res/xml/lockscreen_settings.xml
index 19d36ea5c8c..a8bd2a5a15b 100644
--- a/packages/SystemUI/res/xml/lockscreen_settings.xml
+++ b/packages/SystemUI/res/xml/lockscreen_settings.xml
@@ -39,12 +39,6 @@
         android:title="@string/lockscreen_unlock_right"
         sysui:defValue="true" />
 
-    <com.android.systemui.tuner.TunerSwitch
-        android:key="sysui_keyguard_battery_percent"
-        android:title="@string/tuner_keyguard_battery_percent_title"
-        android:summary="@string/tuner_keyguard_battery_percent_summary"
-        sysui:defValue="true" />
-
     <com.android.systemui.tuner.TunerSwitch
         android:key="sysui_keyguard_show_watt"
         android:title="@string/tuner_keyguard_show_watt_title"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 255929d28ea..6722dfd9656 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -65,7 +65,6 @@
 import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener;
 import com.android.systemui.statusbar.policy.UserInfoControllerImpl;
 import com.android.systemui.statusbar.policy.UserSwitcherController;
-import com.android.systemui.tuner.TunerService;
 
 /**
  * The header group on Keyguard.
@@ -103,11 +102,6 @@ public class KeyguardStatusBarView extends RelativeLayout
     private ViewGroup mStatusIconArea;
     private int mLayoutState = LAYOUT_NONE;
 
-    private boolean mMultiSwitchEnabled;
-    
-    // tuner switch
-    private static final String KEYGUARD_SHOW_PERCENT_ON_CHARGING = "sysui_keyguard_battery_percent";
-
     /**
      * Draw this many pixels into the left/right side of the cutout to optimally use the space
      */
@@ -221,10 +215,6 @@ private void updateVisibilities() {
                 mMultiUserSwitch.setVisibility(View.GONE);
             }
         }
-
-        final boolean showPercentOnCharging = Dependency.get(TunerService.class)
-                .getValue(KEYGUARD_SHOW_PERCENT_ON_CHARGING, 1) == 1;
-
         if (mCarrierLabel != null) {
             if (mShowCarrierLabel == 1 || mShowCarrierLabel == 3) {
                 mCarrierLabel.setVisibility(mHideContents ? View.INVISIBLE : View.VISIBLE);
@@ -234,7 +224,7 @@ private void updateVisibilities() {
                 mCarrierLabel.setSelected(false);
             }
         }
-        mBatteryView.setForceShowPercent(showPercentOnCharging && mBatteryCharging && mShowPercentAvailable);
+        mBatteryView.setForceShowPercent(mBatteryCharging && mShowPercentAvailable);
     }
 
     private void updateSystemIconsLayoutParams() {

From 5eabc9df46d4b976da740f21d98aaf9561eb85cc Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Thu, 28 Mar 2019 13:22:52 +0000
Subject: [PATCH 30/41] Keep battery-bar on ambient disabled by default [Test]

Change-Id: I1e8802e25128fddc6dcd6e3854e8bcdc795980f4
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../systemui/statusbar/KeyguardIndicationController.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index d5c5eb1352c..0c277d85697 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -325,7 +325,7 @@ protected final void updateIndication(boolean animate) {
             final boolean showWattOnCharging = Dependency.get(TunerService.class)
                     .getValue(KEYGUARD_SHOW_WATT_ON_CHARGING, 0) == 1;
             final boolean showBatteryBar = Dependency.get(TunerService.class)
-                    .getValue(KEYGUARD_SHOW_BATTERY_BAR, 1) == 1;
+                    .getValue(KEYGUARD_SHOW_BATTERY_BAR, 0) == 1;
             final boolean showBatteryBarAlways = Dependency.get(TunerService.class)
                     .getValue(KEYGUARD_SHOW_BATTERY_BAR_ALWAYS, 0) == 1;
             

From 28f82a42fcc79667846ba914d61810bf4405de0d Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 13 Apr 2019 10:58:22 +0000
Subject: [PATCH 31/41] Doze: Set Always On Display to off by default

Change-Id: Ib1a2a384dc4d0061236793ecaa604f0f47bb10fc
Signed-off-by: mydongistiny <jaysonedson@gmail.com>
Signed-off-by: DennySPB <dennyspb@gmail.com>
Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../internal/hardware/AmbientDisplayConfiguration.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
index d2ad3ab99b9..8c6772b32e5 100644
--- a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -114,8 +114,11 @@ private boolean pulseOnLongPressAvailable() {
     }
 
     public boolean alwaysOnEnabled(int user) {
-        return boolSetting(Settings.Secure.DOZE_ALWAYS_ON, user, mAlwaysOnByDefault ? 1 : 0)
-                && alwaysOnAvailable() && !accessibilityInversionEnabled(user);
+        final boolean aodEnabledDefault = false;
+        final boolean aodEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.DOZE_ALWAYS_ON, aodEnabledDefault ? 1 : 0, user) != 0;
+        return aodEnabled && alwaysOnAvailable()
+                && !accessibilityInversionEnabled(user);
     }
 
     public boolean isDozeEnabled() {

From cb16e8bc4fc2f02a345e22a0d45b086d28486d60 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 13 Apr 2019 14:50:53 +0000
Subject: [PATCH 32/41] Tuner : Disable AOD by default

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 packages/SystemUI/res/xml/tuner_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml
index c4ba2442ab2..9659fb7aaf8 100644
--- a/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@ -111,7 +111,7 @@
         <com.android.systemui.tuner.TunerSwitch
           android:key="doze_always_on"
           android:title="@string/tuner_doze_always_on"
-          sysui:defValue="true" />
+          sysui:defValue="false" />
 
     </PreferenceScreen>
 

From 3b775a59cd16dd1f61098184c8c3c97fa36a023d Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Sat, 13 Apr 2019 22:55:53 +0000
Subject: [PATCH 33/41] Match screenshot icon with accent

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 core/res/res/drawable/ic_screenshot.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/res/res/drawable/ic_screenshot.xml b/core/res/res/drawable/ic_screenshot.xml
index 8c8b2ceba6d..0b19e145e90 100644
--- a/core/res/res/drawable/ic_screenshot.xml
+++ b/core/res/res/drawable/ic_screenshot.xml
@@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project
     android:height="24.0dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="@*android:color/accent_device_default_light">
     <path
         android:fillColor="#FF000000"
         android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM17,4H7V3h10V4z"/>

From 741db337358da5a3f8fe3e8927418e28d40ecd7c Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 10 May 2019 21:05:40 +0000
Subject: [PATCH 34/41] Revert "FOD: dont show FP icons if FOD is in use"

This reverts commit 6aa6203b5fd135fdbc04f21781f302fa35f0dd87.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../com/android/systemui/statusbar/phone/LockIcon.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
index de2c6ee1c6c..e0fee8d6c5a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -58,8 +58,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
     private boolean mHasFaceUnlockIcon;
     private int mDensity;
 
-    private boolean mDisplayFODView;
-
     private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);
 
     public LockIcon(Context context, AttributeSet attrs) {
@@ -67,9 +65,6 @@ public LockIcon(Context context, AttributeSet attrs) {
         mTrustDrawable = new TrustDrawable(context);
         setBackground(mTrustDrawable);
         mUnlockMethodCache = UnlockMethodCache.getInstance(context);
-        mDisplayFODView = context.getResources()
-                .getBoolean(com.android.internal.R.bool.config_needCustomFODView);
-
     }
 
     @Override
@@ -307,13 +302,13 @@ private int getState() {
         KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
         boolean fingerprintRunning = updateMonitor.isFingerprintDetectionRunning();
         boolean unlockingAllowed = updateMonitor.isUnlockingWithFingerprintAllowed();
-        if (mTransientFpError && !mDisplayFODView) {
+        if (mTransientFpError) {
             return STATE_FINGERPRINT_ERROR;
         } else if (mUnlockMethodCache.canSkipBouncer()) {
             return STATE_LOCK_OPEN;
         } else if (mUnlockMethodCache.isFaceUnlockRunning()) {
             return STATE_FACE_UNLOCK;
-        } else if (fingerprintRunning && unlockingAllowed && !mDisplayFODView) {
+        } else if (fingerprintRunning && unlockingAllowed) {
             return STATE_FINGERPRINT;
         } else {
             return STATE_LOCKED;

From f5beed062979b7a0059850ed10d27d64990cdecc Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 10 May 2019 21:05:43 +0000
Subject: [PATCH 35/41] Revert "fod: prevent reapplying modes if theres no
 changes"

This reverts commit d7687ca9fc0634a6cdb2700d1af716a597d8937b.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../systemui/fingerprint/FODCircleView.java   | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
index cdc24155bd8..2da1a524c76 100644
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
+++ b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
@@ -71,7 +71,6 @@ public class FODCircleView extends ImageView implements OnTouchListener {
     private boolean mIsDreaming;
     private boolean mIsPulsing;
     private boolean mIsScreenOn;
-    private boolean mChange;
 
     public boolean viewAdded;
     private boolean mIsEnrolling;
@@ -99,20 +98,17 @@ public void onPulsing(boolean pulsing) {
         public void onScreenTurnedOff() {
             super.onScreenTurnedOff();
             mInsideCircle = false;
-            mChange = true;
         }
 
         @Override
         public void onStartedGoingToSleep(int why) {
             super.onStartedGoingToSleep(why);
             mInsideCircle = false;
-            mChange = true;
         }
 
         @Override
         public void onFinishedGoingToSleep(int why) {
             super.onFinishedGoingToSleep(why);
-            mChange = true;
         }
 
         @Override
@@ -122,7 +118,6 @@ public void onStartedWakingUp() {
                 mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
             } catch (RemoteException e) {}
             super.onStartedWakingUp();
-            mChange = true;
         }
 
         @Override
@@ -130,14 +125,12 @@ public void onScreenTurnedOn() {
            super.onScreenTurnedOn();
            mIsScreenOn = true;
            mInsideCircle = false;
-           mChange = true;
         }
 
         @Override
         public void onKeyguardVisibilityChanged(boolean showing) {
             super.onKeyguardVisibilityChanged(showing);
             mInsideCircle = false;
-            mChange = true;
         }
 
         @Override
@@ -147,13 +140,11 @@ public void onKeyguardBouncerChanged(boolean isBouncer) {
             } else if (!viewAdded) {
                 show();
             }
-            mChange = true;
         }
 
         @Override
         public void onStrongAuthStateChanged(int userId) {
             super.onStrongAuthStateChanged(userId);
-            mChange = true;
         }
 
         @Override
@@ -164,7 +155,6 @@ public void onFingerprintAuthenticated(int userId) {
                 mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
                 mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
             } catch (RemoteException e) {}
-            mChange = true;
         }
     };
 
@@ -208,15 +198,12 @@ protected void onDraw(Canvas canvas) {
                 mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 1);
             } catch (RemoteException e) {}
         } else {
-            if (mChange) {
-                try {
-                    mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
-                    mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
-                    //canvas.drawCircle(mW/2, mH/2, (float) (mW/2.0f), this.mPaintShow);
-                } catch (RemoteException e) {}
-            }
+            try {
+                mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
+                mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
+                //canvas.drawCircle(mW/2, mH/2, (float) (mW/2.0f), this.mPaintShow);
+            } catch (RemoteException e) {}
         }
-        mChange = false;
     }
 
     @Override
@@ -295,7 +282,6 @@ public void show(boolean isEnrolling) {
         mParams.gravity = Gravity.TOP | Gravity.LEFT;
         mWM.addView(this, mParams);
         viewAdded = true;
-        mChange = true;
     }
 
     public void hide() {

From 9c7af8c3da037b7ca4e1366ab32b836df0f4c737 Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 10 May 2019 21:05:46 +0000
Subject: [PATCH 36/41] Revert "fod: differentiate dreaming and pulse"

This reverts commit 471195f1d20600770bdc05fd3dc7befc37054539.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../keyguard/KeyguardUpdateMonitor.java       | 13 -----------
 .../KeyguardUpdateMonitorCallback.java        |  5 -----
 .../systemui/fingerprint/FODCircleView.java   | 22 +++++--------------
 .../systemui/statusbar/phone/StatusBar.java   |  4 ++--
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 29bd183e516..bf897ab4bee 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -215,7 +215,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     private boolean mKeyguardOccluded;
     @VisibleForTesting
     protected boolean mTelephonyCapable;
-    protected boolean mPulsing;
 
     // Device provisioning state
     private boolean mDeviceProvisioned;
@@ -1880,7 +1879,6 @@ private void sendUpdates(KeyguardUpdateMonitorCallback callback) {
         callback.onClockVisibilityChanged();
         callback.onKeyguardVisibilityChangedRaw(mKeyguardIsVisible);
         callback.onTelephonyCapable(mTelephonyCapable);
-        callback.onPulsing(mPulsing);
         for (Entry<Integer, SimData> data : mSimDatas.entrySet()) {
             final SimData state = data.getValue();
             callback.onSimStateChanged(state.subId, state.slotId, state.simState);
@@ -2192,15 +2190,4 @@ public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
             pw.println("    trustManaged=" + getUserTrustIsManaged(userId));
         }
     }
-
-    public boolean setPulsing(boolean pulsing) {
-        mPulsing = pulsing;
-        for (int i = 0; i < mCallbacks.size(); i++) {
-            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
-            if (cb != null) {
-                cb.onPulsing(mPulsing);
-            }
-        }
-        return mPulsing;
-    }
 }
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
index 3e9a87d00d2..2cdd4a5886c 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
@@ -296,9 +296,4 @@ public void onTrustAgentErrorMessage(CharSequence message) { }
      */
     public void onLogoutEnabledChanged() { }
 
-    /**
-     * Called when a pulsing is received.
-     */
-    public void onPulsing(boolean pulsing) { }
-
 }
diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
index 2da1a524c76..e02a8f19587 100644
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
+++ b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
@@ -78,21 +78,12 @@ public class FODCircleView extends ImageView implements OnTouchListener {
     KeyguardUpdateMonitor mUpdateMonitor;
 
     KeyguardUpdateMonitorCallback mMonitorCallback = new KeyguardUpdateMonitorCallback() {
-        @Override
-        public void onDreamingStateChanged(boolean dreaming) {
-            super.onDreamingStateChanged(dreaming);
-            mIsDreaming = dreaming;
-            mInsideCircle = false;
-            mChange = true;
-        }
-
-        @Override
-        public void onPulsing(boolean pulsing) {
-            super.onPulsing(pulsing);
-            mIsPulsing = pulsing;
-            mInsideCircle = false;
-            mChange = true;
-        }
+       @Override
+       public void onDreamingStateChanged(boolean dreaming) {
+           super.onDreamingStateChanged(dreaming);
+           mIsDreaming = dreaming;
+           mInsideCircle = false;
+       }
 
         @Override
         public void onScreenTurnedOff() {
@@ -188,7 +179,6 @@ public void onFingerprintAuthenticated(int userId) {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         //TODO w!=h?
-
         if(mInsideCircle) {
             canvas.drawCircle(mW/2, mH/2, (float) (mW/2.0f), this.mPaintFingerprint);
             try {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index a25e79f3d78..1719585ed41 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -6120,14 +6120,14 @@ public void onPulseStarted() {
                         // Otherwise just show the always-on screen.
                         setPulsing(true);
                     }
-                    KeyguardUpdateMonitor.getInstance(mContext).setPulsing(true);
+                    setOnPulseEvent(reason, true);
                 }
 
                 @Override
                 public void onPulseFinished() {
                     callback.onPulseFinished();
                     setPulsing(false);
-                    KeyguardUpdateMonitor.getInstance(mContext).setPulsing(false);
+                    setOnPulseEvent(-1, false);
                 }
 
                 private void setPulsing(boolean pulsing) {

From 16705bd41e41790d14554a6e5ab8332434d5843e Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Fri, 10 May 2019 21:05:49 +0000
Subject: [PATCH 37/41] Revert "Initial support for OnePlus in-display
 fingerprint sensor"

This reverts commit 339db83e8e07fcd986f1538c6145b749e7f75288.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../internal/statusbar/IStatusBar.aidl        |   1 -
 .../internal/statusbar/IStatusBarService.aidl |   1 -
 core/res/res/values/custom_config.xml         |   5 -
 core/res/res/values/custom_symbols.xml        |   3 -
 packages/SystemUI/Android.mk                  |   4 +-
 .../res/drawable-xxhdpi/fod_icon_default.png  | Bin 22493 -> 0 bytes
 .../res/drawable-xxhdpi/fod_icon_empty.png    | Bin 137 -> 0 bytes
 packages/SystemUI/res/values/config.xml       |   1 -
 .../systemui/fingerprint/FODCircleView.java   | 293 ------------------
 .../fingerprint/FODCircleViewImpl.java        |  50 ---
 .../systemui/statusbar/CommandQueue.java      |  21 --
 services/core/Android.bp                      |   2 -
 .../fingerprint/AuthenticationClient.java     |  52 +---
 .../server/fingerprint/EnrollClient.java      |  39 +--
 .../fingerprint/FingerprintService.java       |  10 +-
 .../statusbar/StatusBarManagerService.java    |   9 -
 16 files changed, 5 insertions(+), 486 deletions(-)
 delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/fod_icon_default.png
 delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/fod_icon_empty.png
 delete mode 100644 packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
 delete mode 100644 packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleViewImpl.java

diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 8d4bc0662af..2a250faaf05 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -146,7 +146,6 @@ oneway interface IStatusBar
     void onFingerprintError(String error);
     // Used to hide the fingerprint dialog when the authenticationclient is stopped
     void hideFingerprintDialog();
-    void handleInDisplayFingerprintView(boolean show, boolean isEnrolling);
 
     /**
      * LIQUID
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index 36d355248f7..71135b976da 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -102,7 +102,6 @@ interface IStatusBarService
     void onFingerprintError(String error);
     // Used to hide the fingerprint dialog when the authenticationclient is stopped
     void hideFingerprintDialog();
-    void handleInDisplayFingerprintView(boolean show, boolean isEnrolling);
 
     /**
      * LIQUID
diff --git a/core/res/res/values/custom_config.xml b/core/res/res/values/custom_config.xml
index 1734ef41449..c8ee8ff1ed8 100644
--- a/core/res/res/values/custom_config.xml
+++ b/core/res/res/values/custom_config.xml
@@ -204,9 +204,4 @@
     <!-- Whether or not we should show vendor mismatch message -->
     <bool name="config_show_vendor_mismatch_message">false</bool>
 
-    <!-- Show a custom view for FOD -->
-    <bool name="config_needCustomFODView">false</bool>
-
-    <bool name="config_usesOnePlusFOD">false</bool>
-
 </resources>
diff --git a/core/res/res/values/custom_symbols.xml b/core/res/res/values/custom_symbols.xml
index 6d48aa4c47a..71b989b48b2 100644
--- a/core/res/res/values/custom_symbols.xml
+++ b/core/res/res/values/custom_symbols.xml
@@ -289,7 +289,4 @@
   <!-- Whether or not we should show vendor mismatch message -->
   <java-symbol type="bool" name="config_show_vendor_mismatch_message" />
 
-  <!-- FoD -->
-  <java-symbol type="bool" name="config_needCustomFODView" />
-  <java-symbol type="bool" name="config_usesOnePlusFOD" />
 </resources>
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index 4d4069861ff..2963d49daad 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -60,9 +60,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-proto \
     trail-drawing \
     rebound \
-    guava \
-    vendor.oneplus.fingerprint.extension-V1.0-java \
-    vendor.oneplus.hardware.display-V1.0-java
+    guava
 
 LOCAL_JAVA_LIBRARIES := telephony-common \
     android.car \
diff --git a/packages/SystemUI/res/drawable-xxhdpi/fod_icon_default.png b/packages/SystemUI/res/drawable-xxhdpi/fod_icon_default.png
deleted file mode 100644
index 885e348337e2be8ed5ecec0fe1a0fc9172cac444..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22493
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

diff --git a/packages/SystemUI/res/drawable-xxhdpi/fod_icon_empty.png b/packages/SystemUI/res/drawable-xxhdpi/fod_icon_empty.png
deleted file mode 100644
index 9b223ed2b2ee4f003daf99e5fff75f229268f6f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^>p+-;8A#5!bnFh0Vh->LaRt)Lt88xpDaMi@zhDN3
zXE)M-91~9$$B>F!Zx1r^0(plPeD{C*hEW8_#0~B+lzjpka`!qDNR6kfpUXO@geCx1
CW*+DO

diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index f977bb9baf1..e787d25fcfa 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -349,7 +349,6 @@
         <item>com.android.systemui.globalactions.GlobalActionsComponent</item>
         <item>com.android.systemui.ScreenDecorations</item>
         <item>com.android.systemui.fingerprint.FingerprintDialogImpl</item>
-        <item>com.android.systemui.fingerprint.FODCircleViewImpl</item>
         <item>com.android.systemui.SliceBroadcastRelayHandler</item>
     </string-array>
 
diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
deleted file mode 100644
index e02a8f19587..00000000000
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * Copyright (C) 2019 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 com.android.systemui.fingerprint;
-
-import android.app.KeyguardManager;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.content.Context;
-import android.hardware.display.DisplayManager;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.view.Display;
-import android.view.Gravity;
-import android.view.View.OnTouchListener;
-import android.view.View;
-import android.widget.ImageView;
-import android.view.MotionEvent;
-import android.view.WindowManager;
-import android.util.Log;
-import android.util.Slog;
-
-import com.android.keyguard.KeyguardUpdateMonitor;
-import com.android.keyguard.KeyguardUpdateMonitorCallback;
-import com.android.internal.telephony.IccCardConstants.State;
-import com.android.systemui.R;
-
-import java.io.PrintWriter;
-
-import vendor.oneplus.hardware.display.V1_0.IOneplusDisplay;
-
-public class FODCircleView extends ImageView implements OnTouchListener {
-    private final int mX, mY, mW, mH;
-    private final Paint mPaintFingerprint = new Paint();
-    private final Paint mPaintShow = new Paint();
-    private IOneplusDisplay mDisplayDaemon = null;
-    private boolean mInsideCircle = false;
-    private final WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
-
-    private final static float UNTOUCHED_DIM = .1f;
-    private final static float UNTOUCHED_DOZE_DIM = .4f;
-    private final static float TOUCHED_DIM = .9f;
-
-    private final int DISPLAY_AOD_MODE = 8;
-    private final int DISPLAY_APPLY_HIDE_AOD = 11;
-    private final int DISPLAY_NOTIFY_PRESS = 9;
-    private final int DISPLAY_SET_DIM = 10;
-
-    private final WindowManager mWM;
-
-    private final int mCircleX = 444;
-    private final int mCircleY = 1966;
-    private final int mCircleSize = 190;
-
-    private boolean mIsDreaming;
-    private boolean mIsPulsing;
-    private boolean mIsScreenOn;
-
-    public boolean viewAdded;
-    private boolean mIsEnrolling;
-
-    KeyguardUpdateMonitor mUpdateMonitor;
-
-    KeyguardUpdateMonitorCallback mMonitorCallback = new KeyguardUpdateMonitorCallback() {
-       @Override
-       public void onDreamingStateChanged(boolean dreaming) {
-           super.onDreamingStateChanged(dreaming);
-           mIsDreaming = dreaming;
-           mInsideCircle = false;
-       }
-
-        @Override
-        public void onScreenTurnedOff() {
-            super.onScreenTurnedOff();
-            mInsideCircle = false;
-        }
-
-        @Override
-        public void onStartedGoingToSleep(int why) {
-            super.onStartedGoingToSleep(why);
-            mInsideCircle = false;
-        }
-
-        @Override
-        public void onFinishedGoingToSleep(int why) {
-            super.onFinishedGoingToSleep(why);
-        }
-
-        @Override
-        public void onStartedWakingUp() {
-            try {
-                mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
-                mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
-            } catch (RemoteException e) {}
-            super.onStartedWakingUp();
-        }
-
-        @Override
-        public void onScreenTurnedOn() {
-           super.onScreenTurnedOn();
-           mIsScreenOn = true;
-           mInsideCircle = false;
-        }
-
-        @Override
-        public void onKeyguardVisibilityChanged(boolean showing) {
-            super.onKeyguardVisibilityChanged(showing);
-            mInsideCircle = false;
-        }
-
-        @Override
-        public void onKeyguardBouncerChanged(boolean isBouncer) {
-            if (viewAdded && isBouncer) {
-                hide();
-            } else if (!viewAdded) {
-                show();
-            }
-        }
-
-        @Override
-        public void onStrongAuthStateChanged(int userId) {
-            super.onStrongAuthStateChanged(userId);
-        }
-
-        @Override
-        public void onFingerprintAuthenticated(int userId) {
-            super.onFingerprintAuthenticated(userId);
-            mInsideCircle = false;
-            try {
-                mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
-                mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
-            } catch (RemoteException e) {}
-        }
-    };
-
-    FODCircleView(Context context) {
-        super(context);
-
-        mX = mCircleX;
-        mY = mCircleY;
-        mW = mCircleSize;
-        mH = mCircleSize;
-
-        mPaintFingerprint.setAntiAlias(true);
-        mPaintFingerprint.setColor(Color.GREEN);
-
-        setImageResource(R.drawable.fod_icon_default);
-
-        mPaintShow.setAntiAlias(true);
-        mPaintShow.setColor(Color.argb(0x18, 0x00, 0xff, 0x00));
-        setOnTouchListener(this);
-        mWM = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
-
-        try {
-            mDisplayDaemon = IOneplusDisplay.getService();
-        } catch (Exception e) {}
-
-        mUpdateMonitor = KeyguardUpdateMonitor.getInstance(context);
-        mUpdateMonitor.registerCallback(mMonitorCallback);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        //TODO w!=h?
-        if(mInsideCircle) {
-            canvas.drawCircle(mW/2, mH/2, (float) (mW/2.0f), this.mPaintFingerprint);
-            try {
-                //if (mIsDreaming) {
-                    mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 2);
-                //}
-                mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 1);
-            } catch (RemoteException e) {}
-        } else {
-            try {
-                mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
-                mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
-                //canvas.drawCircle(mW/2, mH/2, (float) (mW/2.0f), this.mPaintShow);
-            } catch (RemoteException e) {}
-        }
-    }
-
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        float x = event.getAxisValue(MotionEvent.AXIS_X);
-        float y = event.getAxisValue(MotionEvent.AXIS_Y);
-
-        boolean newInside = (x > 0 && x < mW) && (y > 0 && y < mW);
-
-        if(event.getAction() == MotionEvent.ACTION_UP) {
-            newInside = false;
-            try {
-                setImageResource(R.drawable.fod_icon_default);
-                mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
-                mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
-            } catch (RemoteException e) {}
-        }
-
-        if(newInside == mInsideCircle) return mInsideCircle;
-
-        mInsideCircle = newInside;
-
-        invalidate();
-
-        if(!mInsideCircle) {
-            //mParams.screenBrightness = .0f;
-            setImageResource(R.drawable.fod_icon_default);
-            mParams.dimAmount = mIsDreaming ? UNTOUCHED_DOZE_DIM : UNTOUCHED_DIM;
-            mWM.updateViewLayout(this, mParams);
-            return false;
-        }
-        if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            setImageResource(R.drawable.fod_icon_empty);
-            mParams.dimAmount = TOUCHED_DIM;
-            //mParams.screenBrightness = 1.0f;
-            mWM.updateViewLayout(this, mParams);
-        }
-        return true;
-    }
-
-    public void show() {
-        show(false);
-    }
-
-    public void show(boolean isEnrolling) {
-        if (!isEnrolling && (!mUpdateMonitor.isUnlockWithFingerprintPossible(KeyguardUpdateMonitor.getCurrentUser()) ||
-            !mUpdateMonitor.isUnlockingWithFingerprintAllowed())) {
-            return;
-        }
-        if(mX == -1 || mY == -1 || mW == -1 || mH == -1) return;
-
-        mParams.x = mX;
-        mParams.y = mY;
-
-        mParams.height = mW;
-        mParams.width = mH;
-        mParams.format = PixelFormat.TRANSLUCENT;
-
-        mParams.type = WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
-        mParams.setTitle("Fingerprint on display");
-        mParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
-            WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH |
-            WindowManager.LayoutParams.FLAG_DIM_BEHIND |
-            WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
-        mParams.dimAmount = UNTOUCHED_DIM;
-
-        mParams.packageName = "android";
-
-        setImageResource(R.drawable.fod_icon_default);
-        mIsEnrolling = isEnrolling;
-        if (mIsEnrolling) {
-            try {
-               mDisplayDaemon.setMode(DISPLAY_SET_DIM, 1);
-            } catch (RemoteException e) {}
-        }
-        mParams.gravity = Gravity.TOP | Gravity.LEFT;
-        mWM.addView(this, mParams);
-        viewAdded = true;
-    }
-
-    public void hide() {
-        if(mX == -1 || mY == -1 || mW == -1 || mH == -1) return;
-
-        try {
-            mDisplayDaemon.setMode(DISPLAY_AOD_MODE, 0);
-            mDisplayDaemon.setMode(DISPLAY_NOTIFY_PRESS, 0);
-        } catch (RemoteException e) {}
-        if (mIsEnrolling) {
-            try {
-               mDisplayDaemon.setMode(DISPLAY_SET_DIM, 0);
-            } catch (RemoteException e) {}
-        }
-        mInsideCircle = false;
-        mWM.removeView(this);
-        viewAdded = false;
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleViewImpl.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleViewImpl.java
deleted file mode 100644
index c432d3c0266..00000000000
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleViewImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2019 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 com.android.systemui.fingerprint;
-
-import android.content.pm.PackageManager;
-import android.util.Log;
-import android.view.View;
-
-import com.android.systemui.SystemUI;
-import com.android.systemui.statusbar.CommandQueue;
-import com.android.systemui.statusbar.CommandQueue.Callbacks;
-
-public class FODCircleViewImpl extends SystemUI implements CommandQueue.Callbacks {
-    private static final String TAG = "FODCircleViewImpl";
-    private FODCircleView mfodCircleView;
-
-
-    @Override
-    public void start() {
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
-            return;
-        }
-        getComponent(CommandQueue.class).addCallbacks(this);
-    }
-
-    @Override
-    public void handleInDisplayFingerprintView(boolean show, boolean isEnrolling) {
-        if (mfodCircleView == null)
-            mfodCircleView = new FODCircleView(mContext);
-        if (!mfodCircleView.viewAdded && show)
-            mfodCircleView.show(isEnrolling);
-        else if (mfodCircleView.viewAdded)
-            mfodCircleView.hide();
-    }
-}
-
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 7457ab82407..20c4d2c6534 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -103,7 +103,6 @@ public class CommandQueue extends IStatusBar.Stub {
     private static final int MSG_TOGGLE_FLASHLIGHT             = 53 << MSG_SHIFT;
     private static final int MSG_TOGGLE_NAVIGATION_EDITOR      = 54 << MSG_SHIFT;
     private static final int MSG_DISPATCH_NAVIGATION_EDITOR_RESULTS = 55 << MSG_SHIFT;
-    private static final int MSG_IN_DISPLAY_FINGERPRINT        = 56 << MSG_SHIFT;
 
     public static final int FLAG_EXCLUDE_NONE = 0;
     public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -176,7 +175,6 @@ default void onFingerprintAuthenticated() { }
         default void onFingerprintHelp(String message) { }
         default void onFingerprintError(String error) { }
         default void hideFingerprintDialog() { }
-        default void handleInDisplayFingerprintView(boolean show, boolean isEnrolling) { }
         default void toggleCameraFlash() { }
         default void setAutoRotate(boolean enabled) { }
         default void restartUI() { }
@@ -617,17 +615,6 @@ public void hideFingerprintDialog() {
         }
     }
 
-    @Override
-    public void handleInDisplayFingerprintView(boolean show, boolean isEnrolling) {
-        synchronized (mLock) {
-            SomeArgs args = SomeArgs.obtain();
-            args.arg1 = show;
-            args.arg2 = isEnrolling;
-            mHandler.obtainMessage(MSG_IN_DISPLAY_FINGERPRINT, args)
-                    .sendToTarget();
-        }
-    }
-
     @Override
     public void toggleCameraFlash() {
         synchronized (mLock) {
@@ -882,14 +869,6 @@ public void handleMessage(Message msg) {
                     for (int i = 0; i < mCallbacks.size(); i++) {
                         mCallbacks.get(i).hideFingerprintDialog();
                     }
-                    break;
-                case MSG_IN_DISPLAY_FINGERPRINT:
-                    for (int i = 0; i < mCallbacks.size(); i++) {
-                        mCallbacks.get(i).handleInDisplayFingerprintView(
-                                (boolean)((SomeArgs)msg.obj).arg1,
-                                (boolean)((SomeArgs)msg.obj).arg2);
-                    }
-
                     break;
                 case MSG_SHOW_CHARGING_ANIMATION:
                     for (int i = 0; i < mCallbacks.size(); i++) {
diff --git a/services/core/Android.bp b/services/core/Android.bp
index dd7996d3065..d6cde0353bd 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -44,8 +44,6 @@ java_library_static {
         "android.hardware.vibrator-V1.0-java",
         "android.hardware.configstore-V1.0-java",
         "android.hardware.contexthub-V1.0-java",
-        "vendor.oneplus.fingerprint.extension-V1.0-java",
-        "vendor.oneplus.hardware.display-V1.0-java",
     ],
 }
 
diff --git a/services/core/java/com/android/server/fingerprint/AuthenticationClient.java b/services/core/java/com/android/server/fingerprint/AuthenticationClient.java
index b9e376271fa..afd1a94bf50 100644
--- a/services/core/java/com/android/server/fingerprint/AuthenticationClient.java
+++ b/services/core/java/com/android/server/fingerprint/AuthenticationClient.java
@@ -17,8 +17,6 @@
 package com.android.server.fingerprint;
 
 import android.content.Context;
-import android.content.ComponentName;
-import android.content.res.Resources;
 import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.IBiometricPromptReceiver;
@@ -28,15 +26,12 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.content.pm.PackageManager;
 import android.util.Slog;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.statusbar.IStatusBarService;
 
-import vendor.oneplus.fingerprint.extension.V1_0.IVendorFingerprintExtensions;
-
 /**
  * A class to keep track of the authentication state for a given client.
  */
@@ -59,12 +54,6 @@ public abstract class AuthenticationClient extends ClientMonitor {
     private final FingerprintManager mFingerprintManager;
     protected boolean mDialogDismissed;
 
-    private boolean mDisplayFODView;
-    private IVendorFingerprintExtensions mExtDaemon = null;
-    private final String mKeyguardPackage;
-    private static final int DISABLE_FP_LONGPRESS = 4;
-    private static final int ENABLE_FP_LONGPRESS = 3;
-
     // Receives events from SystemUI and handles them before forwarding them to FingerprintDialog
     protected IBiometricPromptReceiver mDialogReceiver = new IBiometricPromptReceiver.Stub() {
         @Override // binder call
@@ -107,9 +96,6 @@ public AuthenticationClient(Context context, long halDeviceId, IBinder token,
         mStatusBarService = statusBarService;
         mFingerprintManager = (FingerprintManager) getContext()
                 .getSystemService(Context.FINGERPRINT_SERVICE);
-        mDisplayFODView = context.getResources().getBoolean(com.android.internal.R.bool.config_needCustomFODView);
-        mKeyguardPackage = ComponentName.unflattenFromString(context.getResources().getString(
-                com.android.internal.R.string.config_keyguardComponent)).getPackageName();
     }
 
     @Override
@@ -247,11 +233,6 @@ public boolean onAuthenticated(int fingerId, int groupId) {
             resetFailedAttempts();
             onStop();
         }
-        if(result == true && mDisplayFODView) {
-            try {
-                mStatusBarService.handleInDisplayFingerprintView(false, false);
-            } catch (RemoteException e) {}
-        }
         return result;
     }
 
@@ -265,21 +246,6 @@ public int start() {
             Slog.w(TAG, "start authentication: no fingerprint HAL!");
             return ERROR_ESRCH;
         }
-
-        if (mDisplayFODView) {
-            try {
-                mExtDaemon = IVendorFingerprintExtensions.getService();
-                Slog.w(TAG, "getOwnerString : " + isKeyguard(getOwnerString()));
-
-                if (isKeyguard(getOwnerString())) {
-                    mExtDaemon.updateStatus(ENABLE_FP_LONGPRESS);
-                } else {
-                    mExtDaemon.updateStatus(DISABLE_FP_LONGPRESS);
-                }
-
-                mStatusBarService.handleInDisplayFingerprintView(true, false);
-            } catch (RemoteException e) {}
-        }
         onStart();
         try {
             final int result = daemon.authenticate(mOpId, getGroupId());
@@ -292,7 +258,7 @@ public int start() {
             if (DEBUG) Slog.w(TAG, "client " + getOwnerString() + " is authenticating...");
 
             // If authenticating with system dialog, show the dialog
-            if (!mDisplayFODView && mBundle != null) {
+            if (mBundle != null) {
                 try {
                     mStatusBarService.showFingerprintDialog(mBundle, mDialogReceiver);
                 } catch (RemoteException e) {
@@ -306,14 +272,6 @@ public int start() {
         return 0; // success
     }
 
-    /**
-     * @param clientPackage
-     * @return true if this is keyguard package
-     */
-    private boolean isKeyguard(String clientPackage) {
-        return mKeyguardPackage.equals(clientPackage);
-    }
-
     @Override
     public int stop(boolean initiatedByClient) {
         if (mAlreadyCancelled) {
@@ -321,12 +279,6 @@ public int stop(boolean initiatedByClient) {
             return 0;
         }
 
-        if (mDisplayFODView) {
-            try {
-                mStatusBarService.handleInDisplayFingerprintView(false, false);
-            } catch (RemoteException e) {}
-        }
-
         onStop();
         IBiometricsFingerprint daemon = getFingerprintDaemon();
         if (daemon == null) {
@@ -348,7 +300,7 @@ public int stop(boolean initiatedByClient) {
             // dialog, we do not need to hide it since it's already hidden.
             // If the device is in lockout, don't hide the dialog - it will automatically hide
             // after BiometricPrompt.HIDE_DIALOG_DELAY
-            if (!mDisplayFODView && mBundle != null && !mDialogDismissed && !mInLockout) {
+            if (mBundle != null && !mDialogDismissed && !mInLockout) {
                 try {
                     mStatusBarService.hideFingerprintDialog();
                 } catch (RemoteException e) {
diff --git a/services/core/java/com/android/server/fingerprint/EnrollClient.java b/services/core/java/com/android/server/fingerprint/EnrollClient.java
index 6b78a9ff67b..c9efcf2fd68 100644
--- a/services/core/java/com/android/server/fingerprint/EnrollClient.java
+++ b/services/core/java/com/android/server/fingerprint/EnrollClient.java
@@ -17,7 +17,6 @@
 package com.android.server.fingerprint;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
 import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.IFingerprintServiceReceiver;
@@ -27,12 +26,9 @@
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.statusbar.IStatusBarService;
 
 import java.util.Arrays;
 
-import vendor.oneplus.fingerprint.extension.V1_0.IVendorFingerprintExtensions;
-
 /**
  * A class to keep track of the enrollment state for a given client.
  */
@@ -40,20 +36,12 @@ public abstract class EnrollClient extends ClientMonitor {
     private static final long MS_PER_SEC = 1000;
     private static final int ENROLLMENT_TIMEOUT_MS = 60 * 1000; // 1 minute
     private byte[] mCryptoToken;
-    private boolean mDisplayFODView;
-    private IStatusBarService mStatusBarService;
-    private IVendorFingerprintExtensions mExtDaemon = null;
-    private static final int DISABLE_FP_LONGPRESS = 4;
-    private static final int RESUME_FP_ENROLL = 8;
-    private static final int FINISH_FP_ENROLL = 10;
 
     public EnrollClient(Context context, long halDeviceId, IBinder token,
             IFingerprintServiceReceiver receiver, int userId, int groupId, byte [] cryptoToken,
-            boolean restricted, String owner, IStatusBarService statusBarService) {
+            boolean restricted, String owner) {
         super(context, halDeviceId, token, receiver, userId, groupId, restricted, owner);
         mCryptoToken = Arrays.copyOf(cryptoToken, cryptoToken.length);
-        mDisplayFODView = context.getResources().getBoolean(com.android.internal.R.bool.config_needCustomFODView);
-        mStatusBarService = statusBarService;
     }
 
     @Override
@@ -81,13 +69,6 @@ private boolean sendEnrollResult(int fpId, int groupId, int remaining) {
         MetricsLogger.action(getContext(), MetricsEvent.ACTION_FINGERPRINT_ENROLL);
         try {
             receiver.onEnrollResult(getHalDeviceId(), fpId, groupId, remaining);
-            if(remaining == 0 && mDisplayFODView) {
-                try {
-                    mExtDaemon = IVendorFingerprintExtensions.getService();
-                    mExtDaemon.updateStatus(FINISH_FP_ENROLL);
-                    mStatusBarService.handleInDisplayFingerprintView(false, true);
-                } catch (RemoteException e) {}
-            }
             return remaining == 0;
         } catch (RemoteException e) {
             Slog.w(TAG, "Failed to notify EnrollResult:", e);
@@ -102,17 +83,6 @@ public int start() {
             Slog.w(TAG, "enroll: no fingerprint HAL!");
             return ERROR_ESRCH;
         }
-        Slog.w(TAG, "Starting enroll");
-
-        if (mDisplayFODView) {
-            try {
-                mExtDaemon = IVendorFingerprintExtensions.getService();
-                mExtDaemon.updateStatus(RESUME_FP_ENROLL);
-                mStatusBarService.handleInDisplayFingerprintView(true, true);
-                mExtDaemon.updateStatus(DISABLE_FP_LONGPRESS);
-            } catch (RemoteException e) {}
-        }
-
         final int timeout = (int) (ENROLLMENT_TIMEOUT_MS / MS_PER_SEC);
         try {
             final int result = daemon.enroll(mCryptoToken, getGroupId(), timeout);
@@ -134,13 +104,6 @@ public int stop(boolean initiatedByClient) {
             Slog.w(TAG, "stopEnroll: already cancelled!");
             return 0;
         }
-
-        if (mDisplayFODView) {
-            try {
-                mStatusBarService.handleInDisplayFingerprintView(false, true);
-            } catch (RemoteException e) {}
-        }
-
         IBiometricsFingerprint daemon = getFingerprintDaemon();
         if (daemon == null) {
             Slog.w(TAG, "stopEnrollment: no fingerprint HAL!");
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 9a2a284a66f..b4e137783ec 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -38,7 +38,6 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
-import android.content.res.Resources;
 import android.hardware.biometrics.IBiometricPromptReceiver;
 import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
 import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprintClientCallback;
@@ -152,8 +151,6 @@ private class PerformanceStats {
     private IBinder mToken = new Binder(); // used for internal FingerprintService enumeration
     private ArrayList<UserFingerprint> mUnknownFingerprints = new ArrayList<>(); // hw fingerprints
 
-    private boolean mUsesOnePlusFOD;
-
     private class UserFingerprint {
         Fingerprint f;
         int userId;
@@ -269,7 +266,6 @@ public FingerprintService(Context context) {
                 com.android.internal.R.bool.config_notifyClientOnFingerprintCancelSuccess);
         mCleanupUnusedFingerprints = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_cleanupUnusedFingerprints);
-        mUsesOnePlusFOD = context.getResources().getBoolean(com.android.internal.R.bool.config_usesOnePlusFOD);
     }
 
     @Override
@@ -401,10 +397,6 @@ protected void handleEnumerate(long deviceId, int fingerId, int groupId, int rem
     }
 
     protected void handleError(long deviceId, int error, int vendorCode) {
-
-        if (mUsesOnePlusFOD && error == 8)
-            return;
-
         ClientMonitor client = mCurrentClient;
         if (client instanceof InternalRemovalClient || client instanceof InternalEnumerateClient) {
             clearEnumerateState();
@@ -963,7 +955,7 @@ private void startEnrollment(IBinder token, byte [] cryptoToken, int userId,
         final int groupId = userId; // default group for fingerprint enrollment
 
         EnrollClient client = new EnrollClient(getContext(), mHalDeviceId, token, receiver,
-                userId, groupId, cryptoToken, restricted, opPackageName, mStatusBarService) {
+                userId, groupId, cryptoToken, restricted, opPackageName) {
 
             @Override
             public IBiometricsFingerprint getFingerprintDaemon() {
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 9e82de52711..c1e64899a5c 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -754,15 +754,6 @@ public void hideFingerprintDialog() {
         }
     }
 
-    @Override
-    public void handleInDisplayFingerprintView(boolean show, boolean isEnrolling) {
-        if (mBar != null) {
-            try {
-                mBar.handleInDisplayFingerprintView(show, isEnrolling);
-            } catch (RemoteException ex) {}
-        }
-    }
-
     @Override
     public void toggleCameraFlash() {
         if (mBar != null) {

From 8ef9e84c31275021e539b21f1c0daab1a408e55e Mon Sep 17 00:00:00 2001
From: sayan7848 <sayan7848@gmail.com>
Date: Thu, 3 Oct 2019 08:03:43 +0000
Subject: [PATCH 38/41] Avoid a rogue SystemUI crash A nullpointer exception
 occured when opening LiquidLounge>StatusBar or LiquidLounge>Notifications for
 the first time after a clean flash. This is a stopgap fix until we figure out
 the real reason behind the exception.

Signed-off-by: sayan7848 <sayan7848@gmail.com>
---
 .../systemui/statusbar/phone/CollapsedStatusBarFragment.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
index 0eae8ce29d7..5b3940dbf0b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java
@@ -443,6 +443,8 @@ private void setCarrierLabel(boolean animate) {
     }
 
     public void updateLogoSettings(boolean animate) {
+        if (getContext() == null)
+            return;
         mShowLogo = Settings.System.getIntForUser(
             getContext().getContentResolver(), Settings.System.STATUS_BAR_LOGO, 0,
             UserHandle.USER_CURRENT) == 1;

From c8e80669cd019976605667068babf10508be6307 Mon Sep 17 00:00:00 2001
From: Mihai Popa <popam@google.com>
Date: Tue, 25 Jun 2019 11:15:18 +0100
Subject: [PATCH 39/41] Fix Layout.primaryIsTrailingPreviousAllLineOffsets

The CL fixes a crash in Layout.primaryIsTrailingPreviousAllLineOffsets.
The crash was happening when the method was called for a line beginning
with an empty bidi run. This could happen, for example, for empty text -
I was unable to find any other case. The CL improves the existing test
for the method with this case, which was previously crashing.

The CL also fixes a potential crash in getLineHorizontals. However, this
bug could never happen as in the current code path clamped is always
false (and kept as parameter for parity with getHorizontal).

Bug: 135444178
Bug: 78464361
Test: atest FrameworksCoreTests:android.text.LayoutTest\#testPrimaryIsTrailingPrevious
Change-Id: I47157abe1d74675884734e3810628a566e40c1b4
(cherry picked from commit 7ad499d00716f45fffdf7331493ed21d1b8d9b77)
(cherry picked from commit 9109ce6b0af6fc94b79cf855a10d85e107c768c2)
---
 core/java/android/text/Layout.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index c6f73cb4757..c02f7ef65a7 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1099,6 +1099,9 @@ private boolean[] primaryIsTrailingPreviousAllLineOffsets(int line) {
             if (limit > lineEnd) {
                 limit = lineEnd;
             }
+            if (limit == start) {
+                continue;
+            }
             level[limit - lineStart - 1] =
                     (byte) ((runs[i + 1] >>> RUN_LEVEL_SHIFT) & RUN_LEVEL_MASK);
         }
@@ -1194,8 +1197,8 @@ private float getHorizontal(int offset, boolean trailing, int line, boolean clam
     }
 
     /**
-     * Computes in linear time the results of calling
-     * #getHorizontal for all offsets on a line.
+     * Computes in linear time the results of calling #getHorizontal for all offsets on a line.
+     *
      * @param line The line giving the offsets we compute information for
      * @param clamped Whether to clamp the results to the width of the layout
      * @param primary Whether the results should be the primary or the secondary horizontal
@@ -1230,7 +1233,7 @@ private float[] getLineHorizontals(int line, boolean clamped, boolean primary) {
         TextLine.recycle(tl);
 
         if (clamped) {
-            for (int offset = 0; offset <= wid.length; ++offset) {
+            for (int offset = 0; offset < wid.length; ++offset) {
                 if (wid[offset] > mWidth) {
                     wid[offset] = mWidth;
                 }

From 0a43e322932e3a79cd3f73df41509748243e9fe1 Mon Sep 17 00:00:00 2001
From: Chienyuan <chienyuanhuang@google.com>
Date: Tue, 9 Jul 2019 15:09:56 +0800
Subject: [PATCH 40/41] HidProfile: sync isPreferred() with HidHostService

HidHostService allow to connect when priority is PRIORITY_UNDEFINED.
HidProfile should return ture when priority is PRIORITY_UNDEFINED.
Otherwise, the "Input device" toggle in off state when HID device
connected.

Bug: 132456322
Test: manual
Change-Id: Id7bae694c57aec17e019d591c0a677e3cb64f845
(cherry picked from commit 830217f277e31e63d9ab8acd21ee2a8f81ee1c8f)
---
 .../src/com/android/settingslib/bluetooth/HidProfile.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
index 93e56217939..505e019a654 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java
@@ -126,7 +126,7 @@ public int getConnectionStatus(BluetoothDevice device) {
 
     public boolean isPreferred(BluetoothDevice device) {
         if (mService == null) return false;
-        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
+        return mService.getPriority(device) != BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {

From 26facb3388b5b1c91b7480292001238adedc3b59 Mon Sep 17 00:00:00 2001
From: Bryan Ferris <bferris@google.com>
Date: Thu, 27 Jun 2019 14:39:46 -0700
Subject: [PATCH 41/41] Correct argument order in permission check

The function 'checkAccess' recieves the uid and pid in that order and
forwards them to checkSlicePermission in the same order. However,
checkSlicePermission expects them in the opposite order.

Bug: 135551349
Test: atest FrameworksUiServicesTests
Change-Id: I6e49efeab08f0e2a29d9830e6f81905598ae410c
(cherry picked from commit d2432fc3e35eacb308b620174849b29aa74eee05)
---
 .../core/java/com/android/server/slice/SliceManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java
index e8f255f4dfc..f5947ee35ea 100644
--- a/services/core/java/com/android/server/slice/SliceManagerService.java
+++ b/services/core/java/com/android/server/slice/SliceManagerService.java
@@ -390,7 +390,7 @@ public Handler getHandler() {
     }
 
     protected int checkAccess(String pkg, Uri uri, int uid, int pid) {
-        return checkSlicePermission(uri, pkg, uid, pid, null);
+        return checkSlicePermission(uri, pkg, pid, uid, null);
     }
 
     private String getProviderPkg(Uri uri, int user) {