commit 12e15cc6ed0ebe29c1822945172c30864feb6c58
author Felipe Leme <felipeal@google.com> Fri Jan 12 09:14:16 2018 -0800
committer Felipe Leme <felipeal@google.com> Tue Jan 16 09:28:44 2018 -0800
tree 6a3d46ebb9bb4bea7c120855178a066f7563041f
parent 3c8c9c1c841a8b95c46d17d6ef08c1d250920ea8

Created hidden constants and metrics for ScopedAccessProvider.

Test: echo 'Not yet!'
Bug: 63720392

Change-Id: I811cde225fdcf5271fda9b357da742e408de0627

core/java/android/os/storage/StorageVolume.java

diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java
index 070b8c1..839a8bf 100644
--- a/core/java/android/os/storage/StorageVolume.java
+++ b/core/java/android/os/storage/StorageVolume.java
@@ -394,4 +394,32 @@
         parcel.writeString(mFsUuid);
         parcel.writeString(mState);
     }
+
+    /** {@hide} */
+    public static final class ScopedAccessProviderContract {
+
+        private ScopedAccessProviderContract() {
+            throw new UnsupportedOperationException("contains constants only");
+        }
+
+        public static final String AUTHORITY = "com.android.documentsui.scopedAccess";
+
+        public static final String TABLE_PACKAGES = "packages";
+        public static final String TABLE_PERMISSIONS = "permissions";
+
+        public static final String COL_PACKAGE = "package_name";
+        public static final String COL_VOLUME_UUID = "volume_uuid";
+        public static final String COL_DIRECTORY = "directory";
+        public static final String COL_GRANTED = "granted";
+
+        public static final String[] TABLE_PACKAGES_COLUMNS = new String[] { COL_PACKAGE };
+        public static final String[] TABLE_PERMISSIONS_COLUMNS =
+                new String[] { COL_PACKAGE, COL_VOLUME_UUID, COL_DIRECTORY, COL_GRANTED };
+
+        public static final int TABLE_PACKAGES_COL_PACKAGE = 0;
+        public static final int TABLE_PERMISSIONS_COL_PACKAGE = 0;
+        public static final int TABLE_PERMISSIONS_COL_VOLUME_UUID = 1;
+        public static final int TABLE_PERMISSIONS_COL_DIRECTORY = 2;
+        public static final int TABLE_PERMISSIONS_COL_GRANTED = 3;
+    }
 }

proto/src/metrics_constants.proto

diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
index 10a809a..04cee67 100644
--- a/proto/src/metrics_constants.proto
+++ b/proto/src/metrics_constants.proto
@@ -5134,6 +5134,15 @@
     // OS: P
     ACTION_SCREENSHOT_POWER_MENU = 1282;
 
+    // OPEN: Settings > Apps & Notifications -> Special app access -> Storage Access
+    // CATEGORY: SETTINGS
+    // OS: P
+    STORAGE_ACCESS = 1283;
+
+    // OPEN: Settings > Apps & Notifications -> Special app access -> Storage Access -> Package
+    // CATEGORY: SETTINGS
+    // OS: P
+    APPLICATIONS_STORAGE_DETAIL = 1284;
 
     // ---- End P Constants, all P constants go above this line ----
     // Add new aosp constants above this line.