Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 181bb0ab to master

Browse Source 
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
This commit is contained in:
Kenny Root
2010-07-16 09:04:09 -07:00
parent a2b78e21b0 181bb0ab46
commit fb4e1e24a9
12 changed files with 517 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/IMediaContainerService.aidl
View File

@@ -19,6 +19,7 @@ package com.android.internal.app;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.content.pm.PackageInfoLite;
import android.content.res.ObbInfo;
interface IMediaContainerService {
String copyResourceToContainer(in Uri packageURI,
@@ -28,4 +29,5 @@ interface IMediaContainerService {
in ParcelFileDescriptor outStream);
PackageInfoLite getMinimalPackageInfo(in Uri fileUri, int flags);
boolean checkFreeStorage(boolean external, in Uri fileUri);
}
ObbInfo getObbInfo(in Uri fileUri);
}