Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,831 Commits 3 Branches 0 Tags
861c8740b8a6b806a78a7b8a04a59d5da170b332
Commit Graph

516831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
ee7692c239 Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12171286

Change-Id: I45f0fa7f6d99d1bf7572aa53f084115a1cb920e5
 2020-08-03 20:59:18 +00:00
Alex Light
56f5e6595b Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 20:39:29 +00:00
TreeHugger Robot
8416431f37 Merge "Add missing isShellUser check" into qt-dev 2020-08-03 20:24:27 +00:00
Dave Mankoff
06d38cabf6 Alert ProxCheck listeners directly when timing out. 
Before this change, we were relying on the ProximitySensor class
to circle back and tell the ProximityCheck class about null results.
When the ProximitySensor class changed, this broke ProxCheck. The
ProxCheck class now directly alerts its listeners when it times out.

A test has been added to cover this case now.

Fixes: 162205584
Test: atest SystemUiTests && Manual
Change-Id: Ie48589a54daae3e29defde9ed2300f3c7e2b88ae
 2020-08-03 16:04:29 -04:00
Bill Yi
3850645278 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a99dee33597c248107fb59e3ee8033f87562c92
 2020-08-03 20:03:11 +00:00
Lais Andrade
277df8d8ff Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88 am: e6d76eb39d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: I58bc63ba8ff945574235268904b079d189cad386
 2020-08-03 18:53:42 +00:00
Eugene Susla
b8b53f3b39 Fix duplicate devices when multiple mediums scanning requested 
The dedupuing logic was already in place, but there was a race
due to managin the list of devices from different threads.

Test: using wear app ensure dup device reproduses without CL, and not with it
Fixes: 160870456
Change-Id: I1526199e8e4fb4b8f7d7f306e9e676359cdca516
 2020-08-03 18:40:04 +00:00
Lais Andrade
e6d76eb39d Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: Id09f9faa6cb0615f5adfc4512079ff7e3c2d3768
 2020-08-03 18:39:47 +00:00
Lais Andrade
d54498fb88 Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: Ib4c3064ef0bdd28c2fb7ecc4c70215c19e6e618c
 2020-08-03 18:19:58 +00:00
Bill Yi
077e548c04 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I552123f2a9c207d66dd7d255ea45f5219bdf4b2e
 2020-08-03 18:16:02 +00:00
Lais Andrade
af1750e973 Merge "Change variable name fix from 'endingListener' to 'endListener'" 2020-08-03 18:01:09 +00:00
Bill Yi
e78fbde299 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8bcfdc018522b2796193f24f40ce33c6fc11639a
 2020-08-03 17:53:36 +00:00
Alex Light
7b942c1f31 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
Merged-In: I971050a2665c177870ff257bd0f41343db702892
 2020-08-03 17:04:58 +00:00
TreeHugger Robot
62d7c2461a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie31333ab9cfa4fa2a2ae02e5f3e6382440bd5a72
 2020-08-03 16:28:17 +00:00
TreeHugger Robot
ab9c465a44 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: 63ed9937f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658

Change-Id: I439c446bcd55b35ec41d7c4f76a53e39de5cdd4e
 2020-08-03 16:17:14 +00:00
TreeHugger Robot
afab5784ea Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-03 16:05:18 +00:00
TreeHugger Robot
63ed9937f0 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp 2020-08-03 15:49:46 +00:00
Lais Andrade
b491f9871c Change variable name fix from 'endingListener' to 'endListener' 
Follow up aosp/1382536 by correcting the term used while renaming
a few variables and methods from AnimatorSet.

BUG=162536543

Change-Id: I9b914663790664b3f0de7774864207e90ce3f7a1
 2020-08-03 14:04:00 +00:00
Chiachang Wang
a12dd22754 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: m
Change-Id: I990a1e98f04ce907ec8150720980980a36eae21a
 2020-08-03 13:02:02 +00:00
Paul Hu
9675f2fa72 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 89ca9dd063 am: b541b5fecf am: c5241a3cd1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322

Change-Id: I3a376716eb2e3d25aa60921265ffbe3dc8f093a6
 2020-08-03 11:43:15 +00:00
Paul Hu
c5241a3cd1 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 89ca9dd063 am: b541b5fecf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322

Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92
 2020-08-03 11:18:31 +00:00
Paul Hu
b541b5fecf Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 89ca9dd063 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322

Change-Id: I54758c3e9ec37c68d45360afb10a322f749564a9
 2020-08-03 10:56:42 +00:00
Bill Yi
c29772ff25 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3616e004f367d066ae865ed3a5d56b0be7f09862
 2020-08-03 10:54:56 +00:00
Paul Hu
89ca9dd063 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" 2020-08-03 10:37:52 +00:00
Orion Hodson
fb84aa69d3 Merge "Update art-team members in OWNERS files" am: 63ceb6abdb am: be3aeabfef am: 489aa7f7a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1376496

Change-Id: I3aa4516eb8a4785eacb61b7dec2dc6401915a466
 2020-08-03 09:30:37 +00:00
Orion Hodson
489aa7f7a2 Merge "Update art-team members in OWNERS files" am: 63ceb6abdb am: be3aeabfef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1376496

Change-Id: If52c858195b9619511e400567911e52b9c6004dc
 2020-08-03 09:04:48 +00:00
Orion Hodson
be3aeabfef Merge "Update art-team members in OWNERS files" am: 63ceb6abdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1376496

Change-Id: I69b38fd4cea86af1cc2da47b71ba4bba4f1dc361
 2020-08-03 08:43:03 +00:00
Orion Hodson
63ceb6abdb Merge "Update art-team members in OWNERS files" 2020-08-03 08:18:39 +00:00
Bill Yi
f98ec32360 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d03a3606 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93b99b15b4df0ffab7e0e73266bedb6d47802556
 2020-08-03 05:08:49 +00:00
Treehugger Robot
bdffa07001 Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 am: f363e6306b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: I0bb515ce675c94cc68b340e656044b8d3a2b0849
 2020-08-03 02:36:25 +00:00
Treehugger Robot
f363e6306b Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: I50422f84fddaf05ed8d5d94e1b93690b1eb5e1cd
 2020-08-03 02:10:40 +00:00
Treehugger Robot
728932de46 Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: Ic012e70d74fec68c05a51ad9f22fe09ecb11af3f
 2020-08-03 01:50:34 +00:00
Treehugger Robot
e803bb122f Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 01:27:50 +00:00
Treehugger Robot
f42249506e Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 am: bde18f58a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I7ccbfddb32aa56a7454904b46968daeb98343247
 2020-08-02 23:34:38 +00:00
Treehugger Robot
bde18f58a7 Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I4711a07ce3df64317c0f8ef562506b91353ab691
 2020-08-02 23:07:26 +00:00
Treehugger Robot
19cb457e94 Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I9ee9a80eb9eb808a9a7d2f46873b158ac1f4f00f
 2020-08-02 22:39:39 +00:00
Treehugger Robot
4e6e7d7238 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-02 22:19:05 +00:00
Bill Yi
04d03a3606 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id80ea2167494900f57296f60329f582303f398fc
 2020-08-02 20:06:12 +00:00