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

Commit 4ca6d6ba authored by mrulhania's avatar mrulhania
Browse files

clean up app ops legacy storage file 

Fix: 389723713
Test: build
Test: presubmit
Flag: EXEMPT bug fix
Change-Id: I70a8070ac6a17487c44d917212c6336fc4866258
parent 6c38f4b0

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

+4 −7
Original line number Diff line number Diff line
@@ -2411,8 +2411,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
        mAppErrors = injector.getAppErrors();

        mPackageWatchdog = null;

        mCrashRecoveryHelper = null;

        mAppOpsService = mInjector.getAppOpsService(null /* recentAccessesFile */,

            null /* storageFile */, null /* handler */);

        mAppOpsService = mInjector.getAppOpsService(null /* handler */);

        mBatteryStatsService = mInjector.getBatteryStatsService();

        mHandler = new MainHandler(handlerThread.getLooper());

        mHandlerThread = handlerThread;
@@ -2515,8 +2514,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














        mProcessStats = new ProcessStatsService(this, new File(systemDir, "procstats"));



























        mAppOpsService = mInjector.getAppOpsService(new File(systemDir, "appops_accesses.xml"),













                new File(systemDir, "appops.xml"), mHandler);













        mAppOpsService = mInjector.getAppOpsService(mHandler);





























        mUgmInternal = LocalServices.getService(UriGrantsManagerInternal.class);
























@@ -18835,9 +18833,8 @@ public class ActivityManagerService extends IActivityManager.Stub













            return mContext;















        }



























        public AppOpsService getAppOpsService(File recentAccessesFile, File storageFile,













                Handler handler) {













            return new AppOpsService(recentAccessesFile, storageFile, handler, getContext());













        public AppOpsService getAppOpsService(Handler handler) {













            return new AppOpsService(handler, getContext());















        }





























        public Handler getUiHandler(ActivityManagerService service) {

























services/core/java/com/android/server/appop/AppOpsService.java



+9
−5






























Original line number
Diff line number
Diff line








@@ -276,7 +276,6 @@ public class AppOpsService extends IAppOpsService.Stub {













            Process.SHELL_UID};































    final Context mContext;













    final AtomicFile mStorageFile;















    final AtomicFile mRecentAccessesFile;















    private final @Nullable File mNoteOpCallerStacktracesFile;















    /* AMS handler, this shouldn't be used for IO */










@@ -994,9 +993,13 @@ public class AppOpsService extends IAppOpsService.Stub {













        }















    }





























    public AppOpsService(Handler handler, Context context) {













        this(new File(SystemServiceManager.ensureSystemDir(), "appops_accesses.xml"),













                handler, context);













    }





























    @VisibleForTesting













    public AppOpsService(File recentAccessesFile, File storageFile, Handler handler,













            Context context) {













    public AppOpsService(File recentAccessesFile, Handler handler, Context context) {















        mContext = context;















        mKnownDeviceIds.put(Context.DEVICE_ID_DEFAULT, PERSISTENT_DEVICE_ID_DEFAULT);


























@@ -1032,7 +1035,6 @@ public class AppOpsService extends IAppOpsService.Stub {













                code -> notifyWatchersOnDefaultDevice(code, UID_ANY));































        LockGuard.installLock(this, LockGuard.INDEX_APP_OPS);













        mStorageFile = new AtomicFile(storageFile, "appops_legacy");















        mRecentAccessesFile = new AtomicFile(recentAccessesFile, "appops_accesses");















        mRecentAccessPersistence = new AppOpsRecentAccessPersistence(mRecentAccessesFile, this);


























@@ -5270,7 +5272,9 @@ public class AppOpsService extends IAppOpsService.Stub {













     */















    private void readRecentAccesses() {















        if (!mRecentAccessesFile.exists()) {













            readRecentAccesses(mStorageFile);













            final File legacyFile =













                    new File(SystemServiceManager.ensureSystemDir(), "appops.xml");













            readRecentAccesses(new AtomicFile(legacyFile, "appops_legacy"));















        } else {















            if (deviceAwareAppOpNewSchemaEnabled()) {















                synchronized (this) {

































services/tests/mockingservicestests/src/com/android/server/am/ActivityManagerServiceTest.java



+1
−3






























Original line number
Diff line number
Diff line








@@ -154,7 +154,6 @@ import org.mockito.MockitoSession;













import org.mockito.quality.Strictness;















import org.mockito.verification.VerificationMode;





























import java.io.File;















import java.util.ArrayList;















import java.util.Arrays;















import java.util.HashMap;










@@ -1716,8 +1715,7 @@ public class ActivityManagerServiceTest {













        }































        @Override













        public AppOpsService getAppOpsService(File recentAccessesFile, File storageFile,













                Handler handler) {













        public AppOpsService getAppOpsService(Handler handler) {















            return mAppOpsService;















        }

















































services/tests/mockingservicestests/src/com/android/server/am/AppChildProcessTest.java



+1
−3






























Original line number
Diff line number
Diff line








@@ -56,7 +56,6 @@ import org.mockito.MockitoAnnotations;













import org.mockito.quality.Strictness;































import java.io.ByteArrayInputStream;













import java.io.File;















import java.io.FileNotFoundException;















import java.io.IOException;















import java.io.InputStream;










@@ -247,8 +246,7 @@ public class AppChildProcessTest {













        }































        @Override













        public AppOpsService getAppOpsService(File recentAccessesFile, File storageFile,













                Handler handler) {













        public AppOpsService getAppOpsService(Handler handler) {















            return mAppOpsService;















        }

















































services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java



+1
−2






























Original line number
Diff line number
Diff line








@@ -1320,8 +1320,7 @@ public class ApplicationExitInfoTest {













        }































        @Override













        public AppOpsService getAppOpsService(File recentAccessesFile, File storageFile,













                Handler handler) {













        public AppOpsService getAppOpsService(Handler handler) {















            return mAppOpsService;















        }