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

Commit ebd94ad8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace internal AtomicFile usage with public API"

parents a1148841 7407e2ce

core/java/com/android/internal/os/BatteryStatsHistory.java

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Parcel; 
import android.os.StatFs;

import android.os.SystemClock;

import android.util.ArraySet;

import android.util.AtomicFile;

import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;

core/java/com/android/internal/os/BatteryStatsImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import android.telephony.SignalStrength; 
import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.AtomicFile;

import android.util.IntArray;

import android.util.KeyValueListParser;

import android.util.Log;

services/core/java/com/android/server/storage/CacheQuotaStrategy.java

+1 −1
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.AtomicFile;

import android.util.Pair;

import android.util.Slog;

import android.util.SparseLongArray;

import android.util.Xml;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.AtomicFile;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.Preconditions;

import com.android.server.pm.Installer;

services/core/java/com/android/server/wm/TaskSnapshotPersister.java

+1 −1
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ import android.graphics.Bitmap.Config; 
import android.os.Process;

import android.os.SystemClock;

import android.util.ArraySet;

import android.util.AtomicFile;

import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.AtomicFile;

import com.android.server.wm.nano.WindowManagerProtos.TaskSnapshotProto;



import java.io.File;

services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.os.UserHandle; 
import android.os.UserManagerInternal;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.AtomicFile;

import android.util.Log;

import android.util.LongSparseArray;
@@ -53,7 +54,6 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.os.AtomicFile;

import com.android.server.LocalServices;

import com.android.server.pm.permission.PermissionSettings;