Commits · addff744edc1df08ff1eab9aefd7ae2488a03c7e · Dhina17 / platform_frameworks_base

Oct 13, 2023

Move RingtoneTest to media/tests/ringtone · addff744

Lais Andrade authored 1 year ago

Move ringtone tests to media/tests/ringtone module that maps to run on
presubmit on any code changes on *Ringtone*.java files.

Split the tests into Ringtone general ones, relying on
RingtoneManager.getRingtone for instantiation, and new API tests in
RingtoneBuilderTest, covering the new sound+vibration features.

Fix: 304497672
Test: atest com.android.media.RingtoneTest
      atest com.android.media.RingtoneBuilderTest
Change-Id: Idcaf8851252d1dba1bc89fa8639b7d9cde27d281

addff744

Oct 10, 2023

Merge "Back up peak refresh rate and min refresh rate" into main · c64b23bd
Piotr Wilczyński authored 1 year ago

c64b23bd
Merge "Change AndroidXAnimatorIsolationRule from @ClassRule to @Rule" into main · 43221a63
Jeff DeCew authored 1 year ago

43221a63
Merge "Fix the side effect of `adb shell dpm set-device-owner`" into main · 215b0f66
Treehugger Robot authored 1 year ago

215b0f66
Merge "Add a read-only flag for moving global restrictions in user 0 XML" into main · 2d0cab30
Nikhil Kumar authored 1 year ago

2d0cab30
Merge "Move FooterView to its own directory." into main · a7a3e04f
Ioana Alexandru authored 1 year ago

a7a3e04f

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · f1013e66

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: f8ad006d -s ours am: 04dff0e0 -s ours am: 6df1a824 -s ours am: e8f81a72 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: I9a93feab34e8c5e729b3b6b20b6e1c2a814e9aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f1013e66

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · ed2571fe

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: bdccc2ed -s ours am: c71f6331 -s ours am: 0067dcdc -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Iee59b62a840713b66c142450bc5f613fd2150155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ed2571fe

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · e8f81a72

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: f8ad006d -s ours am: 04dff0e0 -s ours am: 6df1a824 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: I823954554a38daec85bd25ce1117a1b99637b2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e8f81a72

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · 0067dcdc

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: bdccc2ed -s ours am: c71f6331 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: If1fd0e2139c42ca4eb5d270a76dd8129a7d60cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0067dcdc

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · 6df1a824

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: f8ad006d -s ours am: 04dff0e0 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Ife15cfdfc243d0d911f81e282800d95286d3c2bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6df1a824

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · c71f6331

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: bdccc2ed -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: I6e0d60568d624fccd5f1ba1f639cfdb183dd20c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c71f6331

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · 04dff0e0

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: f8ad006d -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: I61426976a854b2b2aa2fbf484434ad2f482ad3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

04dff0e0

Add a read-only flag for moving global restrictions in user 0 XML · c6cf15db
Nikhil Kumar authored 1 year ago
```
Bug: 299475754
Test: m all_aconfig_declarations

Change-Id: If7db3e3360ead0c410ffdc42c66de4fd2aca936b
```
c6cf15db

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · f8ad006d

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Iefa9ac85c362be35a2f1f58f0f0465b65e64a187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f8ad006d

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · bdccc2ed

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Ice3c5599e748950df3bbb53bb2dbfe66e380a2e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bdccc2ed

Merge "Backup stylus and note-taking related settings." into main · 0f5461ca
Vania Januar authored 1 year ago

0f5461ca

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · d2b61088

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Ia59b0611ae7d88127211931675f1b4be1b021fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d2b61088

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · 42ccd640

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Iecdecd4e4b36a70026a5253dc2dec910b4a10a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

42ccd640

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · 230e00c8

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: I97cabc6a3c65141caeac2c3ed464ecaa965156d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

230e00c8

Remove some spurious whitespace · 0cca1c88

Santiago Seifert authored 1 year ago

Change-Id: I702c8fbc24755f792cb41159b849bbb703e8d85f
Test: N/A. Whitespace removal.
Bug: 205124386

0cca1c88

Merge "Stop preventing scans when the screen is off" into main · 20cc1ac3
Santiago Seifert authored 1 year ago

20cc1ac3

[automerger skipped] Merge "Truncate user data to a limit of 500 characters"... · 9565105b

Tetiana Meronyk authored 1 year ago

