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

Commit 840a9c4e authored by Varun Shah's avatar Varun Shah
Browse files

Ensure #openTypedAssetFileDescriptor doesn't lose extras. 

ContentResolver#openTypedAssetFileDescripor was not passing extras from
the file descriptor when creating the AssetFileDescriptor. This ensures
the extras are passed along as well.

Fixes: 135510219
Test: atest ContentResolverTest
Test: atest ContentResolverWrapTest
Test: atest ContentProviderClientTest
Change-Id: I2a7ed6d1bf0bcd31feb632be5c84baeae15e7024
parent 8357dd73

core/java/android/content/ContentResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -1765,7 +1765,7 @@ public abstract class ContentResolver implements ContentInterface { 
            stableProvider = null;



            return new AssetFileDescriptor(pfd, fd.getStartOffset(),

                    fd.getDeclaredLength());

                    fd.getDeclaredLength(), fd.getExtras());



        } catch (RemoteException e) {

            // Whatever, whatever, we'll go away.