[SQUASHED] : Cleanup some commit

Genkzsz11 · Genkzsz11 · commit a0399e939547 · 2021-05-10T19:52:28.000+07:00
Revert "Enable NSRM (Network Socket Request Manager)." This reverts commit f93a5d0. Revert "Keyguard: Lock icon improvements" This reverts commit ed55832. Revert "SystemUI: Ensure keyguardstatusbar is hidden if not on keyguard" This reverts commit a13066c. Revert "Ambient pulsing: don't show lock icon" This reverts commit 9daf98b. Revert "SystemUI: Face Unlock animation" This reverts commit e9f4d4a. Revert "LockIcon: refresh icon on overlay changes" This reverts commit 75b8903. Revert "SystemUI: Improve EnhancedEstimatesGoogleImpl" This reverts commit d59e5cd.
diff --git a/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl b/apex/jobscheduler/framework/java/android/os/IDeviceIdleController.aidl
@@ -49,6 +49,4 @@ interface IDeviceIdleController {
     void exitIdle(String reason);
     int setPreIdleTimeoutMode(int Mode);
     void resetPreIdleTimeoutMode();
-    int getIdleStateDetailed();
-    int getLightIdleStateDetailed();
 }
diff --git a/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java b/apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java
@@ -1744,18 +1744,6 @@ public String[] getRemovedSystemPowerWhitelistApps() {
             return isPowerSaveWhitelistAppInternal(name);
         }
 
