Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orion Hodson
74ad7baf85 Merge changes from topic "art-owners-update" am: 6066f5dae1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418

Change-Id: I0107c8e3e035e08fa0241dd4e6e69d409f7a1d74
 2020-08-04 13:41:13 +00:00
Orion Hodson
6066f5dae1 Merge changes from topic "art-owners-update" 
* changes:
  Update startop OWNERS file
  Update art-team members in pm OWNERS file
 2020-08-04 13:17:58 +00:00
Orion Hodson
432dd133d1 Update startop OWNERS file 
Test: build/make/tools/checkowners.py -c -v frameworks/base/startop/OWNERS
Change-Id: I5ed92452adea4d349843b5eb7ec199117c6a2a59
 2020-08-04 08:02:04 +00:00
Orion Hodson
72d884b80f Update art-team members in pm OWNERS file 
Test: build/make/tools/checkowners.py -c -v frameworks/base/services/core/java/com/android/server/pm/OWNERS
Change-Id: I8b5b8b09b425e52c15340af07771ee89c5807854
 2020-08-04 07:36:40 +00:00
Ryan Chan
458aed0508 Fix typo "thew" -> "threw" in AndroidTestRunner 
Change-Id: I63899c42fac7f52866a2d2f6db060cf7918547c8
 2020-08-03 22:17:07 -07:00
Treehugger Robot
be23688553 Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 am: 4c7276679d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I08b21123944936a874e715c693feecde5b182cb4
 2020-08-04 04:49:22 +00:00
Treehugger Robot
4c7276679d Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 am: 0490999da3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: I0e32fc0efc33ddd25cee10c8a06662ac29420a89
 2020-08-04 04:35:45 +00:00
Treehugger Robot
0490999da3 Merge "Update language to comply with Android's inclusive language guidance" am: f08b133000 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386056

Change-Id: Id204af9041087af516907d4deec2f52347df542b
 2020-08-04 04:09:43 +00:00
Treehugger Robot
f08b133000 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 03:47:36 +00:00
paulhu
f924bced4f Verify pending intent flags 
All PendingIntent included activity and broadcast should set
FLAG_IMMUTABLE flag.

Bug: 156353008
Test: atest TetheringTests
Change-Id: I4592e914b67ecb8865d7de47797423f27e9ff840
 2020-08-04 11:24:33 +08:00
Dave Mankoff
3a82e7dbc0 Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev am: 350583bea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294057

Change-Id: I895eb94d2cc6d208d82ffa6b247dde325b9c5eeb
 2020-08-04 01:07:52 +00:00
Colin Cross
51387a027d Use -target 8 for android_uiautomator 
android_uiautomator is distributed as part of the SDK and should use
-target 8 for compatibility with old JDKs.

Bug: 150153790
Bug: 162522383
Test: javap -v -cp out/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar com.android.uiautomator.core.Configurator | grep "major version"
Change-Id: I6871ab5436232ad3bffff6bd26adf2de6b3c06ff
 2020-08-03 18:03:40 -07:00
Dave Mankoff
350583bea0 Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev 2020-08-04 00:43:07 +00:00
Mikhail Naganov
88441891a5 Update Visualizer implementation after changes in AudioEffect 
AudioEffect was fixed to remove a call to AudioEffect::set
away from the constructor.

Bug: 162323621
Test: repro steps from the bug
      atest android.media.cts.VisualizerTest
Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be
Merged-In: I90ac6e4fe0a1229758a98a63a3b7810de60469be
 2020-08-04 00:42:08 +00:00
Mikhail Naganov
1c1667bff4 Update Visualizer implementation after changes in AudioEffect 
AudioEffect was fixed to remove a call to AudioEffect::set
away from the constructor.

Bug: 162012829
Bug: 162323621
Test: repro steps from the bug
      atest android.media.cts.VisualizerTest
Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be
Merged-In: I90ac6e4fe0a1229758a98a63a3b7810de60469be
 2020-08-03 23:45:13 +00:00
Kevin Hufnagle
88a08c8934 Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c am: 772d87c0e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: If03d3c5b4238f5f0d3f48ae07092393ffb08eed9
 2020-08-03 23:04:07 +00:00
Kevin Hufnagle
46128203a5 Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c am: b4937f485e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: If1a6f104218936954bdd5d689fcc762efca2b99b
 2020-08-03 23:03:00 +00:00
Kevin Hufnagle
772d87c0e1 Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: Icce4c3e0a7029fc9e31b4f767a5da0c3034ed08f
 2020-08-03 22:51:34 +00:00
Kevin Hufnagle
b4937f485e Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev am: 24ed56bd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286685

Change-Id: I8d018f90219ac8461f5b15f16d35e9159278d1cf
 2020-08-03 22:51:22 +00:00
Automerger Merge Worker
44a0c1854d Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours" into rvc-dev-plus-aosp am: ddb1194d7d -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 8f3de48e19 is in history

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

Change-Id: I7f69f6b1b1c4688deee8df9c883f9cf3c2700d8e
 2020-08-03 22:26:43 +00:00
