Some minor fixes + tuner enhancement

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",

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) {

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>";
         }

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);
         }
     }

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
          *

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;
                 }

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() {

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

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

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");