Bump ws from 8.11.0 to 8.18.1 in /packages/SystemUI/scripts/token_alignment

Android.bp

@@ -142,6 +142,8 @@ filegroup {
         ":vold_aidl",
         ":deviceproductinfoconstants_aidl",
 
+        ":adbrootservice_aidl",
+
         // For the generated R.java and Manifest.java
         ":framework-res{.aapt.srcjar}",
 
@@ -265,6 +267,11 @@ java_library {
 
         "com.android.sysprop.localization",
         "PlatformProperties",
+        "vendor.lineage.livedisplay-V2.0-java",
+        "vendor.lineage.livedisplay-V2.1-java",
+        "vendor.lineage.touch-V1.0-java",
+        "vendor.lineage.health-V1-java",
+        "SurfaceFlingerProperties",
     ],
     sdk_version: "core_platform",
     installable: false,

apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java

@@ -74,6 +74,8 @@ void addPowerSaveTempWhitelistAppDirect(int uid, long duration,
 
     boolean isAppOnWhitelist(int appid);
 
+    int[] getPowerSaveWhitelistSystemAppIds();
+
     int[] getPowerSaveWhitelistUserAppIds();
 
     int[] getPowerSaveTempWhitelistAppIds();

apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java

@@ -111,6 +111,12 @@ public class AppStateTrackerImpl implements AppStateTracker {
     @GuardedBy("mLock")
     final SparseBooleanArray mActiveUids = new SparseBooleanArray();
 
+    /**
+     * System exemption list in the device idle controller.
+     */
+    @GuardedBy("mLock")
+    private int[] mPowerExemptSystemAppIds = new int[0];
+
     /**
      * System except-idle + user exemption list in the device idle controller.
      */
@@ -1041,13 +1047,15 @@ private void cleanUpArrayForUser(SparseBooleanArray array, int removedUserId) {
      * Called by device idle controller to update the power save exemption lists.
      */
     public void setPowerSaveExemptionListAppIds(
+            int[] powerSaveExemptionListSystemAppIdArray,
             int[] powerSaveExemptionListExceptIdleAppIdArray,
             int[] powerSaveExemptionListUserAppIdArray,
             int[] tempExemptionListAppIdArray) {
         synchronized (mLock) {
             final int[] previousExemptionList = mPowerExemptAllAppIds;
             final int[] previousTempExemptionList = mTempExemptAppIds;
 
+            mPowerExemptSystemAppIds = powerSaveExemptionListSystemAppIdArray;
             mPowerExemptAllAppIds = powerSaveExemptionListExceptIdleAppIdArray;
             mTempExemptAppIds = tempExemptionListAppIdArray;
             mPowerExemptUserAppIds = powerSaveExemptionListUserAppIdArray;
@@ -1265,6 +1273,18 @@ public boolean isUidPowerSaveUserExempt(int uid) {
         }
     }
 
+    /**
+     * @return whether or not a UID is in either the user defined power-save exemption list or the
+               system full exemption list (not including except-idle)
+     */
+    public boolean isUidPowerSaveIdleExempt(int uid) {
+        final int appId = UserHandle.getAppId(uid);
+        synchronized (mLock) {
+            return ArrayUtils.contains(mPowerExemptUserAppIds, appId)
+                    || ArrayUtils.contains(mPowerExemptSystemAppIds, appId);
+        }
+    }
+
     /**
      * @return whether a UID is in the temp power-save exemption list or not.
      *
@@ -1300,6 +1320,9 @@ public void dump(IndentingPrintWriter pw) {
             pw.print("Active uids: ");
             dumpUids(pw, mActiveUids);
 
+            pw.print("System exemption list appids: ");
+            pw.println(Arrays.toString(mPowerExemptSystemAppIds));
+
             pw.print("Except-idle + user exemption list appids: ");
             pw.println(Arrays.toString(mPowerExemptAllAppIds));
 
@@ -1375,6 +1398,10 @@ public void dumpProto(ProtoOutputStream proto, long fieldId) {
                 }
             }
 
+            for (int appId : mPowerExemptSystemAppIds) {
+                proto.write(AppStateTrackerProto.POWER_SAVE_SYSTEM_EXEMPT_APP_IDS, appId);
+            }
+
             for (int appId : mPowerExemptAllAppIds) {
                 proto.write(AppStateTrackerProto.POWER_SAVE_EXEMPT_APP_IDS, appId);
             }

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

@@ -580,6 +580,12 @@ static String lightStateToString(int state) {
      */
     private final SparseBooleanArray mPowerSaveWhitelistSystemAppIds = new SparseBooleanArray();
 
+    /**
+     * Current system app IDs that are in the complete power save white list.  This array can
+     * be shared with others because it will not be modified once set.
+     */
+    private int[] mPowerSaveWhitelistSystemAppIdArray = new int[0];
+
     /**
      * App IDs that have been white-listed to opt out of power save restrictions, except
      * for device idle modes.
@@ -2382,6 +2388,11 @@ public String[] getFullPowerWhitelistExceptIdle() {
             return DeviceIdleController.this.getFullPowerWhitelistInternalUnchecked();
         }
 
+        @Override
+        public int[] getPowerSaveWhitelistSystemAppIds() {
+            return DeviceIdleController.this.getPowerSaveWhitelistSystemAppIds();
+        }
+
         /**
          * Returns the array of app ids whitelisted by user. Take care not to
          * modify this, as it is a reference to the original copy. But the reference
@@ -2607,6 +2618,12 @@ boolean isAppOnWhitelistInternal(int appid) {
         }
     }
 
+    int[] getPowerSaveWhitelistSystemAppIds() {
+        synchronized (this) {
+            return mPowerSaveWhitelistSystemAppIdArray;
+        }
+    }
+
     int[] getPowerSaveWhitelistUserAppIds() {
         synchronized (this) {
             return mPowerSaveWhitelistUserAppIdArray;
@@ -2617,6 +2634,16 @@ private static File getSystemDir() {
         return new File(Environment.getDataDirectory(), "system");
     }
 
+    /** Returns the keys of a SparseBooleanArray, paying no attention to its values. */
+    private static int[] keysToIntArray(final SparseBooleanArray sparseArray) {
+        final int size = sparseArray.size();
+        final int[] array = new int[size];
+        for (int i = 0; i < size; i++) {
+            array[i] = sparseArray.keyAt(i);
+        }
+        return array;
+    }
+
     @Override
     public void onStart() {
         final PackageManager pm = getContext().getPackageManager();
@@ -2663,6 +2690,7 @@ public void onStart() {
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
+            mPowerSaveWhitelistSystemAppIdArray = keysToIntArray(mPowerSaveWhitelistSystemAppIds);
 
             mConstants = mInjector.getConstants(this, mHandler, getContext().getContentResolver());
 
@@ -4464,6 +4492,7 @@ private void reportTempWhitelistChangedLocked(final int uid, final boolean added
 
     private void passWhiteListsToForceAppStandbyTrackerLocked() {
         mAppStateTracker.setPowerSaveExemptionListAppIds(
+                mPowerSaveWhitelistSystemAppIdArray,
                 mPowerSaveWhitelistExceptIdleAppIdArray,
                 mPowerSaveWhitelistUserAppIdArray,
                 mTempWhitelistAppIdArray);

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

@@ -2739,7 +2739,7 @@ public void set(String callingPackage,
             } else if (workSource == null && (UserHandle.isCore(callingUid)
                     || UserHandle.isSameApp(callingUid, mSystemUiUid)
                     || ((mAppStateTracker != null)
-                    && mAppStateTracker.isUidPowerSaveUserExempt(callingUid)))) {
+                    && mAppStateTracker.isUidPowerSaveIdleExempt(callingUid)))) {
                 flags |= FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED;
                 flags &= ~(FLAG_ALLOW_WHILE_IDLE | FLAG_PRIORITIZE);
             }

apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java

@@ -75,6 +75,7 @@ public final class DeviceIdleJobsController extends StateController {
      * True when in device idle mode, so we don't want to schedule any jobs.
      */
     private boolean mDeviceIdleMode;
+    private int[] mPowerSaveWhitelistSystemAppIds;
     private int[] mDeviceIdleWhitelistAppIds;
     private int[] mPowerSaveTempWhitelistAppIds;
 
@@ -134,6 +135,8 @@ public DeviceIdleJobsController(JobSchedulerService service) {
         mLocalDeviceIdleController =
                 LocalServices.getService(DeviceIdleInternal.class);
         mDeviceIdleWhitelistAppIds = mLocalDeviceIdleController.getPowerSaveWhitelistUserAppIds();
+        mPowerSaveWhitelistSystemAppIds =
+                mLocalDeviceIdleController.getPowerSaveWhitelistSystemAppIds();
         mPowerSaveTempWhitelistAppIds =
                 mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
         mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor();
@@ -197,8 +200,9 @@ public void setUidActiveLocked(int uid, boolean active) {
      * Checks if the given job's scheduling app id exists in the device idle user whitelist.
      */
     boolean isWhitelistedLocked(JobStatus job) {
-        return Arrays.binarySearch(mDeviceIdleWhitelistAppIds,
-                UserHandle.getAppId(job.getSourceUid())) >= 0;
+        final int appId = UserHandle.getAppId(job.getSourceUid());
+        return Arrays.binarySearch(mDeviceIdleWhitelistAppIds, appId) >= 0
+                || Arrays.binarySearch(mPowerSaveWhitelistSystemAppIds, appId) >= 0;
     }
 
     /**

core/api/current.txt

@@ -37620,6 +37620,7 @@ package android.provider {
     field public static final String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";
     field public static final String SETTINGS_CLASSNAME = "settings_classname";
     field public static final String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";
+    field public static final String TETHERING_ALLOW_VPN_UPSTREAMS = "tethering_allow_vpn_upstreams";
     field public static final String TOUCH_EXPLORATION_ENABLED = "touch_exploration_enabled";
     field @Deprecated public static final String TTS_DEFAULT_COUNTRY = "tts_default_country";
     field @Deprecated public static final String TTS_DEFAULT_LANG = "tts_default_lang";

core/java/android/adb/ADBRootService.java

@@ -0,0 +1,105 @@
+/*
+ * 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 android.adb;
+
+import android.adbroot.IADBRootService;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.Slog;
+
+/**
+ * {@hide}
+ */
+public class ADBRootService {
+    private static final String TAG = "ADBRootService";
+
+    private static final String ADB_ROOT_SERVICE = "adbroot_service";
+
+    private IADBRootService mService;
+
+    private final IBinder.DeathRecipient mDeathRecipient = new IBinder.DeathRecipient() {
+        @Override
+        public void binderDied() {
+            if (mService != null) {
+                mService.asBinder().unlinkToDeath(this, 0);
+            }
+            mService = null;
+        }
+    };
+
+    private synchronized IADBRootService getService()
+            throws RemoteException {
+        if (mService != null) {
+            return mService;
+        }
+
+        final IBinder service = ServiceManager.getService(ADB_ROOT_SERVICE);
+        if (service != null) {
+            service.linkToDeath(mDeathRecipient, 0);
+            mService = IADBRootService.Stub.asInterface(service);
+            return mService;
+        }
+
+        Slog.e(TAG, "Unable to acquire ADBRootService");
+        return null;
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isSupported() {
+        try {
+            final IADBRootService svc = getService();
+            if (svc != null) {
+                return svc.isSupported();
+            }
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+        return false;
+    }
+
+    /**
+     * @hide
+     */
+    public void setEnabled(boolean enable) {
+        try {
+            final IADBRootService svc = getService();
+            if (svc != null) {
+                svc.setEnabled(enable);
+            }
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    /**
+     * @hide
+     */
+    public boolean getEnabled() {
+        try {
+            final IADBRootService svc = getService();
+            if (svc != null) {
+                return svc.getEnabled();
+            }
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+        return false;
+    }
+}

core/java/android/app/ApplicationPackageManager.java

@@ -132,6 +132,7 @@
 import com.android.internal.annotations.Immutable;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.os.SomeArgs;
+import com.android.internal.util.PropImitationHooks;
 import com.android.internal.util.UserIcons;
 
 import dalvik.system.VMRuntime;
@@ -832,7 +833,8 @@ public Boolean recompute(HasSystemFeatureQuery query) {
 
     @Override
     public boolean hasSystemFeature(String name, int version) {
-        return mHasSystemFeatureCache.query(new HasSystemFeatureQuery(name, version));
+        return PropImitationHooks.hasSystemFeature(name,
+                mHasSystemFeatureCache.query(new HasSystemFeatureQuery(name, version)));
     }
 
     /** @hide */

core/java/android/app/ConfigurationController.java

@@ -29,6 +29,9 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.HardwareRenderer;
+import android.graphics.Typeface;
+import android.inputmethodservice.InputMethodService;
+import android.os.Build;
 import android.os.LocaleList;
 import android.os.Trace;
 import android.util.DisplayMetrics;
@@ -198,6 +201,7 @@ private void handleConfigurationChangedInner(@Nullable Configuration config,
 
             final Application app = mActivityThread.getApplication();
             final Resources appResources = app.getResources();
+            Typeface.updateDefaultFont(appResources);
             mResourcesManager.applyConfigurationToResources(config, compat);
             updateLocaleListFromAppContext(app.getApplicationContext());