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

Commit f76ffeaf authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "oct6" 

* changes:
  Upgrade AndroidFrameworkBinderIdentity to fatal.
  Tighten up Binder.clearCallingIdentity() usage.
  Tighten up Binder.clearCallingIdentity() usage.
  Tighten up Binder.clearCallingIdentity() usage.
parents f2b14345 7cdc3bf9

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ java_library { 
    ],

    errorprone: {

        javacflags: [

            "-Xep:AndroidFrameworkBinderIdentity:ERROR",

            "-Xep:AndroidFrameworkCompatChange:ERROR",

            "-Xep:AndroidFrameworkUid:ERROR",

        ],

apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java

+7 −7
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                SchemaProto.Builder schemaProtoBuilder = SchemaProto.newBuilder();

                for (int i = 0; i < schemaBundles.size(); i++) {
@@ -97,7 +97,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId);

                String databaseName = makeDatabaseName(callingUid);
@@ -128,7 +128,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId);

                String databaseName = makeDatabaseName(callingUid);
@@ -170,7 +170,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                SearchSpecProto searchSpecProto = SearchSpecProto.parseFrom(searchSpecBytes);

                ResultSpecProto resultSpecProto = ResultSpecProto.parseFrom(resultSpecBytes);
@@ -203,7 +203,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId);

                String databaseName = makeDatabaseName(callingUid);
@@ -233,7 +233,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId);

                String databaseName = makeDatabaseName(callingUid);
