From eeb7d8f02058f91fe03298dbe55bba144b359a7e Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Wed, 15 May 2019 19:40:19 +0100 Subject: Installd: migrate legacy obb data when user 0 unlocks. Note that the call to installd is idempotent, and there's a no-op fast path when no legacy obb data is available to migrate. Test: manual Bug: 129167772 Change-Id: I450ace9d3fcf9eb18fd723ed275fce2ec0b4e415 --- .../core/java/com/android/server/pm/Installer.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 9d115963423d..c2d5b2f86002 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -121,6 +121,24 @@ public class Installer extends SystemService { } } + @Override + public void onUnlockUser(int userId) { + if (userId == 0) { + if (!checkBeforeRemote()) return; + + if (mInstalld == null) { + Slog.wtf(TAG, "Call to onUnlockUser prior to onStart."); + return; + } + + try { + mInstalld.migrateLegacyObbData(); + } catch (RemoteException re) { + Slog.wtf(TAG, "Error migrating legacy OBB data.", re); + } + } + } + private void connect() { IBinder binder = ServiceManager.getService("installd"); if (binder != null) { -- cgit v1.2.3-59-g8ed1b