Snap for 6516332 from 4b1460901ce3a08cce1d829c52515f016e350e2b to sc-d1-release (f7f432c6) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+0 −4

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ java_defaults {
		},

		sdk_version: "system_current",
		target_sdk_version: "29",
		min_sdk_version: "29",

		plugins: [
		@@ -95,7 +94,6 @@ android_library {
		],

		sdk_version: "system_current",
		target_sdk_version: "29",
		min_sdk_version: "29",
		}

		@@ -118,7 +116,6 @@ android_library {
		],

		sdk_version: "system_current",
		target_sdk_version: "29",
		min_sdk_version: "29",
		}

		@@ -139,6 +136,5 @@ android_app {

		required: ["privapp_whitelist_com.android.documentsui"],

		target_sdk_version: "29",
		min_sdk_version: "29",
		}

AndroidManifest.xml

+13 −4

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.documentsui">

		<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
		<uses-sdk android:minSdkVersion="29" />

		<uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
		<uses-permission android:name="android.permission.REMOVE_TASKS" />
		@@ -52,6 +52,7 @@
		<activity
		android:name=".picker.PickActivity"
		android:theme="@style/DocumentsTheme"
		android:exported="true"
		android:visibleToInstantApps="true">
		<intent-filter android:priority="100">
		<action android:name="android.intent.action.OPEN_DOCUMENT" />
		@@ -96,6 +97,7 @@
		android:name=".LauncherActivity"
		android:targetActivity=".files.LauncherActivity"
		android:label="@string/launcher_label"
		android:exported="true"
		android:icon="@drawable/launcher_icon" >
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -108,6 +110,7 @@
		<activity
		android:name=".files.FilesActivity"
		android:documentLaunchMode="intoExisting"
		android:exported="true"
		android:theme="@style/DocumentsTheme">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		@@ -126,6 +129,7 @@

		<activity-alias android:name=".ViewDownloadsActivity"
		android:targetActivity=".files.FilesActivity"
		android:exported="true"
		android:enabled="@bool/handle_view_downloads_intent">
		<intent-filter>
		<action android:name="android.intent.action.VIEW_DOWNLOADS" />
		@@ -135,6 +139,7 @@

		<activity
		android:name=".ScopedAccessActivity"
		android:exported="true"
		android:theme="@android:style/Theme.Translucent.NoTitleBar">
		<intent-filter>
		<action android:name="android.os.storage.action.OPEN_EXTERNAL_DIRECTORY" />
		@@ -163,7 +168,8 @@
		</intent-filter>
		</provider>

		<receiver android:name=".PackageReceiver">
		<receiver android:name=".PackageReceiver"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
		<action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
		@@ -171,13 +177,15 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".roots.BootReceiver" android:enabled="false">
		<receiver android:name=".roots.BootReceiver" android:enabled="false"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		</intent-filter>
		</receiver>

		<receiver android:name=".PreBootReceiver">
		<receiver android:name=".PreBootReceiver"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.PRE_BOOT_COMPLETED" />
		</intent-filter>
		@@ -195,6 +203,7 @@
		<activity
		android:name=".selection.demo.SelectionDemoActivity"
		android:label="Selection Demo"
		android:exported="true"
		android:theme="@style/DocumentsTheme">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

tests/AndroidManifest.xml

+7 −3

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@
		<application android:label="DocumentsUI Tests">
		<uses-library android:name="android.test.runner" />

		<activity android:name="com.android.documentsui.SettingsActivity">
		<activity android:name="com.android.documentsui.SettingsActivity"
		android:exported="true">
		<intent-filter>
		<action android:name="android.provider.action.DOCUMENT_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -20,7 +21,8 @@
		</activity>

		<!--Needed for demo'ing and functional testing the open in provider feature in inspector -->
		<activity android:name="com.android.documentsui.TestProviderActivity">
		<activity android:name="com.android.documentsui.TestProviderActivity"
		android:exported="true">
		<intent-filter>
		<action android:name="android.provider.action.DOCUMENT_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -30,7 +32,8 @@
		</intent-filter>
		</activity>

		<activity android:name="com.android.documentsui.AuthenticationActivity">
		<activity android:name="com.android.documentsui.AuthenticationActivity"
		android:exported="true">
		<intent-filter>
		<action android:name="com.android.documentsui.test.action.AUTHENTICATE" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -130,6 +133,7 @@

		<service android:name="com.android.documentsui.services.TestNotificationService"
		android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
		android:exported="true"
		android:process="com.android.documentsui">
		<intent-filter>
		<action android:name="android.service.notification.NotificationListenerService" />

tests/functional/com/android/documentsui/ContextMenuUiTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ public class ContextMenuUiTest extends ActivityTest<FilesActivity> {
		public void testContextMenu_onDir() throws Exception {
		menuItems.put("Cut", true);
		menuItems.put("Copy", true);
		menuItems.put("Paste into folder", true);
		menuItems.put("Open in new window", true);
		menuItems.put("Delete", true);
		menuItems.put("Rename", true);
		@@ -106,7 +105,6 @@ public class ContextMenuUiTest extends ActivityTest<FilesActivity> {

		public void testContextMenu_onEmptyArea() throws Exception {
		menuItems.put("Select all", true);
		menuItems.put("Paste", true);
		menuItems.put("New folder", true);
		Rect dirListBounds = bots.directory.findDocumentsList().getBounds();
		Rect dirBounds = bots.directory.findDocument(dirName1).getBounds();

tests/unit/com/android/documentsui/services/AbstractJobTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,9 @@ public abstract class AbstractJobTest<T extends Job> extends AndroidTestCase {

		mDocs = new DocumentsProviderHelper(mUserId, AUTHORITY, mContext, AUTHORITY);

		// Reset storage before starting the tests.
		resetStorage();

		initTestFiles();
		}