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

Commit af354d74 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Make StorageVolume#getOwner a system API." into sc-dev am: be76c405 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931544

Change-Id: I46e4e8d663045335a41df0b4eae48672cdba634e
parents 654b38c9 be76c405

core/api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -312,6 +312,10 @@ package android.os.storage { 
    field public static final int APP_IO_BLOCKED_REASON_TRANSCODING = 0; // 0x0

  }



  public final class StorageVolume implements android.os.Parcelable {

    method @NonNull public android.os.UserHandle getOwner();

  }



}



package android.provider {

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

+9 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.os.storage;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;
@@ -289,9 +291,14 @@ public final class StorageVolume implements Parcelable { 
        return mMaxFileSize;

    }



    /** {@hide} */

    /**

     * Returns the user that owns this volume

     *

     * {@hide}

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public UserHandle getOwner() {

    @SystemApi(client = MODULE_LIBRARIES)

    public @NonNull UserHandle getOwner() {

        return mOwner;

    }