Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d657641b authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Save user ID in restricted mode 

Test: mmm packages/modules/Bluetooth
Flag: com.android.bluetooth.flags.guest_mode_bond
Bug: 346337854
Bug: 349882273
Change-Id: Ibc502eec3f7e811018f2a427005fa9453ca79e2e
parent 91e35b08

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ cc_library_static { 
    ],

    shared_libs: [

        "libcrypto",

        "libcutils",

    ],

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

system/btif/src/btif_storage.cc

+23 −3
Original line number Diff line number Diff line
@@ -29,14 +29,18 @@ 
 */



#define LOG_TAG "bt_btif_storage"



#include "btif/include/btif_storage.h"



#include <alloca.h>

#include <bluetooth/log.h>

#include <com_android_bluetooth_flags.h>

#ifndef TARGET_FLOSS

#include <cutils/multiuser.h>

#endif

#include <stdlib.h>

#include <string.h>

#include <time.h>

#include <unistd.h>



#include <unordered_set>

#include <vector>
@@ -60,6 +64,9 @@ 
/* This is a local property to add a device found */

#define BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP 0xFF



// Default user ID to use when real user ID is not available

#define BTIF_STORAGE_RESTRICTED_USER_ID_DEFAULT 1



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"
@@ -107,11 +114,24 @@ static bool btif_has_ble_keys(const std::string& bdstr); 
 *  Static functions

 ******************************************************************************/



static int btif_storage_get_user_id() {

  if (!com::android::bluetooth::flags::guest_mode_bond()) {

    return BTIF_STORAGE_RESTRICTED_USER_ID_DEFAULT;

  }

#ifdef TARGET_FLOSS

  return BTIF_STORAGE_RESTRICTED_USER_ID_DEFAULT;

#else

  return multiuser_get_user_id(getuid());

#endif

}



static void btif_storage_set_mode(RawAddress* remote_bd_addr) {

  std::string bdstr = remote_bd_addr->ToString();

  if (GetInterfaceToProfiles()->config->isRestrictedMode()) {

    log::info("{} will be removed exiting restricted mode", *remote_bd_addr);

    btif_config_set_int(bdstr, BTIF_STORAGE_KEY_RESTRICTED, 1);

    int user_id = btif_storage_get_user_id();

    log::info("{} added by user {}, will be removed on exiting restricted mode", *remote_bd_addr,

              user_id);

    btif_config_set_int(bdstr, BTIF_STORAGE_KEY_RESTRICTED, user_id);

  }

}