Merge pull request #51 from KVVat/niap-permissions-update-sdk36

Niap permissions update sdk36

Author: KVVat

niap-cc/KeyTestingPatches/.gitignore

@@ -0,0 +1 @@
+.idea/

niap-cc/Permissions/Companion/.aiexclude

@@ -0,0 +1 @@
+/security/

niap-cc/Permissions/Companion/app/build.gradle

@@ -17,7 +17,9 @@
 apply plugin: 'com.android.application'
 def applicationName = 'Companion'
 android {
-    compileSdk 34
+    //compileSdkPreview "VanillaIceCream"
+    //compileSdkPreview "Baklava"
+    compileSdk 36
     signingConfigs {
         // TODO :
         // Prepare your own companion.jks and put it into
@@ -39,9 +41,11 @@ android {
     }
     defaultConfig {
         applicationId "com.android.certifications.niap.permissions.companion"
-        minSdkVersion 28
-        //noinspection EditedTargetSdkVersion,OldTargetApi
-        targetSdkVersion 34
+        //targetSdkPreview "Baklava"
+        targetSdkVersion 36
+
+        minSdk 28
+        //minSdkPreview "28"
         versionCode 1
         versionName "1.0"
         signingConfig signingConfigs.platform
@@ -98,10 +102,10 @@ configurations.implementation {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.gms:play-services-location:21.0.1'
+    implementation 'com.google.android.gms:play-services-location:21.3.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

niap-cc/Permissions/Companion/app/src/main/AndroidManifest.xml

@@ -511,7 +511,35 @@
         <service android:name="com.android.certifications.niap.permissions.companion.services.TestBindWearableSensingServiceService"
             android:permission="android.permission.BIND_WEARABLE_SENSING_SERVICE"
             android:enabled="true" android:exported="true" />
-
+        <!-- Services for android V -->
+        <service android:name=".services.TestBindTvAdServiceService"
+            android:permission="android.permission.BIND_TV_AD_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindDomainSelectionServiceService"
+            android:permission="android.permission.BIND_DOMAIN_SELECTION_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindOnDeviceIntelligenceServiceService"
+            android:permission="android.permission.BIND_ON_DEVICE_INTELLIGENCE_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindOnDeviceSandboxedInferenceServiceService"
+            android:permission="android.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <!-- for api 36 -->
+        <service android:name=".services.TestBindPopulationDensityProviderServiceService"
+            android:permission="android.permission.BIND_POPULATION_DENSITY_PROVIDER_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindIntrusionDetectionEventTransportServiceService"
+            android:permission="android.permission.BIND_INTRUSION_DETECTION_EVENT_TRANSPORT_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindRkpServiceService"
+            android:permission="android.permission.BIND_RKP_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindAppFunctionServiceService"
+            android:permission="android.permission.BIND_APP_FUNCTION_SERVICE"
+            android:enabled="true" android:exported="true" />
+        <service android:name=".services.TestBindDependencyInstallerService"
+            android:permission="android.permission.BIND_DEPENDENCY_INSTALLER"
+            android:enabled="true" android:exported="true" />
 
     </application>
 

niap-cc/Permissions/Companion/app/src/main/java/com/android/certifications/niap/permissions/companion/MainActivity.java

@@ -155,7 +155,7 @@ public boolean deviceConfigSetProperty(String namespace,String name,String value
                             boolean.class}, namespace, name, value, makeDefault);
             return (boolean)r;
         } catch (Exception e) {
-            logdebug("DeviceConfig.setProperty failed.(" + a + "," + b + "," + value + ")",e);
+            logdebug("DeviceConfig.setProperty failed.(" + namespace + "," + name + "," + value + ")",e);
             e.printStackTrace();
             return false;
         }
@@ -203,7 +203,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         mSetupButton = findViewById(R.id.setupButton);
-        mCheckBoxButton = findViewById(R.id.flgDPECheckBox);
+        //mCheckBoxButton = findViewById(R.id.flgDPECheckBox);
         mSetupButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -237,24 +237,28 @@ protected Boolean doInBackground(Void... noParams) {
             boolean result;
             setupLocusTest();
             result = setupMediaLocationTest();
+            //logdebug("result1>"+result);
             if (mGmsAvailable) {
                 // if the location settings are not correct then prompt the user for correction
                 // before attempting to set up the location tests.
                 if (!verifyLocationSettings()) {
+                    //logdebug("verifylocation>"+result);
                     return false;
                 }
                 result = result && setupLocationTest();
+                //logdebug("result2>"+result);
             }
             /**
              * Set flags for enable experimental flags to new device_policy_engine
              * as of android 14
              */
             if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
                 String value = "false";
-                if(mCheckBoxButton.isChecked()){
+                //disabled : because it's infeasible to test with this application
+                /*if(mCheckBoxButton.isChecked()){
                     value = "true";
-                }
-
+                }*/
+                /*
                 String dvc =
                         deviceConfigGetProperty("device_policy_manager", "enable_device_policy_engine");
                 if(dvc == null || !dvc.equals(value)){
@@ -272,6 +276,8 @@ protected Boolean doInBackground(Void... noParams) {
                 logdebug("force flag enable_permission_based_access set "+value+"=>"
                         +deviceConfigGetProperty("device_policy_manager",
                         "enable_permission_based_access"));
+
+                 */
             }
 
             return result;
@@ -399,7 +405,8 @@ public void onReceive(Context context, Intent intent) {
         boolean locationReceived = false;
         if(Build.VERSION.SDK_INT<Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             Intent intent = new Intent(ACCESS_LOCATION_ACTION);
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent,
+            PendingIntent pendingIntent =
+                    PendingIntent.getBroadcast(this, 0, intent,
                     PendingIntent.FLAG_MUTABLE);
             //FLAG_NO_CREATE
 
@@ -423,11 +430,13 @@ public void onReceive(Context context, Intent intent) {
                 logerror("Location update not received within timeout window");
             }
         } else {
+
             //Implementation for android UDC or later (maybe it works on more previous versions)
             latch[0] = new CountDownLatch(1);
             LocationCallback locationCallback = new LocationCallback() {
                 @Override
                 public void onLocationResult(LocationResult locationResult) {
+                    //logdebug("onlocation result");
                     if (locationResult == null) {
                         return;
                     }
@@ -443,11 +452,16 @@ public void onLocationResult(LocationResult locationResult) {
 
             FusedLocationProviderClient locationClient =
                     LocationServices.getFusedLocationProviderClient(getApplicationContext());
+
             locationClient.requestLocationUpdates(locationRequest,
                     locationCallback,
                     Looper.getMainLooper());
             try {
+                //logdebug("start checking");
                 locationReceived = latch[0].await(10, TimeUnit.SECONDS);
+                if(!locationReceived){
+                    logerror("Operation timeout, maybe location feature is disabled or no internet connection.");
+                }
             } catch (InterruptedException e) {
                 logerror("Caught an InterruptedException: "+e.getLocalizedMessage(),e);
             }
@@ -591,7 +605,7 @@ private void setupLocusTest() {
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions,
             int[] grantResults) {
-        //Inspector request below line but in this case we shouldn't call super method.
+        //Inspector requests below line but in this case we shouldn't call super method.
         //    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         boolean permissionGranted = true;
         for (int grantResult : grantResults) {

niap-cc/Permissions/Companion/app/src/main/java/com/android/certifications/niap/permissions/companion/services/TestBindAppFunctionServiceService.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.certifications.niap.permissions.companion.services;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+/**
+ * Exported service used to test the BIND_APP_FUNCTION_SERVICE permission.
+ *
+ * This service requires clients are granted the BIND_APP_FUNCTION_SERVICE
+ * permission to bind to it. The Permission Test Tool can attempt to bind to this service
+ * and invoke the {@link TestBindAppFunctionServiceServiceImpl#testMethod()} method
+ * to verify that the platform properly enforces this permission requirement.
+ */
+public class TestBindAppFunctionServiceService extends Service {
+    private static final String TAG = "TestBindAppFunctionServiceService";
+    private TestBindAppFunctionServiceServiceImpl bindService;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        bindService = new TestBindAppFunctionServiceServiceImpl();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return bindService;
+    }
+
+    static class TestBindAppFunctionServiceServiceImpl extends TestBindService.Stub {
+        public void testMethod() {
+            Log.d(TAG, "The caller successfully invoked the test method on service "
+                    + "TestBindAppFunctionServiceServiceService");
+        }
+    }
+}

niap-cc/Permissions/Companion/app/src/main/java/com/android/certifications/niap/permissions/companion/services/TestBindDependencyInstallerService.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.certifications.niap.permissions.companion.services;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+/**
+ * Exported service used to test the BIND_DEPENDENCY_INSTALLER permission.
+ *
+ * This service requires clients are granted the BIND_DEPENDENCY_INSTALLER
+ * permission to bind to it. The Permission Test Tool can attempt to bind to this service
+ * and invoke the {@link TestBindDependencyInstallerServiceImpl#testMethod()} method
+ * to verify that the platform properly enforces this permission requirement.
+ */
+public class TestBindDependencyInstallerService extends Service {
+    private static final String TAG = "TestBindDependencyInstallerService";
+    private TestBindDependencyInstallerServiceImpl bindService;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        bindService = new TestBindDependencyInstallerServiceImpl();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return bindService;
+    }
+
+    static class TestBindDependencyInstallerServiceImpl extends TestBindService.Stub {
+        public void testMethod() {
+            Log.d(TAG, "The caller successfully invoked the test method on service "
+                    + "TestBindDependencyInstallerServiceService");
+        }
+    }
+}

niap-cc/Permissions/Companion/app/src/main/java/com/android/certifications/niap/permissions/companion/services/TestBindDomainSelectionServiceService.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.certifications.niap.permissions.companion.services;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+/**
+ * Exported service used to test the BIND_DOMAIN_SELECTION_SERVICE permission.
+ *
+ * This service requires clients are granted the BIND_DOMAIN_SELECTION_SERVICE
+ * permission to bind to it. The Permission Test Tool can attempt to bind to this service
+ * and invoke the {@link TestBindDomainSelectionServiceServiceImpl#testMethod()} method
+ * to verify that the platform properly enforces this permission requirement.
+ */
+public class TestBindDomainSelectionServiceService extends Service {
+    private static final String TAG = "TestBindDomainSelectionServiceService";
+    private TestBindDomainSelectionServiceServiceImpl bindService;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        bindService = new TestBindDomainSelectionServiceServiceImpl();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return bindService;
+    }
+
+    static class TestBindDomainSelectionServiceServiceImpl extends TestBindService.Stub {
+        public void testMethod() {
+            Log.d(TAG, "The caller successfully invoked the test method on service "
+                    + "TestBindDomainSelectionServiceServiceService");
+        }
+    }
+}