@@ -261,7 +261,7 @@ public class AppSearchManagerService extends SystemService { 
            Preconditions.checkNotNull(callback);

            int callingUid = Binder.getCallingUidOrThrow();

            int callingUserId = UserHandle.getUserId(callingUid);

            long callingIdentity = Binder.clearCallingIdentity();

            final long callingIdentity = Binder.clearCallingIdentity();

            try {

                AppSearchImpl impl = ImplInstanceManager.getInstance(getContext(), callingUserId);

                String databaseName = makeDatabaseName(callingUid);

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

+18 −18
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ public class DeviceIdleController extends SystemService 
            }

            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return addPowerSaveWhitelistAppsInternal(packageNames);

            } finally {
@@ -1696,7 +1696,7 @@ public class DeviceIdleController extends SystemService 
            }

            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                if (!removePowerSaveWhitelistAppInternal(name)

                        && mPowerSaveWhitelistAppsExceptIdle.containsKey(name)) {
@@ -1713,7 +1713,7 @@ public class DeviceIdleController extends SystemService 
            }

            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                removeSystemPowerWhitelistAppInternal(name);

            } finally {
@@ -1727,7 +1727,7 @@ public class DeviceIdleController extends SystemService 
            }

            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                restoreSystemPowerWhitelistAppInternal(name);

            } finally {
@@ -1815,7 +1815,7 @@ public class DeviceIdleController extends SystemService 
        @Override public void exitIdle(String reason) {

            getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                exitIdleInternal(reason);

            } finally {
@@ -1826,7 +1826,7 @@ public class DeviceIdleController extends SystemService 
        @Override public int setPreIdleTimeoutMode(int mode) {

            getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return DeviceIdleController.this.setPreIdleTimeoutMode(mode);

            } finally {
@@ -1837,7 +1837,7 @@ public class DeviceIdleController extends SystemService 
        @Override public void resetPreIdleTimeoutMode() {

            getContext().enforceCallingOrSelfPermission(Manifest.permission.DEVICE_POWER,

                    null);

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                DeviceIdleController.this.resetPreIdleTimeoutMode();

            } finally {
@@ -4031,7 +4031,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                String arg = shell.getNextArg();

                try {

                    if (arg == null || "deep".equals(arg)) {
@@ -4052,7 +4052,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                String arg = shell.getNextArg();

                try {

                    if (arg == null || "deep".equals(arg)) {
@@ -4100,7 +4100,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                try {

                    mForceIdle = true;

                    becomeInactiveIfAppropriateLocked();
@@ -4116,7 +4116,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                try {

                    exitForceIdleLocked();

                    pw.print("Light state: ");
@@ -4133,7 +4133,7 @@ public class DeviceIdleController extends SystemService 
            synchronized (this) {

                String arg = shell.getNextArg();

                if (arg != null) {

                    long token = Binder.clearCallingIdentity();

                    final long token = Binder.clearCallingIdentity();

                    try {

                        switch (arg) {

                            case "light": pw.println(lightStateToString(mLightState)); break;
@@ -4156,7 +4156,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                String arg = shell.getNextArg();

                try {

                    boolean becomeActive = false;
@@ -4193,7 +4193,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                String arg = shell.getNextArg();

                try {

                    boolean becomeInactive = false;
@@ -4242,7 +4242,7 @@ public class DeviceIdleController extends SystemService 
            if (arg != null) {

                getContext().enforceCallingOrSelfPermission(

                        android.Manifest.permission.DEVICE_POWER, null);

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                try {

                    do {

                        if (arg.length() < 1 || (arg.charAt(0) != '-'
@@ -4418,7 +4418,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                try {

                    motionLocked();

                    pw.print("Light state: ");
@@ -4433,7 +4433,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                int ret  = SET_IDLE_FACTOR_RESULT_UNINIT;

                try {

                    String arg = shell.getNextArg();
@@ -4468,7 +4468,7 @@ public class DeviceIdleController extends SystemService 
            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,

                    null);

            synchronized (this) {

                long token = Binder.clearCallingIdentity();

                final long token = Binder.clearCallingIdentity();

                try {

                    resetPreIdleTimeoutMode();

                } finally {

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+7 −7
Original line number Diff line number Diff line
@@ -2673,7 +2673,7 @@ public class JobSchedulerService extends com.android.server.SystemService 


            validateJobFlags(job, uid);



            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return JobSchedulerService.this.scheduleAsPackage(job, null, uid, null, userId,

                        null);
@@ -2701,7 +2701,7 @@ public class JobSchedulerService extends com.android.server.SystemService 


            validateJobFlags(job, uid);



            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return JobSchedulerService.this.scheduleAsPackage(job, work, uid, null, userId,

                        null);
@@ -2732,7 +2732,7 @@ public class JobSchedulerService extends com.android.server.SystemService 


            validateJobFlags(job, callerUid);



            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return JobSchedulerService.this.scheduleAsPackage(job, null, callerUid,

                        packageName, userId, tag);
@@ -2745,7 +2745,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public ParceledListSlice<JobInfo> getAllPendingJobs() throws RemoteException {

            final int uid = Binder.getCallingUid();



            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return new ParceledListSlice<>(JobSchedulerService.this.getPendingJobs(uid));

            } finally {
@@ -2757,7 +2757,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public JobInfo getPendingJob(int jobId) throws RemoteException {

            final int uid = Binder.getCallingUid();



            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                return JobSchedulerService.this.getPendingJob(uid, jobId);

            } finally {
@@ -2768,7 +2768,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        @Override

        public void cancelAll() throws RemoteException {

            final int uid = Binder.getCallingUid();

            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                JobSchedulerService.this.cancelJobsForUid(uid,

                        "cancelAll() called by app, callingUid=" + uid);
@@ -2781,7 +2781,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public void cancel(int jobId) throws RemoteException {

            final int uid = Binder.getCallingUid();



            long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();

            try {

                JobSchedulerService.this.cancelJob(uid, jobId, uid);

            } finally {

apex/statsd/framework/java/android/app/StatsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ public final class StatsManager { 


        @Override

        public void onPullAtom(int atomTag, IPullAtomResultReceiver resultReceiver) {

            long token = Binder.clearCallingIdentity();

            final long token = Binder.clearCallingIdentity();

            try {

                mExecutor.execute(() -> {

                    List<StatsEvent> data = new ArrayList<>();