Skip to content
Snippets Groups Projects
  1. Aug 23, 2023
  2. Jun 27, 2023
  3. Jun 07, 2023
  4. Jun 02, 2023
  5. Jun 01, 2023
    • Anton Hansson's avatar
      Use new soong support to install privapp xml · ebd1acbc
      Anton Hansson authored
      This allows better overriding of it in the variants of this apex
      that have a different package name.
      
      Bug: 242509786
      Test: build google bt, diff before & after
      Change-Id: I54dd8373a74873276198c007a026ffb2ab8a8c12
      ebd1acbc
  6. Apr 07, 2023
  7. Mar 29, 2023
  8. Feb 15, 2023
    • Hui Peng's avatar
      [redact_log] Mark the change in BluetoothDevice#toString · a1850699
      Hui Peng authored
      Return redacted mac address in BluetoothDevice#toString
      
      This is part of fixes for b/174487588: handling address redaction
      in Java layer
      
      Test method:
      
      1. flash a user debug image (API level 33) with this CL on a device
      
      2. Confirm that the change is included by runing the following command
      
          ```
          adb shell dumpsys platform_compat | grep 265103382
          # expected output
          ChangeId(265103382; name=CHANGE_TO_STRING_REDACTED; enableSinceTargetSdk=10000...
          # if there is no output, it means that change is not included
          ```
      
      3. Use a test app that logs bluetooth mac addresses. In this test,
         the following app is used
      
         https://github.com/android/connectivity-samples/tree/main/BluetoothChat is used
      
      4. Before enabling this API change, check the logs of bluetooth address in logcat:
         the bluetooth address should be shown as non-redacted
      
      5. After enabling this API change (with the following command), the bluetooth address
         should be shown as redacted in logcat
      
          ```
          adb shell am compat enable 265103382 com.example.android.bluetoothchat
          ```
      
      Bug: 265103382
      Test: see above
      Change-Id: I6ae13f5feb3c8136f37d8211b640695a6732fc52
      a1850699
  9. Feb 14, 2023
    • William Escande's avatar
      Enforce connect only on U+ · 204d8330
      William Escande authored
      Dirty Cherry-pick from internal, to provide the Changed id  without
      merge conflict to other CL. Current CL has been redacted to remove the
      security fix
      
      Bug: 266885516
      Test: manual test repro with a App that target < U
      (cherry picked from commit 4b3f3311)
      Merged-In: Ic1914f5e2a74ece89bda0bd31c1ce11f5c3b94d0
      Change-Id: Ifb66b772f7b0943e29046ce583de299f8c74cf43
      204d8330
  10. Feb 01, 2023
    • William Escande's avatar
      Enforce connect only on U+ · 4b3f3311
      William Escande authored
      Ignore-AOSP-First: security fix only on U
      Bug: 211757425
      Bug: 266885516
      Test: manual test repro with a App that target < U
      Change-Id: Ic1914f5e2a74ece89bda0bd31c1ce11f5c3b94d0
      4b3f3311
  11. Jan 24, 2023
    • Nitin Shivpure's avatar
      Bt: Add support for interop conf feature · 7ab958e4
      Nitin Shivpure authored
      Snapshot of:
      558ee40545537cac75f561c6b35c21ec388218a5
      3e76e1c8460e566e37eb2e6fa2116804d967e4e7
      5229383750c1278c7bd3d940d59c5c50a18a1053
      5752baca5abdfa5f30e803a67827f119fbe03339
      4a63a13ebe0b8576a30fe1d5efc1b6d99ebab28f
      2a7911429a78d33de0570335fac08ef9469a3621
      73c5720caabd944c11906192298c858e2e586885
      2c3b5e9ac41b4bbb946387334e7e0b0a4c32c65e
      d907b0cf64f1eecdd87b96c09980d89ccf9fc897
      a7d8799123a10cfc5a32bc8aafdd938166f912db
      dbd88bfc3f8a63c8df24571205413a1170e947e2
      319d2310997dd53f835e1729aa513bef6839c32e
      7489832bbf0482ac19bd67d9446f8b0323c850d9
      deb8aa88ab3df0f11981311beb50281c0cef1f43
      050e9ea9d75d5a576aedff7e0a155b5b98a582ae
      9a080f23406f101f76956b8226a5956e0e875062
      d1a2484905c10821dfb5dfa7bd5579e5ff5f307e
      f726e3467f570f8c28d9ea9d5f8c4040445e7791
      272d58799f73c044aadc9daf74991e39e7b93bff
      c67929e52961254985b93835e0834de2c0be40a8
      2e43f9bb24046c88fc443f801d4e8ad5fe048a58
      5c48da0d4631157f7cd6541363758c6d83b36691
      01922f885641365887b4f1900355ef35cb816d2e
      3dfd8a30897ea1c5d4b4548be820a96cbfb79f3d
      ae79a1e066e9ae7c7359c5f2a19a6fb0485a2217
      a85581f04f0d97d769405d400f4a0aa44f17e3a2
      a1234fd3d1063c8cc31da64be1ac373112c4d987
      c778c918e8249693d0bc5f483299396a83dc19e3
      9419b00e227ec087eb6c79d33a6be3d2e25b32b9
      502ddc2b9d115eaf46e113569d0720bb977d058b
      
      Test: atest net_test_device
      Bug: 252903680
      Ignore-AOSP-First: Prevent merge conflict
      Change-Id: I959ee79fe74d0b22a26b3df1633ee88670d396d1
      (cherry picked from commit c935977b)
      7ab958e4
    • Nitin Shivpure's avatar
      Bt: Add support for interop conf feature · c935977b
      Nitin Shivpure authored
      Snapshot of:
      558ee40545537cac75f561c6b35c21ec388218a5
      3e76e1c8460e566e37eb2e6fa2116804d967e4e7
      5229383750c1278c7bd3d940d59c5c50a18a1053
      5752baca5abdfa5f30e803a67827f119fbe03339
      4a63a13ebe0b8576a30fe1d5efc1b6d99ebab28f
      2a7911429a78d33de0570335fac08ef9469a3621
      73c5720caabd944c11906192298c858e2e586885
      2c3b5e9ac41b4bbb946387334e7e0b0a4c32c65e
      d907b0cf64f1eecdd87b96c09980d89ccf9fc897
      a7d8799123a10cfc5a32bc8aafdd938166f912db
      dbd88bfc3f8a63c8df24571205413a1170e947e2
      319d2310997dd53f835e1729aa513bef6839c32e
      7489832bbf0482ac19bd67d9446f8b0323c850d9
      deb8aa88ab3df0f11981311beb50281c0cef1f43
      050e9ea9d75d5a576aedff7e0a155b5b98a582ae
      9a080f23406f101f76956b8226a5956e0e875062
      d1a2484905c10821dfb5dfa7bd5579e5ff5f307e
      f726e3467f570f8c28d9ea9d5f8c4040445e7791
      272d58799f73c044aadc9daf74991e39e7b93bff
      c67929e52961254985b93835e0834de2c0be40a8
      2e43f9bb24046c88fc443f801d4e8ad5fe048a58
      5c48da0d4631157f7cd6541363758c6d83b36691
      01922f885641365887b4f1900355ef35cb816d2e
      3dfd8a30897ea1c5d4b4548be820a96cbfb79f3d
      ae79a1e066e9ae7c7359c5f2a19a6fb0485a2217
      a85581f04f0d97d769405d400f4a0aa44f17e3a2
      a1234fd3d1063c8cc31da64be1ac373112c4d987
      c778c918e8249693d0bc5f483299396a83dc19e3
      9419b00e227ec087eb6c79d33a6be3d2e25b32b9
      502ddc2b9d115eaf46e113569d0720bb977d058b
      
      Test: atest net_test_device
      Bug: 252903680
      
      Merged-In: I959ee79fe74d0b22a26b3df1633ee88670d396d1
      Change-Id: I959ee79fe74d0b22a26b3df1633ee88670d396d1
      c935977b
  12. Nov 17, 2022
  13. Nov 16, 2022
    • William Escande's avatar
      Do not put apex updatable in qpr · 20a684b3
      William Escande authored
      Bug: 257759587
      Ignore-AOSP-First: change is for QPR only
      Test: build
      Change-Id: Ib4beaa784d3eb79e18d0d8e9cc64a22b1f5d965e
      Merged-In: Ib4beaa784d3eb79e18d0d8e9cc64a22b1f5d965e
      20a684b3
  14. Nov 09, 2022
    • William Escande's avatar
      Link AptX and AptXHD encoder into Bt · 7b8311a1
      William Escande authored
      Statically link the encoder lib in order to provide them into the apex
      Remove the apex external loading rule
      
      Ignore-AOSP-First: Cherry-pick
      Bug: 226572369
      Test: manual testing
      Tag: #refactor
      Merged-In: I45adfe7ca51c304b8fc09ee30ce6e810bf9f0e3e
      Change-Id: I45adfe7ca51c304b8fc09ee30ce6e810bf9f0e3e
      7b8311a1
    • William Escande's avatar
      Clean com.android.bluetooth to prevent visibility error · 805b9ca3
      William Escande authored
      The apex name is com.android.btservices and the .bluetooth variant is
      not working since the name has changed
      
      Ignore-AOSP-First: This apex is only on tm* branches
      Bug: 226572369
      Test: build
      Merged-In: I75cecfcd432e6446687134489bb66527bb32eeb4
      Change-Id: Ic7dead54b1aaaf78ee600dc1cc63e1cb2bc1678f
      805b9ca3
  15. Nov 08, 2022
    • William Escande's avatar
      Link AptX and AptXHD encoder into Bt · f74a2fe8
      William Escande authored
      Statically link the encoder lib in order to provide them into the apex
      Remove the apex external loading rule
      
      Bug: 226572369
      Test: manual testing
      Tag: #refactor
      Change-Id: I45adfe7ca51c304b8fc09ee30ce6e810bf9f0e3e
      f74a2fe8
  16. Oct 17, 2022
    • Oriol Prieto Gasco's avatar
      Make the btservices apex updatable. · 26ae2297
      Oriol Prieto Gasco authored
      Also, use the new name "com.android.btservices"
      
      Bug: 237556594
      Test: TH
      Ignore-AOSP-First: LSC
      
      Merged-In: If2443eadfc457da6e040ea3425ed1d5b6f73177a
      Change-Id: If2443eadfc457da6e040ea3425ed1d5b6f73177a
      (cherry picked from commit 4c187daf)
      26ae2297
  17. Sep 23, 2022
    • Rubin Xu's avatar
      Security logging for Bluetooth connection events · 938e1a11
      Rubin Xu authored
      As required by NIAP certification, log various Bluetooth connection and
      disconnection events to security log.
      
      Bug: 232283779
      Test: manual
      Ignore-AOSP-First: it's a cherry-pick
      Change-Id: Iff04258a7ca1c19deb1e692c30724f2491fd4ed6
      Merged-In: Iff04258a7ca1c19deb1e692c30724f2491fd4ed6
      938e1a11
  18. Sep 22, 2022
    • Rubin Xu's avatar
      Security logging for Bluetooth connection events · 0d03f92c
      Rubin Xu authored
      As required by NIAP certification, log various Bluetooth connection and
      disconnection events to security log.
      
      Bug: 232283779
      Test: manual
      Change-Id: Iff04258a7ca1c19deb1e692c30724f2491fd4ed6
      0d03f92c
  19. Sep 09, 2022
  20. Sep 08, 2022
  21. Aug 30, 2022
    • Abhishek Pandit-Subedi's avatar
      Remove set noparent from OWNERS · d9265978
      Abhishek Pandit-Subedi authored
      Downstream repos of Bluetooth get broken whenever "set noparent" are
      used.
      
      Bug: 244347299
      Tag: #floss
      Test: None (Owners change)
      Change-Id: Iadd47b7a754440f21a651131d94a4084eb12dd08
      d9265978
  22. Aug 27, 2022
  23. Aug 25, 2022
  24. Aug 22, 2022
  25. Jul 18, 2022
  26. Jul 16, 2022
    • Paul Duffin's avatar
      Dedup *fragments information common to apex and sdk · 303b41b8
      Paul Duffin authored
      Previously, both the sdk and apex had to specify the same *fragments
      property to ensure that building a system image from a prebuilt
      version of the module (both APEX and sdk snapshots) would work.
      
      This change avoids the duplication by adding the apex to the sdk which
      allows the sdk to automatically export any APIs and related information
      provided by the APEX. At the moment that just includes information from
      *fragments properties but may expand in future.
      
      Ignore-AOSP-First: sdk is not present in AOSP
      
      Bug: 232401814
      Test: # Build snapshots with a fixed build number
            BUILD_NUMBER=fixed packages/modules/common/build/mainline_modules_sdks.sh
            # Remove api diff files as they contain file stamps of generated files so
            # differ every time they are generated.
            find out/dist/mainline-sdks -name \*txt | xargs rm
            # Save the snapshots away.
            mv out/dist/mainline-sdks before-changes
            # Apply this change.
            # Repeat the first two steps above and then run the following to verify
            # that this change had no effect on the generated snapshot contents.
            meld before-changes out/dist/mainline-sdks
      Change-Id: I875b16f4deddda08295caaa97e00c7b01501566d
      (cherry picked from commit 548f8846)
      Merged-In: I875b16f4deddda08295caaa97e00c7b01501566d
      303b41b8
    • Paul Duffin's avatar
      Dedup *fragments information common to apex and sdk · 548f8846
      Paul Duffin authored
      Previously, both the sdk and apex had to specify the same *fragments
      property to ensure that building a system image from a prebuilt
      version of the module (both APEX and sdk snapshots) would work.
      
      This change avoids the duplication by adding the apex to the sdk which
      allows the sdk to automatically export any APIs and related information
      provided by the APEX. At the moment that just includes information from
      *fragments properties but may expand in future.
      
      Ignore-AOSP-First: sdk is not present in AOSP
      
      Bug: 232401814
      Test: # Build snapshots with a fixed build number
            BUILD_NUMBER=fixed packages/modules/common/build/mainline_modules_sdks.sh
            # Remove api diff files as they contain file stamps of generated files so
            # differ every time they are generated.
            find out/dist/mainline-sdks -name \*txt | xargs rm
            # Save the snapshots away.
            mv out/dist/mainline-sdks before-changes
            # Apply this change.
            # Repeat the first two steps above and then run the following to verify
            # that this change had no effect on the generated snapshot contents.
            meld before-changes out/dist/mainline-sdks
      Change-Id: I875b16f4deddda08295caaa97e00c7b01501566d
      548f8846
  27. Jul 11, 2022
    • Alexei Nicoara's avatar
      Setting apex version to the placeholder value · ceafd9f4
      Alexei Nicoara authored
      When the apex version is set to 0, the version number will be replaced by the build system to the default value for the current branch.
      The default value for mainline module manifest version is stored in the defaultManifestVersion constant: https://android.googlesource.com/platform/build/soong/+/refs/heads/master/apex/constants.go#36
      
      The version should not be changed manually in the manifest. Release tooling will set this version to the release version on the release branches.
      
      Test: presubmit
      Bug: 231691643
      Change-Id: I30b5b486bca521ebdeed17dba7afc61f2c529ab8
      Merged-In: I30b5b486bca521ebdeed17dba7afc61f2c529ab8
      Ignore-AOSP-First: fixing merge conflicts
      (cherry picked from commit 6173f6a3)
      Merged-In: I30b5b486bca521ebdeed17dba7afc61f2c529ab8
      ceafd9f4
  28. Jul 08, 2022
  29. Jul 07, 2022
  30. Jul 05, 2022
  31. Jul 04, 2022
  32. Jun 23, 2022
  33. Jun 22, 2022
    • William Escande's avatar
      Change Bluetooth apex mountpoint · 8e1ae018
      William Escande authored
      Apex name has been changed to com.android.btservices
      Changing mount point accordingly
      
      Bug: 235892590
      Test: Flash / boot bt / look logs & pair a device
      Ignore-AOSP-First: Apex only on tm-dev
      Change-Id: Id4e3410c00a9afd4c3c99af18c55e34bc89b4a30
      8e1ae018
Loading