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

Commit 20c6f1ba authored Oct 06, 2023 by Victor Hsieh

Move PersistentDataBlock* in server to its namespace

Previous automerge was skipped by mistake

Also add OWNERS.

Bug: 303523453
Test: m
Test: mma in services/devicepolicy/ services/tests/servicestests/
(cherry picked from https://android-review.googlesource.com/q/commit:d34869871fe5df392d97a80ffb34d52b9bda7384)
Change-Id: I5c63ba2e56a7d104c0f7b5758058730aed0a237c

parent 43183785

services/core/java/com/android/server/locksettings/LockSettingsStorage.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ import com.android.internal.util.IndentingPrintWriter;
	import com.android.internal.util.Preconditions;		import com.android.internal.util.Preconditions;
	import com.android.internal.widget.LockPatternUtils;		import com.android.internal.widget.LockPatternUtils;
	import com.android.server.LocalServices;		import com.android.server.LocalServices;
	import com.android.server.PersistentDataBlockManagerInternal;		import com.android.server.pdb.PersistentDataBlockManagerInternal;

	import java.io.ByteArrayInputStream;		import java.io.ByteArrayInputStream;
	import java.io.ByteArrayOutputStream;		import java.io.ByteArrayOutputStream;

services/core/java/com/android/server/oemlock/OemLockService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,8 +35,8 @@ import android.service.oemlock.IOemLockService;
	import android.util.Slog;		import android.util.Slog;

	import com.android.server.LocalServices;		import com.android.server.LocalServices;
	import com.android.server.PersistentDataBlockManagerInternal;
	import com.android.server.SystemService;		import com.android.server.SystemService;
			import com.android.server.pdb.PersistentDataBlockManagerInternal;
	import com.android.server.pm.UserManagerInternal;		import com.android.server.pm.UserManagerInternal;
	import com.android.server.pm.UserManagerInternal.UserRestrictionsListener;		import com.android.server.pm.UserManagerInternal.UserRestrictionsListener;
	import com.android.server.pm.UserRestrictionsUtils;		import com.android.server.pm.UserRestrictionsUtils;

services/core/java/com/android/server/pdb/OWNERS

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			victorhsieh@google.com
			swillden@google.com

services/core/java/com/android/server/PersistentDataBlockManagerInternal.java→services/core/java/com/android/server/pdb/PersistentDataBlockManagerInternal.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.server;		package com.android.server.pdb;

	/**		/**
	* Internal interface for storing and retrieving persistent data.		* Internal interface for storing and retrieving persistent data.

services/core/java/com/android/server/PersistentDataBlockService.java→services/core/java/com/android/server/pdb/PersistentDataBlockService.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package com.android.server;		package com.android.server.pdb;

	import static com.android.internal.util.Preconditions.checkArgument;		import static com.android.internal.util.Preconditions.checkArgument;

	@@ -37,6 +37,9 @@ import com.android.internal.R;
	import com.android.internal.annotations.GuardedBy;		import com.android.internal.annotations.GuardedBy;
	import com.android.internal.util.DumpUtils;		import com.android.internal.util.DumpUtils;
	import com.android.server.pm.UserManagerInternal;		import com.android.server.pm.UserManagerInternal;
			import com.android.server.LocalServices;
			import com.android.server.SystemServerInitThreadPool;
			import com.android.server.SystemService;

	import libcore.io.IoUtils;		import libcore.io.IoUtils;