Merge "Created hidden constants and metrics for ScopedAccessProvider." (dede23b0) · Commits · e / os / android_frameworks_base

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -394,4 +394,32 @@ public final class StorageVolume implements Parcelable {
		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;
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -5134,6 +5134,15 @@ message MetricsEvent {
		// 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.