From e3ceaed976e3cc4cc86ac1fb3e7b74dac833b264 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Fri, 12 Jul 2019 10:37:13 -0700 Subject: [PATCH 1/4] Renderscript: rename .rs extension to .rscript Reserve .rs extension for Rust. Bug: 137365032 Test: make checkbuild Test: cd frameworks/compile/slang/tests ./slang_tests.py Test: atest CtsRenderscriptTestCases Test: CtsRsCppTestCases Exempt-From-Owner-Approval: Clean CP Change-Id: Iab077f256ff3776495302606572f384d82ab171f Merged-In: Iab077f256ff3776495302606572f384d82ab171f (cherry picked from commit 4a8876ec9e6282d452f7a03f69a78512d65648f0) --- .../com/example/android/rs/hellocompute/{mono.rs => mono.rscript} | 0 .../src/com/android/rs/levels/{levels.rs => levels.rscript} | 0 .../src/rs/{saturation.rs => saturation.rscript} | 0 .../HdrViewfinder/src/rs/{hdr_merge.rs => hdr_merge.rscript} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/{mono.rs => mono.rscript} (100%) rename samples/RenderScript/Levels/src/com/android/rs/levels/{levels.rs => levels.rscript} (100%) rename samples/browseable/BasicRenderScript/src/rs/{saturation.rs => saturation.rscript} (100%) rename samples/browseable/HdrViewfinder/src/rs/{hdr_merge.rs => hdr_merge.rscript} (100%) diff --git a/samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/mono.rs b/samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/mono.rscript similarity index 100% rename from samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/mono.rs rename to samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/mono.rscript diff --git a/samples/RenderScript/Levels/src/com/android/rs/levels/levels.rs b/samples/RenderScript/Levels/src/com/android/rs/levels/levels.rscript similarity index 100% rename from samples/RenderScript/Levels/src/com/android/rs/levels/levels.rs rename to samples/RenderScript/Levels/src/com/android/rs/levels/levels.rscript diff --git a/samples/browseable/BasicRenderScript/src/rs/saturation.rs b/samples/browseable/BasicRenderScript/src/rs/saturation.rscript similarity index 100% rename from samples/browseable/BasicRenderScript/src/rs/saturation.rs rename to samples/browseable/BasicRenderScript/src/rs/saturation.rscript diff --git a/samples/browseable/HdrViewfinder/src/rs/hdr_merge.rs b/samples/browseable/HdrViewfinder/src/rs/hdr_merge.rscript similarity index 100% rename from samples/browseable/HdrViewfinder/src/rs/hdr_merge.rs rename to samples/browseable/HdrViewfinder/src/rs/hdr_merge.rscript From 2f9cf082f9a8202986e1f87b4bc298fdbfc447e4 Mon Sep 17 00:00:00 2001 From: Raju Kulkarni Date: Fri, 19 Jul 2019 11:47:02 -0700 Subject: [PATCH 2/4] Updating Build-tools package Revision# for 29.0.2 release - expected to go out with QT Beta6 Bug: 137956425 Test: N/A Change-Id: I67feb6928ed14e9601b3f0e30253434572362a13 --- sdk/build_tools_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template index 6037b08f7..278812189 100644 --- a/sdk/build_tools_source.prop_template +++ b/sdk/build_tools_source.prop_template @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1 +Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2 #Pkg.Revision=29.0.0 rc4 From 36de3020693a9aa8304f145fed957d2a6824085e Mon Sep 17 00:00:00 2001 From: Raju Kulkarni Date: Tue, 13 Aug 2019 12:49:12 -0700 Subject: [PATCH 3/4] Bumping API 29 SDK package revision number visible to Android Studio for API 29 update Bug: b/139128921 Test: N/A Change-Id: Id451039d2c0e6ac567cd721f15b9e4f3d29d593c --- sdk/platform_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index 0093ab133..9dc99a0a1 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} Platform.CodeName= -Pkg.Revision=2 +Pkg.Revision=3 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} Layoutlib.Api=15 From f767eb4aa92dd6b4a864ed4e46dba63f75e41338 Mon Sep 17 00:00:00 2001 From: Nick Cook Date: Thu, 18 Jul 2019 22:27:08 +0000 Subject: [PATCH 4/4] docs: Fix outdated sample code in Context#getExternalFilesDir. Test: make ds-docs Bug: 129290716 Change-Id: I0b1c1d9222c96c6bb2777f58d273546c81d77eb2 --- .../example/android/apis/content/ExternalStorage.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java b/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java index 534a1c822..b76d1b42a 100644 --- a/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java +++ b/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java @@ -339,19 +339,14 @@ public class ExternalStorage extends Activity { // Get path for the file on external storage. If external // storage is not currently mounted this will fail. File file = new File(getExternalFilesDir(null), "DemoFile.jpg"); - if (file != null) { - file.delete(); - } + file.delete(); } boolean hasExternalStoragePrivateFile() { // Get path for the file on external storage. If external // storage is not currently mounted this will fail. File file = new File(getExternalFilesDir(null), "DemoFile.jpg"); - if (file != null) { - return file.exists(); - } - return false; + return file.exists(); } // END_INCLUDE(private_file)