Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2811ebb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4551672 from 24d6a81d to pi-release 

Change-Id: I29de848ac167b66d272f0a99e804cc8dba4088af
parents 54e59a5c 24d6a81d

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := \

        src/com/android/documentsui/ScopedAccessActivity.java \

        src/com/android/documentsui/ScopedAccessPackageReceiver.java \

        src/com/android/documentsui/ScopedAccessProvider.java \

        src/com/android/documentsui/ScopedAccessMetrics.java \

        src/com/android/documentsui/archives/Archive.java \

        src/com/android/documentsui/archives/ArchiveId.java \

minimal/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />

    <uses-permission android:name="android.permission.CACHE_CONTENT" />



    <!-- This is a minimal version of the DocumentsUI app supporting ScopedDirectoryAccess

         only. It is part of the Android TV build. -->

    <application

        android:label="@string/app_label"

        android:icon="@drawable/app_icon"

src/com/android/documentsui/ScopedAccessProvider.java

+7 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABL 
import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_PACKAGE;

import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_VOLUME_UUID;



import static com.android.documentsui.base.Shared.VERBOSE;

import static com.android.documentsui.ScopedAccessMetrics.DEBUG;

import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.PERMISSION_ASK_AGAIN;

import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.PERMISSION_NEVER_ASK;

import static com.android.documentsui.prefs.ScopedAccessLocalPreferences.getAllPackages;
@@ -103,7 +103,7 @@ public class ScopedAccessProvider extends ContentProvider { 
    @Override

    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,

            String sortOrder) {

        if (VERBOSE) {

        if (DEBUG) {

            Log.v(TAG, "query(" + uri + "): proj=" + Arrays.toString(projection)

                + ", sel=" + selection);

        }
@@ -122,7 +122,7 @@ public class ScopedAccessProvider extends ContentProvider { 
        final ArraySet<String> pkgs = getAllPackages(getContext());



        if (ArrayUtils.isEmpty(pkgs)) {

            if (VERBOSE) Log.v(TAG, "getPackagesCursor(): ignoring " + pkgs);

            if (DEBUG) Log.v(TAG, "getPackagesCursor(): ignoring " + pkgs);

            return null;

        }
@@ -146,7 +146,7 @@ public class ScopedAccessProvider extends ContentProvider { 
        final ArrayList<Permission> rawPermissions = getAllPermissions(getContext());



        if (ArrayUtils.isEmpty(rawPermissions)) {

            if (VERBOSE) Log.v(TAG, "getPermissionsCursor(): ignoring " + rawPermissions);

            if (DEBUG) Log.v(TAG, "getPermissionsCursor(): ignoring " + rawPermissions);

            return null;

        }
@@ -179,7 +179,7 @@ public class ScopedAccessProvider extends ContentProvider { 
            throw new UnsupportedOperationException("insert(): unsupported " + uri);

        }



        if (VERBOSE) Log.v(TAG, "insert(" + uri + "): " + values);

        if (DEBUG) Log.v(TAG, "insert(" + uri + "): " + values);



        // TODO(b/63720392): implement

        return null;
@@ -191,7 +191,7 @@ public class ScopedAccessProvider extends ContentProvider { 
            throw new UnsupportedOperationException("delete(): unsupported " + uri);

        }



        if (VERBOSE) Log.v(TAG, "delete(" + uri + "): " + selection);

        if (DEBUG) Log.v(TAG, "delete(" + uri + "): " + selection);



        // TODO(b/63720392): implement

        return 0;
@@ -203,7 +203,7 @@ public class ScopedAccessProvider extends ContentProvider { 
            throw new UnsupportedOperationException("update(): unsupported " + uri);

        }



        if (VERBOSE) Log.v(TAG, "update(" + uri + "): " + selection + " = " + values);

        if (DEBUG) Log.v(TAG, "update(" + uri + "): " + selection + " = " + values);



        // TODO(b/63720392): implement

        return 0;

src/com/android/documentsui/dirlist/InputHandlers.java

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.documentsui.dirlist;



import static com.google.common.base.Preconditions.checkArgument;

import static android.support.v4.util.Preconditions.checkArgument;



import android.support.v7.widget.RecyclerView;

import android.support.v7.widget.RecyclerView.ViewHolder;

src/com/android/documentsui/dirlist/MouseDragEventInterceptor.java

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.documentsui.dirlist;



import static com.google.common.base.Preconditions.checkArgument;

import static android.support.v4.util.Preconditions.checkArgument;



import android.support.annotation.Nullable;

import android.support.v7.widget.RecyclerView;