Kevin Hufnagle
24ed56bd0c Merge "docs: Changes "their" to "the" in 2 places" into rvc-dev 2020-08-03 22:26:36 +00:00
Siarhei Vishniakou
67236850f5 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: I20ccd5483de1903f7330b36c00ead5be788cc201
 2020-08-03 22:26:30 +00:00
TreeHugger Robot
1dc0dff9fb [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours am: f80ba3a9f8 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: Ibb805ff3c0bb76b60188199cc2da018207e8c620
 2020-08-03 22:15:50 +00:00
TreeHugger Robot
45f18b412a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: dd2e7d498d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3eeaaa2a72acdaa95413c8f2ee11f2dc46280fd5
 2020-08-03 22:15:28 +00:00
TreeHugger Robot
c0e1861c0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fefff3a690 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3ec804937f5e162cb8b7904c1b3a73d9ceb91b1
 2020-08-03 22:13:44 +00:00
Automerger Merge Worker
ddb1194d7d Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours" into rvc-dev-plus-aosp 2020-08-03 22:12:38 +00:00
TreeHugger Robot
a92174bb82 [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I6c5b4ef609d085f93af2c9e15532c7493b52f427
 2020-08-03 22:12:29 +00:00
Siarhei Vishniakou
6b96fe8128 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: Ib727f09a3426172ac789f0a2e5bab06491e7b002
 2020-08-03 22:12:22 +00:00
TreeHugger Robot
f80ba3a9f8 [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: Ie9ff8d6aedfa9249dde7e4e02ca24a54da41ef32
 2020-08-03 22:12:20 +00:00
TreeHugger Robot
a9e053ef50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: f5a667e787 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I261377a3247243608fa8939b6ec3f970fd551a5e
 2020-08-03 22:12:20 +00:00
TreeHugger Robot
dd2e7d498d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 22:07:18 +00:00
TreeHugger Robot
fefff3a690 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 21:58:10 +00:00
TreeHugger Robot
f5a667e787 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 21:54:17 +00:00
Automerger Merge Worker
da8928b705 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history

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

Change-Id: I0f2f489b8b6cddfbf86838e0acf48857fe740a6f
 2020-08-03 21:50:57 +00:00
TreeHugger Robot
b8582d6392 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 9aa778a081 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: Iad8cc3b6fcd3c7c418b0b431321c8c444d7d479a
 2020-08-03 21:50:42 +00:00
Siarhei Vishniakou
ecd346e431 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365554

Change-Id: I695233f04718174dc001809c1b5e76455b90e3ee
 2020-08-03 21:49:32 +00:00
TreeHugger Robot
2c2e9f1f4a [automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 80a9cce44b is in history

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

Change-Id: I658c8e6ee3ed8027bef54e7499b4cf84426273c3
 2020-08-03 21:49:18 +00:00
Liz Kammer
16f2f94b7e Remove create_stubs: false from droiddoc 
`create_stubs: false` is the default behavior in soong as of
https://r.android.com/1380730

Test: m docs
Bug: 144248501
Bug: 143136634
Change-Id: If13de5c0a4071b032bc460f5c57e27819b33051d
 2020-08-03 14:48:04 -07:00
Paul McLean
5b0078defd Remove "Blacklist" nomenclature from USB services classes. 
Bug: 162315796
Test: Build, flash...
Change-Id: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
Merged-in: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
 2020-08-03 21:37:46 +00:00
TreeHugger Robot
712db83bee [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I1a27c8523e1d6a1448952ec27b50409555813c2d
 2020-08-03 21:37:12 +00:00
Eugene Susla
57a4676876 Fix duplicate devices when multiple mediums scanning requested am: b8b53f3b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295535

Change-Id: I70b16d03bfb77fe6953655b28fd3eaa4736df1be
 2020-08-03 21:36:44 +00:00
Siarhei Vishniakou
21e6488ae7 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" 2020-08-03 21:29:08 +00:00
Automerger Merge Worker
4f547ed394 Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp 2020-08-03 21:26:07 +00:00
TreeHugger Robot
9aa778a081 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I751a8cc6a00a169b04e3a7f04f1b79ef4940cb8e
 2020-08-03 21:26:01 +00:00
Alex Light
45b3822a3c [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours 
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history

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

Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f
 2020-08-03 21:25:57 +00:00
TreeHugger Robot
917fa69690 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I7a97fb3c18012567ce7fc94be042329b4f18e8f5
 2020-08-03 21:25:41 +00:00
Steve Elliott
02bdeeffb3 Mark implicit PendingIntents as immutable 
Bug: 156020795
Test: manual, atest
Change-Id: I72206c7a52b067b77d6542d170a6483713dfeee7
(cherry picked from commit 84e08280d3)
 2020-08-03 21:24:45 +00:00
TreeHugger Robot
998144cf5e Merge "Add missing isShellUser check" into qt-qpr1-dev 2020-08-03 21:22:31 +00:00
TreeHugger Robot
3786221350 [automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours 
am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121ef is in history

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

Change-Id: I0689df03f62b8ce269a436388ca1b0072800bdca
 2020-08-03 21:12:11 +00:00
Alex Light
e7b108a3b5 Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906

Change-Id: Id2829bcdfb836db02db9842bb250e2eb628495aa
 2020-08-03 21:01:33 +00:00