-        @Override public int getIdleStateDetailed() {
-            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,
-                    null);
-            return mState;
-        }
-
-        @Override public int getLightIdleStateDetailed() {
-            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,
-                    null);
-            return mLightState;
-        }
-
         @Override
         public long whitelistAppTemporarily(String packageName, int userId, String reason)
                 throws RemoteException {
diff --git a/core/java/android/app/IAlarmManager.aidl b/core/java/android/app/IAlarmManager.aidl
@@ -41,6 +41,4 @@ interface IAlarmManager {
     @UnsupportedAppUsage
     AlarmManager.AlarmClockInfo getNextAlarmClock(int userId);
     long currentNetworkTimeMillis();
-    // update the uids being synchronized by network socket request manager
-    void updateBlockedUids(int uid, boolean isBlocked);
 }
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl
@@ -100,9 +100,6 @@ interface IPowerManager
     // Forces the system to suspend even if there are held wakelocks.
     boolean forceSuspend();
 
-    // update the uids being synchronized by network socket request manager
-    void updateBlockedUids(int uid, boolean isBlocked);
-
     // temporarily overrides the button brightness settings to allow the user to
     // see the effect of a settings change without applying it immediately
     void setTemporaryButtonBrightnessSettingOverride(int brightness);
diff --git a/packages/SystemUI/res/drawable/ic_lock_face.xml b/packages/SystemUI/res/drawable/ic_lock_face.xml
diff --git a/packages/SystemUI/src/com/android/systemui/WaveSystemUIAnimations.java b/packages/SystemUI/src/com/android/systemui/WaveSystemUIAnimations.java
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -304,11 +304,9 @@ public void setVisible(boolean visible) {
                 hideTransientIndication();
             }
             updateIndication(false);
-            mLockIconController.getView().setAlpha(255);
         } else if (!visible) {
             // If we unlock and return to keyguard quickly, previous error should not be shown
             hideTransientIndication();
-            mLockIconController.getView().setAlpha(0);
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -32,7 +32,6 @@
 import android.view.ViewTreeObserver.OnPreDrawListener;
 
 import com.android.internal.graphics.ColorUtils;
-import com.android.systemui.WaveSystemUIAnimations;
 import com.android.systemui.Interpolators;
 import com.android.systemui.R;
 import com.android.systemui.statusbar.KeyguardAffordanceView;
@@ -56,7 +55,6 @@ public class LockIcon extends KeyguardAffordanceView {
     private boolean mPulsing;
     private boolean mDozing;
     private boolean mKeyguardJustShown;
-    private boolean mIsFaceUnlock;
     private boolean mPredrawRegistered;
     private Drawable mFaceScanningAnim;
     private final SparseArray<Drawable> mDrawableCache = new SparseArray<>();
@@ -69,17 +67,12 @@ public boolean onPreDraw() {
 
             int newState = mState;
             Drawable icon = getIcon(newState);
-            mIsFaceUnlock = newState == STATE_SCANNING_FACE;
             setImageDrawable(icon, false, false);
-
-            if (mIsFaceUnlock) {
-                icon = mContext.getDrawable(getIconForState(newState));
+            if (newState == STATE_SCANNING_FACE) {
                 announceForAccessibility(getResources().getString(
                         R.string.accessibility_scanning_face));
             }
 
-            shakeFace();
-
             if (icon instanceof AnimatedVectorDrawable) {
                 final AnimatedVectorDrawable animation = (AnimatedVectorDrawable) icon;
                 animation.forceAnimationOnUI();
@@ -123,7 +116,7 @@ protected void onConfigurationChanged(Configuration newConfig) {
     boolean updateIconVisibility(boolean visible) {
         boolean wasVisible = getVisibility() == VISIBLE;
         if (visible != wasVisible) {
-            setVisibility((visible && !mPulsing) ? VISIBLE : INVISIBLE);
+            setVisibility(visible ? VISIBLE : INVISIBLE);
             animate().cancel();
             if (visible) {
                 setScaleX(0);
@@ -192,12 +185,11 @@ private Drawable getIcon(int newState) {
     private static int getIconForState(int state) {
         int iconRes;
         switch (state) {
-            case STATE_SCANNING_FACE:
-                iconRes = com.android.systemui.R.drawable.ic_lock_face;
-                break;
             case STATE_LOCKED:
             // Scanning animation is a pulsing padlock. This means that the resting state is
             // just a padlock.
+            case STATE_SCANNING_FACE:
+            // Error animation also starts and ands on the padlock.
             case STATE_BIOMETRICS_ERROR:
                 iconRes = com.android.internal.R.drawable.ic_lock;
                 break;
@@ -275,8 +267,4 @@ private int getThemedAnimationResId(@LockAnimIndex int lockAnimIndex) {
         }
         return LOCK_ANIM_RES_IDS[0][lockAnimIndex];
     }
-
-    public void shakeFace() {
-        WaveSystemUIAnimations.faceLockShake(this, mIsFaceUnlock ? false :true);
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java
@@ -144,11 +144,6 @@ public void onStateChanged(int newState) {
     private final ConfigurationListener mConfigurationListener = new ConfigurationListener() {
         private int mDensity;
 
-        @Override
-        public void onOverlayChanged() {
-            onThemeChanged();
-        }
-
         @Override
         public void onThemeChanged() {
             if (mLockIcon == null) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -806,7 +806,6 @@ private void reInflateViews() {
             mKeyguardStatusBar.onThemeChanged();
         }*/
 
-        mKeyguardStatusBar.setVisibility(mKeyguardShowing ? View.VISIBLE : View.INVISIBLE);
         setKeyguardStatusViewVisibility(mBarState, false, false);
         setKeyguardBottomAreaVisibility(mBarState, false);
         if (mOnReinflationListener != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4062,7 +4062,6 @@ private void releaseGestureWakeLock() {
     public void keyguardGoingAway() {
         // Treat Keyguard exit animation as an app transition to achieve nice transition for status
         // bar.
-        mKeyguardIndicationController.setVisible(false);
         mKeyguardStateController.notifyKeyguardGoingAway(true);
         mCommandQueue.appTransitionPending(mDisplayId, true /* forced */);
         mPulseController.notifyKeyguardGoingAway();
@@ -4252,6 +4251,7 @@ public void onStateChanged(int newState) {
             }
             if (mStatusBarView != null) mStatusBarView.removePendingHideExpandedRunnables();
         } else {
+            mKeyguardIndicationController.setVisible(false);
             if (mKeyguardUserSwitcher != null) {
                 mKeyguardUserSwitcher.setKeyguard(false,
                         mStatusBarStateController.goingToFullShade() ||
diff --git a/packages/SystemUI/src/com/google/android/systemui/power/EnhancedEstimatesGoogleImpl.java b/packages/SystemUI/src/com/google/android/systemui/power/EnhancedEstimatesGoogleImpl.java
@@ -4,16 +4,10 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.SystemClock;
-import android.os.UserManager;
 import android.provider.Settings;
 import android.util.KeyValueListParser;
 import android.util.Log;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settingslib.fuelgauge.Estimate;
-import com.android.settingslib.fuelgauge.EstimateKt;
 import com.android.settingslib.utils.PowerUtil;
 import com.android.systemui.power.EnhancedEstimates;
 import java.time.Duration;
@@ -27,23 +21,13 @@ public class EnhancedEstimatesGoogleImpl implements EnhancedEstimates {
     private Context mContext;
     private final KeyValueListParser mParser = new KeyValueListParser(',');
 
-    BatteryStatsHelper mBatteryStatsHelper;
-    UserManager mUserManager;
-
     @Inject
     public EnhancedEstimatesGoogleImpl(Context context) {
         mContext = context;
-        mBatteryStatsHelper = new BatteryStatsHelper(context,
-                true /* collectBatteryBroadcast */);
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
     @Override
     public boolean isHybridNotificationEnabled() {
-        if (getAospEstimate() != null) {
-            return true;
-        }
-
         try {
             if (!mContext.getPackageManager().getPackageInfo("com.google.android.apps.turbo", PackageManager.MATCH_DISABLED_COMPONENTS).applicationInfo.enabled) {
                 return false;
@@ -87,14 +71,12 @@ public Estimate getEstimate() {
                 }
             }
             if (query != null) {
-                return getAospEstimate();
+                query.close();
             }
-            query.close();
-            return getAospEstimate();
         } catch (Exception e) {
             Log.d("EnhancedEstimates", "Something went wrong when getting an estimate from Turbo", e);
         }
-        return getAospEstimate();
+        return new Estimate(-1, false, -1);
     }
 
     @Override
@@ -122,26 +104,4 @@ private void updateFlags() {
             Log.e("EnhancedEstimates", "Bad hybrid sysui warning flags");
         }
     }
-
-    public Estimate getAospEstimate() {
-        try {
-            mBatteryStatsHelper.create((Bundle) null);
-            mBatteryStatsHelper.clearStats();
-            mBatteryStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUserManager.getUserProfiles());
-            BatteryStats stats = mBatteryStatsHelper.getStats();
-            if (stats != null) {
-                long remaining = stats.computeBatteryTimeRemaining(PowerUtil.convertMsToUs(
-                        SystemClock.elapsedRealtime()));
-                if (remaining != -1) {
-                    return new Estimate(PowerUtil.convertUsToMs(remaining), false,
-                            EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
-                }
-            }
-            if (stats == null)
-                return null;
-        } catch (NullPointerException | IndexOutOfBoundsException e) {
-            Log.d("EnhancedAospEstimates", "Something went wrong when getting battery estimate", e);
-        }
-        return null;
-    }
 }
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
@@ -205,7 +205,6 @@ class AlarmManagerService extends SystemService {
     int mBroadcastRefCount = 0;
     PowerManager.WakeLock mWakeLock;
     SparseIntArray mAlarmsPerUid = new SparseIntArray();
-    private QCNsrmAlarmExtension qcNsrmExt = new QCNsrmAlarmExtension(this);
     ArrayList<Alarm> mPendingNonWakeupAlarms = new ArrayList<>();
     ArrayList<InFlight> mInFlight = new ArrayList<>();
     private final ArrayList<AlarmManagerInternal.InFlightListener> mInFlightListeners =
@@ -2208,16 +2207,6 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
             }
         }
 
-        @Override
-        /* updates the blocked uids, so if a wake lock is acquired to only fire
-         * alarm for it, it can be released.
-         */
-        public void updateBlockedUids(int uid, boolean isBlocked) {
-            synchronized(mLock) {
-                qcNsrmExt.processBlockedUids(uid, isBlocked, mWakeLock);
-            }
-        }
-
         @Override
         public void onShellCommand(FileDescriptor in, FileDescriptor out,
                 FileDescriptor err, String[] args, ShellCallback callback,
@@ -4156,10 +4145,11 @@ void setWakelockWorkSource(WorkSource ws, int knownUid, String tag, boolean firs
                 mWakeLock.setWorkSource(new WorkSource(knownUid));
                 return;
             }
-            // Something went wrong; fall back to attributing the lock to the OS
-            mWakeLock.setWorkSource(null);
         } catch (Exception e) {
         }
+
+        // Something went wrong; fall back to attributing the lock to the OS
+        mWakeLock.setWorkSource(null);
     }
 
     private static int getAlarmAttributionUid(Alarm alarm) {
@@ -4636,13 +4626,9 @@ private void updateTrackingLocked(InFlight inflight) {
             if (DEBUG_WAKELOCK) {
                 Slog.d(TAG, "mBroadcastRefCount -> " + mBroadcastRefCount);
             }
-            qcNsrmExt.removeTriggeredUid(inflight.mUid);
-
             if (mBroadcastRefCount == 0) {
                 mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 0).sendToTarget();
-                if (mWakeLock.isHeld()) {
-                    mWakeLock.release();
-                }
+                mWakeLock.release();
                 if (mInFlight.size() > 0) {
                     mLog.w("Finished all dispatches with " + mInFlight.size()
                             + " remaining inflights");
@@ -4840,9 +4826,7 @@ public void deliverLocked(Alarm alarm, long nowELAPSED, boolean allowWhileIdle)
             }
             if (mBroadcastRefCount == 0) {
                 setWakelockWorkSource(alarm.workSource, alarm.creatorUid, alarm.statsTag, true);
-                if (!mWakeLock.isHeld()) {
                 mWakeLock.acquire();
-                }
                 mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 1).sendToTarget();
             }
             final InFlight inflight = new InFlight(AlarmManagerService.this, alarm, nowELAPSED);
@@ -4851,10 +4835,6 @@ public void deliverLocked(Alarm alarm, long nowELAPSED, boolean allowWhileIdle)
             if (inflight.isBroadcast()) {
                 notifyBroadcastAlarmPendingLocked(alarm.uid);
             }
-            qcNsrmExt.addTriggeredUid((alarm.operation != null) ?
-                                    alarm.operation.getCreatorUid() :
-                                    alarm.uid);
-
             if (allowWhileIdle) {
                 // Record the last time this uid handled an ALLOW_WHILE_IDLE alarm.
                 mLastAllowWhileIdleDispatch.put(alarm.creatorUid, nowELAPSED);
diff --git a/services/core/java/com/android/server/QCNsrmAlarmExtension.java b/services/core/java/com/android/server/QCNsrmAlarmExtension.java
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
diff --git a/services/core/java/com/android/server/power/QCNsrmPowerExtension.java b/services/core/java/com/android/server/power/QCNsrmPowerExtension.java

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,4 @@ interface IDeviceIdleController {`
`49`	`49`	`void exitIdle(String reason);`
`50`	`50`	`int setPreIdleTimeoutMode(int Mode);`
`51`	`51`	`void resetPreIdleTimeoutMode();`
`52`		`- int getIdleStateDetailed();`
`53`		`- int getLightIdleStateDetailed();`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,4 @@ interface IAlarmManager {`
`41`	`41`	`@UnsupportedAppUsage`
`42`	`42`	`AlarmManager.AlarmClockInfo getNextAlarmClock(int userId);`
`43`	`43`	`long currentNetworkTimeMillis();`
`44`		`- // update the uids being synchronized by network socket request manager`
`45`		`- void updateBlockedUids(int uid, boolean isBlocked);`
`46`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,11 +304,9 @@ public void setVisible(boolean visible) {`
`304`	`304`	`hideTransientIndication();`
`305`	`305`	`}`
`306`	`306`	`updateIndication(false);`
`307`		`- mLockIconController.getView().setAlpha(255);`
`308`	`307`	`} else if (!visible) {`
`309`	`308`	`// If we unlock and return to keyguard quickly, previous error should not be shown`
`310`	`309`	`hideTransientIndication();`
`311`		`- mLockIconController.getView().setAlpha(0);`
`312`	`310`	`}`
`313`	`311`	`}`
`314`	`312`