From 5ae3856c9e413cd233e4433f1eb1b3c87b348865 Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Mon, 18 Feb 2019 14:11:57 +0000
Subject: [PATCH] Rename data/staging to data/pkg_staging

Test: Build, flash, atest apex_e2e_tests
Change-Id: Ie66b0baaeb1845fdedbd6fa4bd5b33e63035627b
Fixes: 122999313
---
 core/java/android/os/Environment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java
index 3feccf507ff59..0aed981edf928 100644
--- a/core/java/android/os/Environment.java
+++ b/core/java/android/os/Environment.java
@@ -388,7 +388,7 @@ public class Environment {
 
     /** {@hide} */
     public static File getDataStagingDirectory(String volumeUuid) {
-        return new File(getDataDirectory(volumeUuid), "staging");
+        return new File(getDataDirectory(volumeUuid), "pkg_staging");
     }
 
     /** {@hide} */