Revert "Allow call audio access for default dialer application"
This reverts commit ac26cf749f457e12a3d8d7456bbcd58a3e028d69.
Reason for revert: Feature has been postponed
Bug: 151761909
Change-Id: I90a977a23c5b97ddf95976cf2c4d517165f8e8c2
diff --git a/media/utils/ServiceUtilities.cpp b/media/utils/ServiceUtilities.cpp
index 7fd4d0a..87ea084 100644
--- a/media/utils/ServiceUtilities.cpp
+++ b/media/utils/ServiceUtilities.cpp
@@ -223,25 +223,6 @@
return ok;
}
-bool accessCallAudioAllowed(const String16& opPackageName, pid_t pid, uid_t uid) {
- static const String16 sAccessCallAudio("android.permission.ACCESS_CALL_AUDIO");
- PermissionController permissionController;
- const String16 resolvedOpPackageName = resolveCallingPackage(
- permissionController, opPackageName, uid);
- if (resolvedOpPackageName.size() == 0) {
- ALOGE("accessCallAudioAllowed - FAIL - package not found.");
- return false;
- }
- AppOpsManager appOps;
- const int32_t op = appOps.permissionToOpCode(sAccessCallAudio);
- const int32_t opResult = appOps.noteOp(op, uid, resolvedOpPackageName);
- if (opResult == PermissionController::MODE_DEFAULT) {
- // Only allow in case this is a system app with the proper privilege permission
- return PermissionCache::checkPermission(sAccessCallAudio, pid, uid);
- }
- return opResult == PermissionController::MODE_ALLOWED;
-}
-
// privileged behavior needed by Dialer, Settings, SetupWizard and CellBroadcastReceiver
bool bypassInterruptionPolicyAllowed(pid_t pid, uid_t uid) {
static const String16 sWriteSecureSettings("android.permission.WRITE_SECURE_SETTINGS");
@@ -278,29 +259,28 @@
return NO_ERROR;
}
-void MediaPackageManager::loadPackageManager() {
- if (mPackageManager != nullptr) {
- return;
- }
+sp<content::pm::IPackageManagerNative> MediaPackageManager::retreivePackageManager() {
const sp<IServiceManager> sm = defaultServiceManager();
if (sm == nullptr) {
ALOGW("%s: failed to retrieve defaultServiceManager", __func__);
- return;
+ return nullptr;
}
sp<IBinder> packageManager = sm->checkService(String16(nativePackageManagerName));
if (packageManager == nullptr) {
ALOGW("%s: failed to retrieve native package manager", __func__);
- return;
+ return nullptr;
}
- mPackageManager = interface_cast<content::pm::IPackageManagerNative>(packageManager);
+ return interface_cast<content::pm::IPackageManagerNative>(packageManager);
}
std::optional<bool> MediaPackageManager::doIsAllowed(uid_t uid) {
- /** Can not fetch package manager at construction it may not yet be registered. */
- loadPackageManager();
if (mPackageManager == nullptr) {
- ALOGW("%s: Playback capture is denied as package manager is not reachable", __func__);
- return std::nullopt;
+ /** Can not fetch package manager at construction it may not yet be registered. */
+ mPackageManager = retreivePackageManager();
+ if (mPackageManager == nullptr) {
+ ALOGW("%s: Playback capture is denied as package manager is not reachable", __func__);
+ return std::nullopt;
+ }
}
std::vector<std::string> packageNames;
diff --git a/media/utils/include/mediautils/ServiceUtilities.h b/media/utils/include/mediautils/ServiceUtilities.h
index 060e849..212599a 100644
--- a/media/utils/include/mediautils/ServiceUtilities.h
+++ b/media/utils/include/mediautils/ServiceUtilities.h
@@ -93,7 +93,6 @@
bool dumpAllowed();
bool modifyPhoneStateAllowed(pid_t pid, uid_t uid);
bool bypassInterruptionPolicyAllowed(pid_t pid, uid_t uid);
-bool accessCallAudioAllowed(const String16& opPackageName, pid_t pid, uid_t uid);
status_t checkIMemory(const sp<IMemory>& iMemory);
@@ -111,7 +110,7 @@
private:
static constexpr const char* nativePackageManagerName = "package_native";
std::optional<bool> doIsAllowed(uid_t uid);
- void loadPackageManager();
+ sp<content::pm::IPackageManagerNative> retreivePackageManager();
sp<content::pm::IPackageManagerNative> mPackageManager; // To check apps manifest
uint_t mPackageManagerErrors = 0;
struct Package {