Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a3ad23 authored by Mark Lu's avatar Mark Lu Committed by android-build-merger
Browse files

Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4 

am: 15df815e

Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7
parents f3eef9a2 15df815e

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -2928,10 +2928,12 @@ public final class ActivityManagerService extends ActivityManagerNative 
















    @Override







    @Override











    public void batterySendBroadcast(Intent intent) {







    public void batterySendBroadcast(Intent intent) {














        synchronized (this) {











            broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,







            broadcastIntentLocked(null, null, intent, null, null, 0, null, null, null,











                    AppOpsManager.OP_NONE, null, false, false,







                    AppOpsManager.OP_NONE, null, false, false,











                    -1, Process.SYSTEM_UID, UserHandle.USER_ALL);







                    -1, Process.SYSTEM_UID, UserHandle.USER_ALL);











        }







        }














    }



























    /**







    /**











     * Initialize the application bind args. These are passed to each







     * Initialize the application bind args. These are passed to each