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

Commit 9526fa3b authored by Victor Hsieh's avatar Victor Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Move PersistentDataBlock* in server to its namespace" into... 

Merge "Move PersistentDataBlock* in server to its namespace" into udc-qpr-dev-plus-aosp am: a980d1fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25044177



Change-Id: If54a7210ed86c2bf25bd8e884e49225a5de153b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0f5dccc a980d1fc

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

+1 −1
Original line number 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.widget.LockPatternUtils;

import com.android.server.LocalServices;

import com.android.server.PersistentDataBlockManagerInternal;

import com.android.server.pdb.PersistentDataBlockManagerInternal;



import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

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

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



import com.android.server.LocalServices;

import com.android.server.PersistentDataBlockManagerInternal;

import com.android.server.SystemService;

import com.android.server.pdb.PersistentDataBlockManagerInternal;

import com.android.server.pm.UserManagerInternal;

import com.android.server.pm.UserManagerInternal.UserRestrictionsListener;

import com.android.server.pm.UserRestrictionsUtils;

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

0 → 100644
+2 −0
Original line number 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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.pdb;



/**

 * 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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server;

package com.android.server.pdb;



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.util.DumpUtils;

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;