diff --git a/NearbyConnectionsRockPaperScissors/app/build.gradle b/NearbyConnectionsRockPaperScissors/app/build.gradle
index d4717097..c34e5b45 100644
--- a/NearbyConnectionsRockPaperScissors/app/build.gradle
+++ b/NearbyConnectionsRockPaperScissors/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.google.location.nearby.apps.rockpaperscissors"
         minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
diff --git a/NearbyConnectionsRockPaperScissors/app/src/main/AndroidManifest.xml b/NearbyConnectionsRockPaperScissors/app/src/main/AndroidManifest.xml
index ad1b140b..2eebc313 100644
--- a/NearbyConnectionsRockPaperScissors/app/src/main/AndroidManifest.xml
+++ b/NearbyConnectionsRockPaperScissors/app/src/main/AndroidManifest.xml
@@ -2,12 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.location.nearby.apps.rockpaperscissors">
 
+    <uses-sdk android:targetSdkVersion="31" />
+
     <!-- Required for Nearby Connections -->
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="31" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
         android:allowBackup="true"
@@ -17,7 +24,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/NearbyConnectionsRockPaperScissors/app/src/main/java/com/google/location/nearby/apps/rockpaperscissors/MainActivity.java b/NearbyConnectionsRockPaperScissors/app/src/main/java/com/google/location/nearby/apps/rockpaperscissors/MainActivity.java
index c29d3868..0e796e02 100644
--- a/NearbyConnectionsRockPaperScissors/app/src/main/java/com/google/location/nearby/apps/rockpaperscissors/MainActivity.java
+++ b/NearbyConnectionsRockPaperScissors/app/src/main/java/com/google/location/nearby/apps/rockpaperscissors/MainActivity.java
@@ -5,6 +5,7 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
@@ -36,14 +37,40 @@ public class MainActivity extends AppCompatActivity {
 
   private static final String TAG = "RockPaperScissors";
 
-  private static final String[] REQUIRED_PERMISSIONS =
-      new String[] {
-        Manifest.permission.BLUETOOTH,
-        Manifest.permission.BLUETOOTH_ADMIN,
-        Manifest.permission.ACCESS_WIFI_STATE,
-        Manifest.permission.CHANGE_WIFI_STATE,
-        Manifest.permission.ACCESS_COARSE_LOCATION,
-      };
+  private static final String[] REQUIRED_PERMISSIONS;
+  static {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      REQUIRED_PERMISSIONS =
+          new String[] {
+            Manifest.permission.BLUETOOTH_SCAN,
+            Manifest.permission.BLUETOOTH_ADVERTISE,
+            Manifest.permission.BLUETOOTH_CONNECT,
+            Manifest.permission.ACCESS_WIFI_STATE,
+            Manifest.permission.CHANGE_WIFI_STATE,
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION,
+          };
+    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      REQUIRED_PERMISSIONS =
+          new String[] {
+            Manifest.permission.BLUETOOTH,
+            Manifest.permission.BLUETOOTH_ADMIN,
+            Manifest.permission.ACCESS_WIFI_STATE,
+            Manifest.permission.CHANGE_WIFI_STATE,
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION,
+          };
+    } else {
+      REQUIRED_PERMISSIONS =
+          new String[] {
+            Manifest.permission.BLUETOOTH,
+            Manifest.permission.BLUETOOTH_ADMIN,
+            Manifest.permission.ACCESS_WIFI_STATE,
+            Manifest.permission.CHANGE_WIFI_STATE,
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+          };
+    }
+  }
 
   private static final int REQUEST_CODE_REQUIRED_PERMISSIONS = 1;
 
@@ -210,12 +237,15 @@ public void onRequestPermissionsResult(
       return;
     }
 
+    int i = 0;
     for (int grantResult : grantResults) {
       if (grantResult == PackageManager.PERMISSION_DENIED) {
+        Log.i(TAG, "Failed to request the permission " + permissions[i]);
         Toast.makeText(this, R.string.error_missing_permissions, Toast.LENGTH_LONG).show();
         finish();
         return;
       }
+      i++;
     }
     recreate();
   }