LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Browse Source 
Bug: 135460123
Change-Id: I1bc7fef3b1bb1cb53cb724dd1d206ab9dbdece73
Merged-In: I8a07a2e852b9003de35997cd5d3a7bb340a079db
This commit is contained in:
Xin Li
2019-09-08 13:06:31 -07:00
parent 6f92a637bd 69343ec477
commit 4874aace15
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java
View File

@@ -339,19 +339,14 @@ public class ExternalStorage extends Activity {
// Get path for the file on external storage. If external // Get path for the file on external storage. If external
// storage is not currently mounted this will fail. // storage is not currently mounted this will fail.
File file = new File(getExternalFilesDir(null), "DemoFile.jpg"); File file = new File(getExternalFilesDir(null), "DemoFile.jpg");
if (file != null) { file.delete();
file.delete();
}
} }
boolean hasExternalStoragePrivateFile() { boolean hasExternalStoragePrivateFile() {
// Get path for the file on external storage. If external // Get path for the file on external storage. If external
// storage is not currently mounted this will fail. // storage is not currently mounted this will fail.
File file = new File(getExternalFilesDir(null), "DemoFile.jpg"); File file = new File(getExternalFilesDir(null), "DemoFile.jpg");
if (file != null) { return file.exists();
return file.exists();
}
return false;
} }
// END_INCLUDE(private_file) // END_INCLUDE(private_file)

2
sdk/platform_source.prop_template
View File

@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Platform.Version=${PLATFORM_VERSION} Platform.Version=${PLATFORM_VERSION}
Platform.CodeName= Platform.CodeName=
Pkg.Revision=2 Pkg.Revision=3
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
Layoutlib.Api=15 Layoutlib.Api=15