[AWARE] Allow setPMK API

Allowing configuration of the PMK is required for any PK-based protocols
which operate OOB.

Bug: 143956273
Test: atest android.net.wifi.aware
Test: test com.android.server.wifi.aware
Test: ACTS DataPathTest:test_ib_solicited_active_pmk_specific
Test: CtsVerifier
Change-Id: I7ed84d7f97b1889fbbda92f3bf5203e2f2540b54

2 files changed, 0 insertions, 52 deletions

diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
index 5267c4c17..35cb91d1e 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
@@ -18,9 +18,7 @@ package com.android.server.wifi.aware;
 
 import static android.net.RouteInfo.RTN_UNICAST;
 
-import android.Manifest;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.hardware.wifi.V1_0.NanDataPathChannelCfg;
 import android.hardware.wifi.V1_0.NanStatusType;
 import android.hardware.wifi.V1_2.NanDataPathChannelInfo;
@@ -1369,16 +1367,6 @@ public class WifiAwareDataPathStateManager {
                 return null;
             }
 
-            // validate permission if PMK is used (SystemApi)
-            if (ns.pmk != null && ns.pmk.length != 0) {
-                if (permissionWrapper.getUidPermission(Manifest.permission.CONNECTIVITY_INTERNAL,
-                        ns.requestorUid) != PackageManager.PERMISSION_GRANTED) {
-                    Log.e(TAG, "processNetworkSpecifier: networkSpecifier=" + ns.toString()
-                            + " -- UID doesn't have permission to use PMK API");
-                    return null;
-                }
-            }
-
             // validate passphrase & PMK (if provided)
             if (!TextUtils.isEmpty(ns.passphrase)) { // non-null indicates usage
                 if (!WifiAwareUtils.validatePassphrase(ns.passphrase)) {
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index a488baf2a..29e782d16 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -181,9 +181,6 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
         when(mMockPowerManager.isDeviceIdleMode()).thenReturn(false);
         when(mMockPowerManager.isInteractive()).thenReturn(true);
 
-        when(mPermissionsWrapperMock.getUidPermission(eq(Manifest.permission.CONNECTIVITY_INTERNAL),
-                anyInt())).thenReturn(PackageManager.PERMISSION_GRANTED);
-
         mDut.mDataPathMgr.mNwService = mMockNwMgt;
         mDut.mDataPathMgr.mNiWrapper = mMockNetworkInterface;
     }
@@ -277,43 +274,6 @@ public class WifiAwareDataPathStateManagerTest extends WifiBaseTest {
     }
 
     /**
-     * Validate that trying to specify a PMK without permission results in failure.
-     */
-    @Test
-    public void testDataPathPmkWithoutPermission() throws Exception {
-        final int clientId = 123;
-        final byte pubSubId = 55;
-        final byte[] pmk = "01234567890123456789012345678901".getBytes();
-        final int requestorId = 1341234;
-        final byte[] peerDiscoveryMac = HexEncoding.decode("000102030405".toCharArray(), false);
-
-        InOrder inOrder = inOrder(mMockNative, mMockCm, mMockCallback, mMockSessionCallback);
-        InOrder inOrderM = inOrder(mAwareMetricsMock);
-
-        when(mPermissionsWrapperMock.getUidPermission(eq(Manifest.permission.CONNECTIVITY_INTERNAL),
-                anyInt())).thenReturn(PackageManager.PERMISSION_DENIED);
-
-        // (0) initialize
-        DataPathEndPointInfo res = initDataPathEndPoint(true, clientId, pubSubId, requestorId,
-                peerDiscoveryMac, inOrder, inOrderM, false);
-
-        // (1) request network
-        NetworkRequest nr = getSessionNetworkRequest(clientId, res.mSessionId, res.mPeerHandle, pmk,
-                null, false, 0);
-
-        Message reqNetworkMsg = Message.obtain();
-        reqNetworkMsg.what = NetworkFactory.CMD_REQUEST_NETWORK;
-        reqNetworkMsg.obj = nr;
-        reqNetworkMsg.arg1 = 0;
-        res.mMessenger.send(reqNetworkMsg);
-        mMockLooper.dispatchAll();
-
-        // failure: no interactions with native manager
-        verifyUnfullfillableDispatched(res.mReverseMessenger);
-        verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNwMgt);
-    }
-
-    /**
      * Validate that trying to specify port info on subscriber results in failure.
      */
     @Test