commit bc381f5493dab864fd462c985b1d6765b5f254b5
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 02 19:36:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 02 19:36:14 2020 +0000
tree 5b54ba2aef87fed2da6d9ce613b62f10d4d72f85
parent cbbc9c5c2142e12be1e2bfbd52814ee908992b5d
parent 634e20e088e1065d7b28f981bf4e0aab894944d0

Merge "Import translations. DO NOT MERGE" into rvc-dev

apex/media/framework/Android.bp

diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 48e7ec7..a1c886a 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -49,6 +49,7 @@
         "com.android.media",
         "test_com.android.media",
     ],
+    min_sdk_version: "29",
 }
 
 filegroup {

packages/CtsShim/build/Android.bp

diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index d41c672..43e3868 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -79,6 +79,7 @@
         "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
+    min_sdk_version: "24",
 }
 
 //##########################################################
@@ -152,4 +153,5 @@
         "com.android.apex.cts.shim.v2_unsigned_payload",
         "com.android.apex.cts.shim.v3",
     ],
+    min_sdk_version: "24",
 }

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 83319cf..0c70e10 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -32,6 +32,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.os.storage.DiskInfo;
+import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
 import android.provider.DocumentsContract;
@@ -119,6 +120,14 @@
         mUserManager = getContext().getSystemService(UserManager.class);
 
         updateVolumes();
+
+        mStorageManager.registerListener(new StorageEventListener() {
+                @Override
+                public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) {
+                    updateVolumes();
+                }
+            });
+
         return true;
     }