[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours

am skip reason: skipped by user tetianameronyk

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24656668



Change-Id: Ice89c1ea892776ca847a4b6b9ac71ca981143321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9565105b

Merge "Add a flag to enable the `setFrameRate` callback." into main · 22cbb06a
Alexandra-Mara Smau authored 1 year ago

22cbb06a
Merge "Native VDM: base service implementation" into main · a2a9fbc6
Vladimir Komsiyski authored 1 year ago

a2a9fbc6

Merge changes from topic "am-f803fff0fcd34104833bf07243495f26" into main · 15767624

Automerger Merge Worker authored 1 year ago

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: e2a0b727 -s ours am: f4feb1e9 -s ours am: 373c2479 -s ours am: fd7fd433 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 77ff4dce -s ours am: c67aa2ea -s ours am: c7e6061a -s ours am: 111b5007 -s ours

15767624

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for... · 890b2422

Beth Thibodeau authored 1 year ago

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: e2a0b727 -s ours am: f4feb1e9 -s ours am: 373c2479 -s ours am: fd7fd433 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: I8afe465ae02e5a04a048119c6b20e1cdec66a492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

890b2422

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable... · 0e38b1e3

Beth Thibodeau authored 1 year ago

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 77ff4dce -s ours am: c67aa2ea -s ours am: c7e6061a -s ours am: 111b5007 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: Ibfcf346a1adcd0755955833a53f659e4ce383d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0e38b1e3

Merge "Add NoBreakSpan that prevent line break the portion of text" into main · 8f1ce747
Seigo Nonaka authored 1 year ago

8f1ce747

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for... · 9b21812e

Beth Thibodeau authored 1 year ago

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: eee32d18 -s ours am: d3abc510 -s ours am: 45fca2dd -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: Ic12d6f69dd36482d3166b77efd9747298a10db38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9b21812e

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable... · 03fb65d3

Beth Thibodeau authored 1 year ago

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 7dc7566a -s ours am: 8dba7828 -s ours am: 9ab7ee90 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: I5b7c37a115f266149c9883bd25190b8d1d74c77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

03fb65d3

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for... · fd7fd433

Beth Thibodeau authored 1 year ago

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: e2a0b727 -s ours am: f4feb1e9 -s ours am: 373c2479 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: I0704a62f21aab2e327e7155708fe31d9ff06ee54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fd7fd433

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable... · 111b5007

Beth Thibodeau authored 1 year ago

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 77ff4dce -s ours am: c67aa2ea -s ours am: c7e6061a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: I84b48a83549ab89ac9754800478c571ab6a1899c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

111b5007

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for... · 45fca2dd

Beth Thibodeau authored 1 year ago

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: eee32d18 -s ours am: d3abc510 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: Icc1c8dcb9a53e31fc6ca3929350227b6000d0161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

45fca2dd

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable... · 9ab7ee90

Beth Thibodeau authored 1 year ago

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 7dc7566a -s ours am: 8dba7828 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: Id7d44206446e0c230fe64e5f5898fc1cd00235fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9ab7ee90

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for... · 373c2479

Beth Thibodeau authored 1 year ago

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: e2a0b727 -s ours am: f4feb1e9 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: Ifd3a650fa6e61073cc1f174842cf7b6ee0f363cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

373c2479

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable... · c7e6061a

Beth Thibodeau authored 1 year ago

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 77ff4dce -s ours am: c67aa2ea -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: Ie9b7594dcfd591b806377011261f5de2dbc7e0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c7e6061a

Native VDM: base service implementation · bf90ffd6

Vladimir Komsiyski authored 1 year ago

Bug: 303535376
Test: atest VirtualDeviceManagerServiceTest
Test: manual with native SensorManager, VDM Demo app and streamed app using sensor NDK

Change-Id: Ib5067072d5db3dc63b262913eb658f8dcc9f20c2

bf90ffd6

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for... · d3abc510

Beth Thibodeau authored 1 year ago

[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b6 -s ours am: cdbede64 -s ours am: ff6c98c1 -s ours am: ac22d32d -s ours am: eee32d18 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: I9f61f83697bb599b451b176f4eecb0af99e4a76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d3abc510

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable... · 8dba7828

Beth Thibodeau authored 1 year ago

[automerger skipped] RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork am: ffae193f -s ours am: 49281f21 -s ours am: 41bdc6c2 -s ours am: 2c2f9d6e -s ours am: 7dc7566a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267



Change-Id: I7edb4a5ab527cd0cb9942040b5ffaebf61ff6786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8dba7828